commit: a92f17152735d22bf67656fb25c27f7bde2422c7
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 09:21:48 2015 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 09:21:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a92f1715
www-client/qupzilla: update live ebuild for Qt5
I have made the necessary updates, but upstream switched the master branch
(version 1.9.x) to use QtWebEngine, for which we have no ebuild yet.
Bug: 554380
Bug: 531284
Package-Manager: portage-2.2.20.1
www-client/qupzilla/Manifest | 1 +
.../files/qtsingleapplication-QDataStream.patch | 10 +++
www-client/qupzilla/qupzilla-9999.ebuild | 97 +++++++++++++++-------
3 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
new file mode 100644
index 0000000..d4ede65
--- /dev/null
+++ b/www-client/qupzilla/Manifest
@@ -0,0 +1 @@
+DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256
afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512
5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522
WHIRLPOOL
10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
new file mode 100644
index 0000000..25694af
--- /dev/null
+++ b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
@@ -0,0 +1,10 @@
+--- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG 2015-05-07
18:29:35.045402873 +0200
++++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-05-07
18:33:04.942404927 +0200
+@@ -39,6 +39,7 @@
+ ****************************************************************************/
+
+
++#include <QDataStream>
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
diff --git a/www-client/qupzilla/qupzilla-9999.ebuild
b/www-client/qupzilla/qupzilla-9999.ebuild
index 69fa35d..a78b64d 100644
--- a/www-client/qupzilla/qupzilla-9999.ebuild
+++ b/www-client/qupzilla/qupzilla-9999.ebuild
@@ -3,71 +3,104 @@
# $Id$
EAPI=5
+MY_PN="QupZilla"
+MY_P=${MY_PN}-${PV}
-if [[ ${PV} == "9999" ]]; then
- VCS_ECLASS=git-2
- EGIT_REPO_URI="git://github.com/QupZilla/${PN}.git"
- KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
+ VCS_ECLASS=git-r3
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://github.com/${MY_PN}/${PN}.git"
else
VCS_ECLASS=vcs-snapshot
- MY_P="QupZilla-${PV}"
- SRC_URI="mirror://github/QupZilla/${PN}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+
SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~x86"
S=${WORKDIR}/${MY_P}
fi
-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 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@ijekavianlatin sr@ijekavian sr@latin sr sv_SE
tr_TR uk_UA uz@Latn zh_CN zh_TW"
+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"
+PLUGINS_HASH='7c66cb2efbd18eacbd04ba211162b1a042e5b759'
+PLUGINS_VERSION='2015.06.05' # if there are no updates, we can use the older
archive
-inherit l10n multilib qt4-r2 ${VCS_ECLASS}
+inherit eutils l10n multilib qmake-utils ${VCS_ECLASS}
DESCRIPTION="Qt WebKit web browser"
HOMEPAGE="http://www.qupzilla.com/";
+SRC_URI+="https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz
-> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-IUSE="dbus debug kde nonblockdialogs"
+IUSE="dbus debug gnome-keyring nonblockdialogs"
-DEPEND="
- >=dev-qt/qtcore-4.7:4
- >=dev-qt/qtgui-4.7:4
- >=dev-qt/qtscript-4.7:4
- >=dev-qt/qtsql-4.7:4
- >=dev-qt/qtwebkit-4.7:4
- dbus? ( >=dev-qt/qtdbus-4.7:4 )"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/openssl:0
+ x11-libs/libX11
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ >=dev-qt/qtcore-5.5:5
+ >=dev-qt/qtgui-5.5:5
+ >=dev-qt/qtconcurrent-5.5:5
+ >=dev-qt/qtprintsupport-5.5:5
+ >=dev-qt/qtscript-5.5:5
+ >=dev-qt/qtsql-5.5:5[sqlite]
+ >=dev-qt/qtwebengine-5.5:5[widgets]
+ dbus? ( >=dev-qt/qtdbus-5.5:5 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-qt/linguist-tools-5.5:5"
DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
+}
+
src_prepare() {
rm_loc() {
+ # remove localizations the user has not specified
sed -i -e "/${1}.ts/d" translations/translations.pri || die
rm translations/${1}.ts || die
}
- # remove outdated copies of localizations:
- rm -r bin/locale || die
+
+ # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
+ epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
+
+ epatch_user
+
+ # remove outdated prebuilt localizations
+ rm -rf bin/locale || die
+
# remove empty locale
rm translations/empty.ts || die
+ # get extra plugins into qupzilla build tree
+ mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/*
"${S}"/src/plugins/ || die
+
l10n_find_plocales_changes "translations" "" ".ts"
l10n_for_each_disabled_locale_do rm_loc
- qt4-r2_src_prepare
}
src_configure() {
# see BUILDING document for explanation of options
- export QUPZILLA_PREFIX=${EPREFIX}/usr/
- export USE_LIBPATH=${QUPZILLA_PREFIX}$(get_libdir)
- export DISABLE_DBUS=$(use dbus && echo false || echo true)
- export KDE=$(use kde && echo true || echo false) # in future this will
enable nepomuk integration
- export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo
false)
- has_version '>=dev-qt/qtwebkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
-
- # needs qtwebkit with webgl enabled (which we currently don't)
- # export USE_WEBGL=$(use webgl && echo true || echo false)
+ export \
+ QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+ USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+ DISABLE_DBUS=$(usex dbus '' 'true') \
+ NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
- eqmake4
+ eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
}
src_install() {
- qt4-r2_src_install
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
+
+pkg_postinst() {
+ if has_version www-plugins/adobe-flash; then
+ ewarn "For using adobe flash plugin you may need to run"
+ ewarn " \"paxctl-ng -m /usr/bin/qupzilla\""
+ fi
}
