1 |
commit: 06431e9a52b3bdc5c2a6e7b500150282cfb3885b |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 28 20:01:00 2016 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 28 20:01:00 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=06431e9a |
7 |
|
8 |
www-client/qupzilla: sync |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
www-client/qupzilla/metadata.xml | 23 ++++++---- |
13 |
www-client/qupzilla/qupzilla-9999.ebuild | 79 ++++++++++++++++++-------------- |
14 |
2 files changed, 57 insertions(+), 45 deletions(-) |
15 |
|
16 |
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml |
17 |
index e7eae86..5f0517c 100644 |
18 |
--- a/www-client/qupzilla/metadata.xml |
19 |
+++ b/www-client/qupzilla/metadata.xml |
20 |
@@ -1,14 +1,17 @@ |
21 |
<?xml version="1.0" encoding="UTF-8"?> |
22 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
23 |
<pkgmetadata> |
24 |
- <maintainer type="project"> |
25 |
- <email>qt@g.o</email> |
26 |
- <name>Gentoo Qt Project</name> |
27 |
- </maintainer> |
28 |
- <use> |
29 |
- <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs |
30 |
- shown inside the page, not blocking the application window. When closing |
31 |
- browser windows with open dialogs, this can crash the application. |
32 |
- </flag> |
33 |
- </use> |
34 |
+ <maintainer type="project"> |
35 |
+ <email>qt@g.o</email> |
36 |
+ <name>Gentoo Qt Project</name> |
37 |
+ </maintainer> |
38 |
+ <use> |
39 |
+ <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs |
40 |
+ shown inside the page, not blocking the application window. When closing |
41 |
+ browser windows with open dialogs, this can crash the application. |
42 |
+ </flag> |
43 |
+ </use> |
44 |
+ <upstream> |
45 |
+ <remote-id type="github">QupZilla/qupzilla</remote-id> |
46 |
+ </upstream> |
47 |
</pkgmetadata> |
48 |
|
49 |
diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild |
50 |
index 388d308..f02ae4b 100644 |
51 |
--- a/www-client/qupzilla/qupzilla-9999.ebuild |
52 |
+++ b/www-client/qupzilla/qupzilla-9999.ebuild |
53 |
@@ -3,62 +3,71 @@ |
54 |
# $Id$ |
55 |
|
56 |
EAPI=6 |
57 |
-MY_PN="QupZilla" |
58 |
-MY_P=${MY_PN}-${PV} |
59 |
|
60 |
-if [[ ${PV} == *9999* ]]; then |
61 |
- VCS_ECLASS=git-r3 |
62 |
- EGIT_BRANCH=master |
63 |
- EGIT_REPO_URI="git://github.com/${MY_PN}/${PN}.git" |
64 |
-else |
65 |
- VCS_ECLASS=vcs-snapshot |
66 |
- SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz" |
67 |
- KEYWORDS="~amd64 ~arm ~x86" |
68 |
- S=${WORKDIR}/${MY_P} |
69 |
-fi |
70 |
- |
71 |
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK 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 lt 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" |
72 |
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR |
73 |
+ fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV |
74 |
+ nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian |
75 |
+ sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW" |
76 |
PLUGINS_HASH='7b037cc326921cefbfc6b5e54e2091eb4191e73f' |
77 |
PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older archive |
78 |
|
79 |
-inherit eutils l10n multilib qmake-utils ${VCS_ECLASS} |
80 |
+inherit l10n qmake-utils |
81 |
+ |
82 |
+if [[ ${PV} == *9999 ]]; then |
83 |
+ inherit git-r3 |
84 |
+ EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git" |
85 |
+else |
86 |
+ MY_P=QupZilla-${PV} |
87 |
+ SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz" |
88 |
+ KEYWORDS="~amd64 ~x86" |
89 |
+ S=${WORKDIR}/${MY_P} |
90 |
+fi |
91 |
|
92 |
-DESCRIPTION="A cross-platform web browser using Qt WebEngine" |
93 |
+DESCRIPTION="A cross-platform web browser using QtWebEngine" |
94 |
HOMEPAGE="http://www.qupzilla.com/" |
95 |
-SRC_URI+="https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" |
96 |
+SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" |
97 |
|
98 |
LICENSE="GPL-3" |
99 |
SLOT="0" |
100 |
-IUSE="dbus debug gnome-keyring nonblockdialogs" |
101 |
+IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs" |
102 |
|
103 |
-RDEPEND="dev-libs/openssl:0 |
104 |
+RDEPEND=" |
105 |
>=dev-qt/qtconcurrent-5.6:5 |
106 |
>=dev-qt/qtcore-5.6:5 |
107 |
+ >=dev-qt/qtdeclarative-5.6:5[widgets] |
108 |
>=dev-qt/qtgui-5.6:5 |
109 |
- >=dev-qt/qtnetwork-5.6:5 |
110 |
+ >=dev-qt/qtnetwork-5.6:5[ssl] |
111 |
>=dev-qt/qtprintsupport-5.6:5 |
112 |
>=dev-qt/qtsql-5.6:5[sqlite] |
113 |
+ >=dev-qt/qtwebchannel-5.6:5 |
114 |
>=dev-qt/qtwebengine-5.6:5[widgets] |
115 |
>=dev-qt/qtwidgets-5.6:5 |
116 |
- x11-libs/libX11 |
117 |
+ >=dev-qt/qtx11extras-5.6:5 |
118 |
+ x11-libs/libxcb:= |
119 |
dbus? ( >=dev-qt/qtdbus-5.6:5 ) |
120 |
- gnome-keyring? ( gnome-base/gnome-keyring )" |
121 |
+ gnome-keyring? ( gnome-base/gnome-keyring ) |
122 |
+ kde? ( kde-frameworks/kwallet:5 ) |
123 |
+ libressl? ( dev-libs/libressl:= ) |
124 |
+ !libressl? ( dev-libs/openssl:0 ) |
125 |
+" |
126 |
DEPEND="${RDEPEND} |
127 |
>=dev-qt/linguist-tools-5.6:5 |
128 |
- virtual/pkgconfig" |
129 |
+ virtual/pkgconfig |
130 |
+" |
131 |
|
132 |
DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md ) |
133 |
|
134 |
src_unpack() { |
135 |
- if [[ ${PV} == *9999* ]]; then |
136 |
+ if [[ ${PV} == *9999 ]]; then |
137 |
git-r3_src_unpack |
138 |
- unpack ${A} |
139 |
- else |
140 |
- default |
141 |
fi |
142 |
+ default |
143 |
} |
144 |
|
145 |
src_prepare() { |
146 |
+ # get extra plugins into qupzilla build tree |
147 |
+ mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die |
148 |
+ |
149 |
rm_loc() { |
150 |
# remove localizations the user has not specified |
151 |
sed -i -e "/${1}.ts/d" translations/translations.pri || die |
152 |
@@ -71,10 +80,7 @@ src_prepare() { |
153 |
# remove empty locale |
154 |
rm translations/empty.ts || die |
155 |
|
156 |
- # get extra plugins into qupzilla build tree |
157 |
- mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die |
158 |
- |
159 |
- l10n_find_plocales_changes "translations" "" ".ts" |
160 |
+ l10n_find_plocales_changes translations '' .ts |
161 |
l10n_for_each_disabled_locale_do rm_loc |
162 |
|
163 |
default |
164 |
@@ -83,12 +89,15 @@ src_prepare() { |
165 |
src_configure() { |
166 |
# see BUILDING document for explanation of options |
167 |
export \ |
168 |
- QUPZILLA_PREFIX="${EPREFIX}/usr/" \ |
169 |
+ QUPZILLA_PREFIX="${EPREFIX}/usr" \ |
170 |
USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \ |
171 |
- DISABLE_DBUS=$(usex dbus '' 'true') \ |
172 |
- NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '') |
173 |
+ DEBUG_BUILD=$(usex debug true '') \ |
174 |
+ DISABLE_DBUS=$(usex dbus '' true) \ |
175 |
+ GNOME_INTEGRATION=$(usex gnome-keyring true '') \ |
176 |
+ KDE_INTEGRATION=$(usex kde true '') \ |
177 |
+ NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '') |
178 |
|
179 |
- eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION") |
180 |
+ eqmake5 |
181 |
} |
182 |
|
183 |
src_install() { |