* [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/, www-client/qupzilla/files/
@ 2015-10-01 13:02 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2015-10-01 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 11d73f9ba26a36e9ed893b2561a8d76f29e357b1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 12:44:59 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 13:01:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d73f9b
www-client/qupzilla: backport patch from upstream solving build failure with Qt 5.5
Package-Manager: portage-2.2.20.1
.../qupzilla/files/qupzilla-1.8.6-qt55.patch | 105 +++++++++++++++++++++
www-client/qupzilla/qupzilla-1.8.6-r1.ebuild | 2 +
2 files changed, 107 insertions(+)
diff --git a/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch b/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch
new file mode 100644
index 0000000..8014398
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch
@@ -0,0 +1,105 @@
+From 739e01796a3587c21e7496b43a5a3cdb3fb6d7c5 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Thu, 11 Jun 2015 20:21:39 +0200
+Subject: [PATCH] Fix build with Qt 5.5 and gcc 4.9
+
+---
+ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 1 +
+ src/lib/plugins/qtwebkit/spellcheck/speller.h | 2 +-
+ src/plugins.pri | 2 --
+ src/plugins/TabManager/TabManager.pro | 8 +-------
+ src/plugins/TabManager/tabmanagerplugin.h | 1 -
+ src/plugins/TabManager/tabmanagerwidget.cpp | 1 +
+ src/plugins/TabManager/tldextractor/tldextractor.h | 1 +
+ 7 files changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+index 836658d..42e2f8a 100644
+--- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
++++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+@@ -48,6 +48,7 @@
+ #include "qtlocalpeer.h"
+ #include <QtCore/QCoreApplication>
+ #include <QtCore/QTime>
++#include <QDataStream>
+
+ #if defined(Q_OS_WIN)
+ #include <QtCore/QLibrary>
+diff --git a/src/lib/plugins/qtwebkit/spellcheck/speller.h b/src/lib/plugins/qtwebkit/spellcheck/speller.h
+index e3c1657..b711a46 100644
+--- a/src/lib/plugins/qtwebkit/spellcheck/speller.h
++++ b/src/lib/plugins/qtwebkit/spellcheck/speller.h
+@@ -40,7 +40,7 @@ class QUPZILLA_EXPORT Speller : public QObject
+ QString code;
+ QString name;
+
+- bool operator==(const Language &other) {
++ bool operator==(const Language &other) const {
+ return this->name == other.name &&
+ this->name.left(2) == other.name.left(2);
+ // Compare only first two chars of name.
+diff --git a/src/plugins.pri b/src/plugins.pri
+index d7e9f4c..2784d79 100644
+--- a/src/plugins.pri
++++ b/src/plugins.pri
+@@ -27,8 +27,6 @@ INCLUDEPATH += $$PWD/lib/3rdparty \
+ DEPENDPATH += $$INCLUDEPATH \
+ $$PWD/lib/data \
+
+-include(lib/3rdparty/qtsingleapplication/qtsingleapplication.pri)
+-
+ TEMPLATE = lib
+ CONFIG += plugin
+ DESTDIR = $$QZ_DESTDIR/plugins/
+diff --git a/src/plugins/TabManager/TabManager.pro b/src/plugins/TabManager/TabManager.pro
+index c2bff69..d47baec 100644
+--- a/src/plugins/TabManager/TabManager.pro
++++ b/src/plugins/TabManager/TabManager.pro
+@@ -21,10 +21,4 @@ TRANSLATIONS = \
+ include(tldextractor/tldextractor.pri)
+
+ PLUGIN_DIR = $$PWD
+-srcdir = $$(QUPZILLA_SRCDIR)
+-equals(srcdir, "") {
+- include(../../plugins.pri)
+-}
+-else {
+- include($$srcdir/src/plugins.pri)
+-}
++include(../../plugins.pri)
+diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h
+index 680ea70..2dcc480 100644
+--- a/src/plugins/TabManager/tabmanagerplugin.h
++++ b/src/plugins/TabManager/tabmanagerplugin.h
+@@ -25,7 +25,6 @@
+ #include <QDebug>
+ #include <QLabel>
+ #include <QMessageBox>
+-#include <QWebElement>
+ #include <QVBoxLayout>
+ #include <QPointer>
+
+diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp
+index 6f9fdd3..eda4dbe 100644
+--- a/src/plugins/TabManager/tabmanagerwidget.cpp
++++ b/src/plugins/TabManager/tabmanagerwidget.cpp
+@@ -34,6 +34,7 @@
+ #include <QDesktopWidget>
+ #include <QDialogButtonBox>
+ #include <QStackedWidget>
++#include <QWebView>
+ #include <QDialog>
+ #include <QTimer>
+ #include <QLabel>
+diff --git a/src/plugins/TabManager/tldextractor/tldextractor.h b/src/plugins/TabManager/tldextractor/tldextractor.h
+index b0163db..7dc5204 100644
+--- a/src/plugins/TabManager/tldextractor/tldextractor.h
++++ b/src/plugins/TabManager/tldextractor/tldextractor.h
+@@ -21,6 +21,7 @@
+ #define TLDExtractor_Version "1.0"
+
+ #include <QHash>
++#include <QObject>
+ #include <QStringList>
+
+ class TLDExtractor : public QObject
diff --git a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
index 21a113e..bc7359d 100644
--- a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
+++ b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
@@ -59,6 +59,8 @@ src_prepare() {
# patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
+ epatch "${FILESDIR}"/${P}-qt55.patch
+
epatch_user
# remove outdated prebuilt localizations
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/, www-client/qupzilla/files/
@ 2016-01-20 17:22 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2016-01-20 17:22 UTC (permalink / raw
To: gentoo-commits
commit: bf1ed37fa924db7c4e56f80669656bb8b7c7f66a
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 17:22:10 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 17:22:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1ed37f
www-client/qupzilla: remove old
Package-Manager: portage-2.2.27
.../files/qtsingleapplication-QDataStream.patch | 10 --
.../qupzilla/files/qupzilla-1.8.6-qt55.patch | 105 --------------------
www-client/qupzilla/qupzilla-1.8.6-r1.ebuild | 106 --------------------
www-client/qupzilla/qupzilla-1.8.6-r2.ebuild | 108 ---------------------
4 files changed, 329 deletions(-)
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
deleted file mode 100644
index 25694af..0000000
--- a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/qupzilla-1.8.6-qt55.patch b/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch
deleted file mode 100644
index 8014398..0000000
--- a/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 739e01796a3587c21e7496b43a5a3cdb3fb6d7c5 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Thu, 11 Jun 2015 20:21:39 +0200
-Subject: [PATCH] Fix build with Qt 5.5 and gcc 4.9
-
----
- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 1 +
- src/lib/plugins/qtwebkit/spellcheck/speller.h | 2 +-
- src/plugins.pri | 2 --
- src/plugins/TabManager/TabManager.pro | 8 +-------
- src/plugins/TabManager/tabmanagerplugin.h | 1 -
- src/plugins/TabManager/tabmanagerwidget.cpp | 1 +
- src/plugins/TabManager/tldextractor/tldextractor.h | 1 +
- 7 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
-index 836658d..42e2f8a 100644
---- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
-+++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
-@@ -48,6 +48,7 @@
- #include "qtlocalpeer.h"
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTime>
-+#include <QDataStream>
-
- #if defined(Q_OS_WIN)
- #include <QtCore/QLibrary>
-diff --git a/src/lib/plugins/qtwebkit/spellcheck/speller.h b/src/lib/plugins/qtwebkit/spellcheck/speller.h
-index e3c1657..b711a46 100644
---- a/src/lib/plugins/qtwebkit/spellcheck/speller.h
-+++ b/src/lib/plugins/qtwebkit/spellcheck/speller.h
-@@ -40,7 +40,7 @@ class QUPZILLA_EXPORT Speller : public QObject
- QString code;
- QString name;
-
-- bool operator==(const Language &other) {
-+ bool operator==(const Language &other) const {
- return this->name == other.name &&
- this->name.left(2) == other.name.left(2);
- // Compare only first two chars of name.
-diff --git a/src/plugins.pri b/src/plugins.pri
-index d7e9f4c..2784d79 100644
---- a/src/plugins.pri
-+++ b/src/plugins.pri
-@@ -27,8 +27,6 @@ INCLUDEPATH += $$PWD/lib/3rdparty \
- DEPENDPATH += $$INCLUDEPATH \
- $$PWD/lib/data \
-
--include(lib/3rdparty/qtsingleapplication/qtsingleapplication.pri)
--
- TEMPLATE = lib
- CONFIG += plugin
- DESTDIR = $$QZ_DESTDIR/plugins/
-diff --git a/src/plugins/TabManager/TabManager.pro b/src/plugins/TabManager/TabManager.pro
-index c2bff69..d47baec 100644
---- a/src/plugins/TabManager/TabManager.pro
-+++ b/src/plugins/TabManager/TabManager.pro
-@@ -21,10 +21,4 @@ TRANSLATIONS = \
- include(tldextractor/tldextractor.pri)
-
- PLUGIN_DIR = $$PWD
--srcdir = $$(QUPZILLA_SRCDIR)
--equals(srcdir, "") {
-- include(../../plugins.pri)
--}
--else {
-- include($$srcdir/src/plugins.pri)
--}
-+include(../../plugins.pri)
-diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h
-index 680ea70..2dcc480 100644
---- a/src/plugins/TabManager/tabmanagerplugin.h
-+++ b/src/plugins/TabManager/tabmanagerplugin.h
-@@ -25,7 +25,6 @@
- #include <QDebug>
- #include <QLabel>
- #include <QMessageBox>
--#include <QWebElement>
- #include <QVBoxLayout>
- #include <QPointer>
-
-diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp
-index 6f9fdd3..eda4dbe 100644
---- a/src/plugins/TabManager/tabmanagerwidget.cpp
-+++ b/src/plugins/TabManager/tabmanagerwidget.cpp
-@@ -34,6 +34,7 @@
- #include <QDesktopWidget>
- #include <QDialogButtonBox>
- #include <QStackedWidget>
-+#include <QWebView>
- #include <QDialog>
- #include <QTimer>
- #include <QLabel>
-diff --git a/src/plugins/TabManager/tldextractor/tldextractor.h b/src/plugins/TabManager/tldextractor/tldextractor.h
-index b0163db..7dc5204 100644
---- a/src/plugins/TabManager/tldextractor/tldextractor.h
-+++ b/src/plugins/TabManager/tldextractor/tldextractor.h
-@@ -21,6 +21,7 @@
- #define TLDExtractor_Version "1.0"
-
- #include <QHash>
-+#include <QObject>
- #include <QStringList>
-
- class TLDExtractor : public QObject
diff --git a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
deleted file mode 100644
index bc7359d..0000000
--- a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
-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='1f8122da27362ae14a6e3c029830b51e9bac03be'
-PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive
-
-inherit eutils l10n multilib qmake-utils vcs-snapshot
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
- https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )
- kde? ( qt4 )"
-
-RDEPEND="dev-libs/openssl:0
- x11-libs/libX11
- gnome-keyring? ( gnome-base/gnome-keyring )
- kde? ( kde-base/kdelibs:4
- kde-apps/kwalletd:4 )
- qt4? ( >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtgui-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=dev-qt/qtsql-4.8:4[sqlite]
- >=dev-qt/qtwebkit-4.8:4
- dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
- qt5? ( dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtconcurrent:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwebkit:5
- dbus? ( dev-qt/qtdbus:5 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=( AUTHORS CHANGELOG FAQ README.md )
-S=${WORKDIR}/${MY_P}
-
-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
- }
-
- # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
- epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
-
- epatch "${FILESDIR}"/${P}-qt55.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_VERSION}/plugins/* "${S}"/src/plugins/ || die
-
- l10n_find_plocales_changes "translations" "" ".ts"
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
- # see BUILDING document for explanation of options
- export \
- QUPZILLA_PREFIX="${EPREFIX}/usr/" \
- USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
- USE_QTWEBKIT_2_2=true \
- DISABLE_DBUS=$(usex dbus '' 'true') \
- KDE_INTEGRATION=$(usex kde 'true' '') \
- NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
-
- if use qt4 ; then
- eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
- else
- eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
- fi
-}
-
-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
-}
diff --git a/www-client/qupzilla/qupzilla-1.8.6-r2.ebuild b/www-client/qupzilla/qupzilla-1.8.6-r2.ebuild
deleted file mode 100644
index 08e72f9..0000000
--- a/www-client/qupzilla/qupzilla-1.8.6-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
-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='1f8122da27362ae14a6e3c029830b51e9bac03be'
-PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive
-
-inherit eutils l10n multilib qmake-utils vcs-snapshot
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
- https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )
- kde? ( qt4 )"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- x11-libs/libX11
- gnome-keyring? ( gnome-base/gnome-keyring )
- kde? ( kde-base/kdelibs:4
- kde-apps/kwalletd:4 )
- qt4? ( >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtgui-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=dev-qt/qtsql-4.8:4[sqlite]
- >=dev-qt/qtwebkit-4.8:4
- dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
- qt5? ( dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtconcurrent:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwebkit:5
- dbus? ( dev-qt/qtdbus:5 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=( AUTHORS CHANGELOG FAQ README.md )
-S=${WORKDIR}/${MY_P}
-
-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
- }
-
- # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
- epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
-
- epatch "${FILESDIR}"/${P}-qt55.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_VERSION}/plugins/* "${S}"/src/plugins/ || die
-
- l10n_find_plocales_changes "translations" "" ".ts"
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
- # see BUILDING document for explanation of options
- export \
- QUPZILLA_PREFIX="${EPREFIX}/usr/" \
- USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
- USE_QTWEBKIT_2_2=true \
- DISABLE_DBUS=$(usex dbus '' 'true') \
- KDE_INTEGRATION=$(usex kde 'true' '') \
- NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
-
- if use qt4 ; then
- eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
- else
- eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
- fi
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/, www-client/qupzilla/files/
@ 2017-05-07 13:41 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-05-07 13:41 UTC (permalink / raw
To: gentoo-commits
commit: bf9726be7ed2586dd862f6ff241915c859c3a2cc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 11:33:04 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 7 13:41:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9726be
www-client/qupzilla: Fix build with >=dev-libs/openssl-1.1.0
See also:
https://github.com/openssl/openssl/issues/962#issuecomment-208792020
Closes: https://github.com/gentoo/gentoo/pull/4560
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../files/qupzilla-2.1.2-openssl-1.1.0.patch | 103 +++++++++++++++++++++
www-client/qupzilla/qupzilla-2.1.2.ebuild | 2 +
2 files changed, 105 insertions(+)
diff --git a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch b/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
new file mode 100644
index 00000000000..42effa56d5c
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
@@ -0,0 +1,103 @@
+From efc4725e91e10ccfef257143408d3a683e74a866 Mon Sep 17 00:00:00 2001
+From: Jose Rios <joseriosneto@protonmail.com>
+Date: Mon, 1 May 2017 02:12:26 +0100
+Subject: [PATCH] Fixed compilation for Openssl 1.1.0
+
+Most of libcrypto and libssl internal structures were made
+opaque in this version not allowing to instatiate them in
+the stack.
+
+More info:
+ * https://www.openssl.org/news/openssl-1.1.0-notes.html
+ * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
+---
+ src/lib/tools/aesinterface.cpp | 28 ++++++++++++++++------------
+ src/lib/tools/aesinterface.h | 4 ++--
+ 2 files changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp
+index fa33eb3..29ed37e 100644
+--- a/src/lib/tools/aesinterface.cpp
++++ b/src/lib/tools/aesinterface.cpp
+@@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent)
+ : QObject(parent)
+ , m_ok(false)
+ {
+- EVP_CIPHER_CTX_init(&m_encodeCTX);
+- EVP_CIPHER_CTX_init(&m_decodeCTX);
++ m_encodeCTX = EVP_CIPHER_CTX_new();
++ m_decodeCTX = EVP_CIPHER_CTX_new();
++ EVP_CIPHER_CTX_init(m_encodeCTX);
++ EVP_CIPHER_CTX_init(m_decodeCTX);
+ }
+
+ AesInterface::~AesInterface()
+ {
+- EVP_CIPHER_CTX_cleanup(&m_encodeCTX);
+- EVP_CIPHER_CTX_cleanup(&m_decodeCTX);
++ EVP_CIPHER_CTX_cleanup(m_encodeCTX);
++ EVP_CIPHER_CTX_cleanup(m_decodeCTX);
++ EVP_CIPHER_CTX_free(m_encodeCTX);
++ EVP_CIPHER_CTX_free(m_decodeCTX);
+ }
+
+ bool AesInterface::isOk()
+@@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
+ int result = 0;
+ if (evpMode == EVP_PKEY_MO_ENCRYPT) {
+ m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
+- result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
++ result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
+ }
+ else if (evpMode == EVP_PKEY_MO_DECRYPT) {
+- result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
++ result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
+ }
+
+ if (result == 0) {
+@@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray &
+ uchar* ciphertext = (uchar*)malloc(cipherlength);
+
+ // allows reusing of 'm_encodeCTX' for multiple encryption cycles
+- EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL);
++ EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL);
+
+ // update ciphertext, c_len is filled with the length of ciphertext generated,
+ // dataLength is the size of plaintext in bytes
+- EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
++ EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
+
+ // update ciphertext with the final remaining bytes
+- EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength);
++ EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength);
+
+ dataLength = cipherlength + finalLength;
+ QByteArray out((char*)ciphertext, dataLength);
+@@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray
+ // because we have padding ON, we must allocate an extra cipher block size of memory
+ uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE);
+
+- EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL);
+- EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
+- int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength);
++ EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL);
++ EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
++ int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength);
+
+ cipherLength = plainTextLength + finalLength;
+
+diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h
+index e0debc6..c3c940c 100644
+--- a/src/lib/tools/aesinterface.h
++++ b/src/lib/tools/aesinterface.h
+@@ -50,8 +50,8 @@ class QUPZILLA_EXPORT AesInterface : public QObject
+ private:
+ bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray());
+
+- EVP_CIPHER_CTX m_encodeCTX;
+- EVP_CIPHER_CTX m_decodeCTX;
++ EVP_CIPHER_CTX* m_encodeCTX;
++ EVP_CIPHER_CTX* m_decodeCTX;
+
+ bool m_ok;
+ QByteArray m_iVector;
diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild
index d29ba96bcf1..3aa6951284d 100644
--- a/www-client/qupzilla/qupzilla-2.1.2.ebuild
+++ b/www-client/qupzilla/qupzilla-2.1.2.ebuild
@@ -58,6 +58,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
+PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" )
+
src_unpack() {
if [[ ${PV} == *9999 ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-07 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-01 13:02 [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/, www-client/qupzilla/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2016-01-20 17:22 Davide Pesavento
2017-05-07 13:41 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox