summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2016-01-20 18:22:10 +0100
committerDavide Pesavento <pesa@gentoo.org>2016-01-20 18:22:10 +0100
commitbf1ed37fa924db7c4e56f80669656bb8b7c7f66a (patch)
tree39de81227b43eaaba6dd1eeaa34d27c0016b2c72 /www-client
parentsys-cluster/swift: fixing CVE-2016-0737, CVE-2016-0738 (diff)
downloadgentoo-bf1ed37fa924db7c4e56f80669656bb8b7c7f66a.tar.gz
gentoo-bf1ed37fa924db7c4e56f80669656bb8b7c7f66a.tar.bz2
gentoo-bf1ed37fa924db7c4e56f80669656bb8b7c7f66a.zip
www-client/qupzilla: remove old
Package-Manager: portage-2.2.27
Diffstat (limited to 'www-client')
-rw-r--r--www-client/qupzilla/files/qtsingleapplication-QDataStream.patch10
-rw-r--r--www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch105
-rw-r--r--www-client/qupzilla/qupzilla-1.8.6-r1.ebuild106
-rw-r--r--www-client/qupzilla/qupzilla-1.8.6-r2.ebuild108
4 files changed, 0 insertions, 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 25694afcc9a..00000000000
--- 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 8014398ebf7..00000000000
--- 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 bc7359d6e67..00000000000
--- 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 08e72f9dce9..00000000000
--- 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
-}