| 1 |
yngwin 15/07/01 05:09:20 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qupzilla-1.8.6-r1.ebuild |
| 5 |
Log: |
| 6 |
Add QTSA patch to fix compilation with Qt 5.5 (bug #548470) |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.59 www-client/qupzilla/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/qupzilla/ChangeLog?rev=1.59&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/qupzilla/ChangeLog?rev=1.59&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/qupzilla/ChangeLog?r1=1.58&r2=1.59 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v |
| 20 |
retrieving revision 1.58 |
| 21 |
retrieving revision 1.59 |
| 22 |
diff -u -r1.58 -r1.59 |
| 23 |
--- ChangeLog 4 Jun 2015 19:06:11 -0000 1.58 |
| 24 |
+++ ChangeLog 1 Jul 2015 05:09:20 -0000 1.59 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-client/qupzilla |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.58 2015/06/04 19:06:11 kensington Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.59 2015/07/01 05:09:20 yngwin Exp $ |
| 30 |
+ |
| 31 |
+*qupzilla-1.8.6-r1 (01 Jul 2015) |
| 32 |
+ |
| 33 |
+ 01 Jul 2015; Ben de Groot <yngwin@g.o> |
| 34 |
+ +files/qtsingleapplication-QDataStream.patch, +qupzilla-1.8.6-r1.ebuild: |
| 35 |
+ Add QTSA patch to fix compilation with Qt 5.5 (bug #548470) |
| 36 |
|
| 37 |
04 Jun 2015; Michael Palimaka <kensington@g.o> qupzilla-1.8.6.ebuild: |
| 38 |
Move various kde-base packages to kde-apps. |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 www-client/qupzilla/qupzilla-1.8.6-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: qupzilla-1.8.6-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2015 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild,v 1.1 2015/07/01 05:09:20 yngwin Exp $ |
| 52 |
|
| 53 |
EAPI=5 |
| 54 |
MY_PN="QupZilla" |
| 55 |
MY_P=${MY_PN}-${PV} |
| 56 |
PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW" |
| 57 |
PLUGINS_HASH='1f8122da27362ae14a6e3c029830b51e9bac03be' |
| 58 |
PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive |
| 59 |
|
| 60 |
inherit eutils l10n multilib qmake-utils vcs-snapshot |
| 61 |
|
| 62 |
DESCRIPTION="Qt WebKit web browser" |
| 63 |
HOMEPAGE="http://www.qupzilla.com/" |
| 64 |
SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz |
| 65 |
https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" |
| 66 |
|
| 67 |
LICENSE="GPL-3" |
| 68 |
SLOT="0" |
| 69 |
KEYWORDS="~amd64 ~arm ~x86" |
| 70 |
IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5" |
| 71 |
REQUIRED_USE="^^ ( qt4 qt5 ) |
| 72 |
kde? ( qt4 )" |
| 73 |
|
| 74 |
RDEPEND="dev-libs/openssl:0 |
| 75 |
x11-libs/libX11 |
| 76 |
gnome-keyring? ( gnome-base/gnome-keyring ) |
| 77 |
kde? ( kde-base/kdelibs:4 |
| 78 |
kde-apps/kwalletd:4 ) |
| 79 |
qt4? ( >=dev-qt/qtcore-4.8:4 |
| 80 |
>=dev-qt/qtgui-4.8:4 |
| 81 |
>=dev-qt/qtscript-4.8:4 |
| 82 |
>=dev-qt/qtsql-4.8:4[sqlite] |
| 83 |
>=dev-qt/qtwebkit-4.8:4 |
| 84 |
dbus? ( >=dev-qt/qtdbus-4.8:4 ) ) |
| 85 |
qt5? ( dev-qt/qtcore:5 |
| 86 |
dev-qt/qtgui:5 |
| 87 |
dev-qt/qtconcurrent:5 |
| 88 |
dev-qt/qtprintsupport:5 |
| 89 |
dev-qt/qtscript:5 |
| 90 |
dev-qt/qtsql:5[sqlite] |
| 91 |
dev-qt/qtwebkit:5 |
| 92 |
dbus? ( dev-qt/qtdbus:5 ) )" |
| 93 |
DEPEND="${RDEPEND} |
| 94 |
virtual/pkgconfig |
| 95 |
qt5? ( dev-qt/linguist-tools:5 )" |
| 96 |
|
| 97 |
DOCS=( AUTHORS CHANGELOG FAQ README.md ) |
| 98 |
S=${WORKDIR}/${MY_P} |
| 99 |
|
| 100 |
src_prepare() { |
| 101 |
rm_loc() { |
| 102 |
# remove localizations the user has not specified |
| 103 |
sed -i -e "/${1}.ts/d" translations/translations.pri || die |
| 104 |
rm translations/${1}.ts || die |
| 105 |
} |
| 106 |
|
| 107 |
# patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142 |
| 108 |
epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch |
| 109 |
|
| 110 |
epatch_user |
| 111 |
|
| 112 |
# remove outdated prebuilt localizations |
| 113 |
rm -rf bin/locale || die |
| 114 |
|
| 115 |
# remove empty locale |
| 116 |
rm translations/empty.ts || die |
| 117 |
|
| 118 |
# get extra plugins into qupzilla build tree |
| 119 |
mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die |
| 120 |
|
| 121 |
l10n_find_plocales_changes "translations" "" ".ts" |
| 122 |
l10n_for_each_disabled_locale_do rm_loc |
| 123 |
} |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
# see BUILDING document for explanation of options |
| 127 |
export \ |
| 128 |
QUPZILLA_PREFIX="${EPREFIX}/usr/" \ |
| 129 |
USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \ |
| 130 |
USE_QTWEBKIT_2_2=true \ |
| 131 |
DISABLE_DBUS=$(usex dbus '' 'true') \ |
| 132 |
KDE_INTEGRATION=$(usex kde 'true' '') \ |
| 133 |
NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '') |
| 134 |
|
| 135 |
if use qt4 ; then |
| 136 |
eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION") |
| 137 |
else |
| 138 |
eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION") |
| 139 |
fi |
| 140 |
} |
| 141 |
|
| 142 |
src_install() { |
| 143 |
emake INSTALL_ROOT="${D}" install |
| 144 |
einstalldocs |
| 145 |
} |
| 146 |
|
| 147 |
pkg_postinst() { |
| 148 |
if has_version www-plugins/adobe-flash; then |
| 149 |
ewarn "For using adobe flash plugin you may need to run" |
| 150 |
ewarn " \"paxctl-ng -m /usr/bin/qupzilla\"" |
| 151 |
fi |
| 152 |
} |
Archives