Add fixes patch from bug #446906

Package-Manager: portage-2.2.0_alpha157/cvs/Linux x86_64

4 files changed, 151 insertions, 3 deletions

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index b9a238a703a0..4b2841d4e538 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/qupzilla
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.18 2012/11/01 09:37:43 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.19 2013/01/20 10:04:57 yngwin Exp $
+
+*qupzilla-1.3.5-r1 (20 Jan 2013)
+
+  20 Jan 2013; Ben de Groot <yngwin@gentoo.org>
+  +files/qupzilla-1.3.5-fixes.patch, +qupzilla-1.3.5-r1.ebuild:
+  Add fixes patch from bug #446906
 
   01 Nov 2012;  <ago@gentoo.org> qupzilla-1.3.5.ebuild:
   Stable for x86, wrt bug #440378
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index d73b2f69270e..4a60e89d614a 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,7 +1,9 @@
+AUX qupzilla-1.3.5-fixes.patch 3088 SHA256 af2051355a830d11c7ae7e265100a98642e55ed4aade5e0c29b9efacd9525fb3 SHA512 6ec95bc71d793013744b5efb25caf4f15fc3adfda31764d01b54e4a04b0da640f47dc102aba55d80a6f820881dd3c2a9e30ab2eb1e103a16af1c9a066f96d441 WHIRLPOOL b4eb57a7488e809d064ff42acf682e32c4e663310a7f1d446c29e74f53fdb068d2108579bb9dad608835501709fa66dda09adf7a6ca3746f65cef5884af84d31
 AUX qupzilla-1.3.5-libX11-underlinking.patch 576 SHA256 b8e4b4c9e454db17a98dcba7d642dd47e2dfd6d788395468fa0f3a3d7fc709e5 SHA512 502ec7b82113a3e358f8ffb49906e5d8bd8fe67c399f050af4896ae6e665b87b5602f01cee2b9c6e84ab5661e2e92c8abca3131688eba3e28f1e5d61adf5a5d2 WHIRLPOOL 4b2a878ff334bc8ba8e8a4774130d6ad02cf442b38294df73398e76bc3f1350e7a6fe6e3b9089de413b478301586c415995d2138b19d49de831964f40e6b0e23
 DIST QupZilla-1.3.1.tar.gz 3400816 SHA256 60b02295b84a3e5929e8a188c40acb56807c15e81a9f3018e19da1825283ddf0 SHA512 b36035c083564690edf63ed72f8c0399474cb7f56d238d4a3b360601e8699df73621eafa5ddf2368fb037d16a989237b0a0c305b17092aeaf6164c68ee4bafe3 WHIRLPOOL d1f70d7c966cfcb6e59938019d6aaf1bf24c355585708448cd0ddab5bc85655b13e7da998afb818ca0a3deb7e08b44b1773e9055cbc857df0db83afaddb37d8b
 DIST QupZilla-1.3.5.tar.gz 3579426 SHA256 af8266dce8c3d353a9b7e2c0494651b55f3715b06e8465ff730f4e618fe453a3 SHA512 0fa3a937242c43bbf9fabbf95fe3289849c5ecfad58b0e64a4639f9c9721af55b560227089f644750eb81cd8f15ae942ad7469cdc196e8406fe510a6ad81ad7c WHIRLPOOL b2cf3721375e0eab812db966cf0706b974b7c621c09dcc249bca134842a8a6585842d25bc272967aac32a5ed985423dcb3968fe427e8d6544fe54454fdd2da8c
 EBUILD qupzilla-1.3.1.ebuild 1007 SHA256 e629209f08068318a0dbce4a76421e6a989354f1c3eca1677163513bf0ce3ffd SHA512 08d0a23c4824647c38d57b24ac70bbd5fb09786553dd79fc6430d04c4669ac00c202555af5205c1f43832805f1118609afe734e682fcd0a4a31af3e4efbf0c08 WHIRLPOOL 69bf05be553a49b29064baab7c09c93cf31f98ea1e55421b6d8be3c6b904b211f8589905bcca7a61d0373df213fce8a6bae247053f16de1e900c4ca1d4910753
+EBUILD qupzilla-1.3.5-r1.ebuild 1776 SHA256 198368dabed7d76160b8516426aa55ab57f302029b40ac568eab6a8bd2e0acc5 SHA512 ab8a6ff11fff6bf2acad425e19183faf884f83c37051ae99441e14b165ff46002c035d1a5d5c6df3f2de5e65f11d65acf2a3685e55b963b52fcfd9e6e740a8af WHIRLPOOL 06e4c3923fc7244846e23345c9928cbcb08ef847474672e06f8ef58970127c9f685c468f3787aa5ae8fcf7cd87bc2481c03f2c12a4602f38394c1751c1267f75
 EBUILD qupzilla-1.3.5.ebuild 1729 SHA256 da80963708aa113cb84c8bc8e009730ca1dda7e286729334aae0dd8af1282ac5 SHA512 3b313481699173d43e30e3a0abed6bd5e6df89b6a3b28c78f028ebfb8f1a1681ad204792211aa1bec18fcfcc9b22c17e5cc0ca6f284155a17a863a26ada3728c WHIRLPOOL 7ba23b800d7c6f0fd77799aca125ae8c038e6304ec68119a01f523f195a63a9c9b4fd008541f811c0c6c39e35a83d6939c9ee6d90512dca5a15a8286bc3c37a0
-MISC ChangeLog 2715 SHA256 f0dce15461d4df895aecb992766302411f8e3496ffc462274fd6d8c0b804de75 SHA512 31cfdea61e212a46b8b585ed422be2cb572ca1f29b35295f3298106b72c07c5eb0d62a44c1dc431ad817dcff3659e48866eca384b8c79737569303b7fb15fd85 WHIRLPOOL 7a6cba6bbbb66833817be50a7885803b8c748fa6c42d48d87bd14ab16809f17db4a58c943fac2e8cdd1caa47b49f411652dd23e7fc2083b1d19208f6cb64e367
+MISC ChangeLog 2900 SHA256 1b368b8b56435a2217827c803c196f5026bf297e7192d7e57a9dda5a54866329 SHA512 3033afcb654b0b41d93dda82c94becf326d103666610f2910494eb6b430d7e373d7864ef76cd94c5f21927f9301af8d7117cbf6e0431a3b4b020612ba01b7e31 WHIRLPOOL 0cf2102aae4c6740576435d7c53cf201c397679dfcc6c1717fd2cce45a14785e3d61e942d276af7ac692062bafb3df96efa8e4e235860b1d05faef6ac83155cd
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
diff --git a/www-client/qupzilla/files/qupzilla-1.3.5-fixes.patch b/www-client/qupzilla/files/qupzilla-1.3.5-fixes.patch
new file mode 100644
index 000000000000..0f2bb096baed
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-1.3.5-fixes.patch
@@ -0,0 +1,78 @@
+https://github.com/QupZilla/qupzilla/commit/37da53731c6c92b4ece0bdb6e264472adf2f6d9f
+diff -ru QupZilla-1.3.5.org/src/lib/adblock/adblockicon.cpp QupZilla-1.3.5/src/lib/adblock/adblockicon.cpp
+--- QupZilla-1.3.5.org/src/lib/adblock/adblockicon.cpp	2012-12-11 19:20:32.094777090 +0100
++++ QupZilla-1.3.5/src/lib/adblock/adblockicon.cpp	2012-12-11 19:25:29.891932103 +0100
+@@ -111,7 +111,7 @@
+     menu->addAction(tr("Show AdBlock &Settings"), manager, SLOT(showDialog()));
+     menu->addSeparator();
+ 
+-    if (!pageUrl.isEmpty()) {
++    if (!pageUrl.isEmpty() && m_enabled) {
+         const QString &host = page->url().host().contains(QLatin1String("www.")) ? pageUrl.host().mid(4) : pageUrl.host();
+         const QString &hostFilter = QString("@@||%1^$document").arg(host);
+         const QString &pageFilter = QString("@@|%1|$document").arg(pageUrl.toString());
+
+https://github.com/QupZilla/qupzilla/commit/7eaa2d11e057cc28b22cb5c45f6285c6a350fa67
+and
+https://github.com/QupZilla/qupzilla/issues/652
+diff -ru QupZilla-1.3.5.org/src/lib/history/historymodel.cpp QupZilla-1.3.5/src/lib/history/historymodel.cpp
+--- QupZilla-1.3.5.org/src/lib/history/historymodel.cpp	2012-12-11 19:20:32.085777083 +0100
++++ QupZilla-1.3.5/src/lib/history/historymodel.cpp	2012-12-11 19:24:17.013895571 +0100
+@@ -264,6 +264,7 @@
+     beginResetModel();
+ 
+     delete m_rootItem;
++    m_todayItem = 0;
+     m_rootItem = new HistoryItem(0);
+ 
+     init();
+@@ -448,12 +449,15 @@
+     if (!query.next()) {
+         return;
+     }
++    
++    const qint64 &minTimestamp = query.value(0).toLongLong();
++    if (minTimestamp <= 0) {
++        return;
++    }
+ 
+     const QDate &today = QDate::currentDate();
+     const QDate &week = today.addDays(1 - today.dayOfWeek());
+     const QDate &month = QDate(today.year(), today.month(), 1);
+-
+-    const qint64 &minTimestamp = query.value(0).toLongLong();
+     const qint64 &currentTimestamp = QDateTime::currentMSecsSinceEpoch();
+ 
+     qint64 timestamp = currentTimestamp;
+
+backport of https://github.com/QupZilla/qupzilla/commit/d08ec28d70934fa82d51efceb1a422d96c6812f6
+diff -ru QupZilla-1.3.5.org/src/lib/webview/tabbar.cpp QupZilla-1.3.5/src/lib/webview/tabbar.cpp
+--- QupZilla-1.3.5.org/src/lib/webview/tabbar.cpp	2012-12-11 19:20:32.092777090 +0100
++++ QupZilla-1.3.5/src/lib/webview/tabbar.cpp	2012-12-11 19:27:23.110991048 +0100
+@@ -647,15 +647,6 @@
+     QAbstractButton::leaveEvent(event);
+ }
+ 
+-void CloseButton::hideEvent(QHideEvent* event)
+-{
+-    QAbstractButton::hideEvent(event);
+-
+-    if (!isVisible()) {
+-        deleteLater();
+-    }
+-}
+-
+ void CloseButton::paintEvent(QPaintEvent*)
+ {
+     QPainter p(this);
+diff -ru QupZilla-1.3.5.org/src/lib/webview/tabbar.h QupZilla-1.3.5/src/lib/webview/tabbar.h
+--- QupZilla-1.3.5.org/src/lib/webview/tabbar.h	2012-12-11 19:20:32.093777090 +0100
++++ QupZilla-1.3.5/src/lib/webview/tabbar.h	2012-12-11 19:27:32.539995733 +0100
+@@ -128,7 +128,6 @@
+ 
+     void enterEvent(QEvent* event);
+     void leaveEvent(QEvent* event);
+-    void hideEvent(QHideEvent* event);
+     void paintEvent(QPaintEvent* event);
+ };
+ 
diff --git a/www-client/qupzilla/qupzilla-1.3.5-r1.ebuild b/www-client/qupzilla/qupzilla-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..fafcca702b4d
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.3.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.5-r1.ebuild,v 1.1 2013/01/20 10:04:57 yngwin Exp $
+
+EAPI=5
+PLOCALES="cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
+ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA
+zh_CN zh_TW"
+inherit l10n multilib qt4-r2 vcs-snapshot
+
+MY_P="QupZilla-${PV}"
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="mirror://github/QupZilla/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug kde nonblockdialogs"
+
+DEPEND="
+	>=x11-libs/qt-core-4.7:4
+	>=x11-libs/qt-gui-4.7:4
+	>=x11-libs/qt-script-4.7:4
+	>=x11-libs/qt-sql-4.7:4
+	>=x11-libs/qt-webkit-4.7:4
+	dbus? ( >=x11-libs/qt-dbus-4.7:4 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md TODO"
+
+src_prepare() {
+	# remove outdated copies of localizations:
+	rm -rf bin/locale || die
+	epatch "${FILESDIR}"/${P}-libX11-underlinking.patch
+	epatch "${FILESDIR}"/${P}-fixes.patch
+	epatch_user
+}
+
+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 '>=x11-libs/qt-webkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
+
+	eqmake4
+}
+
+src_install() {
+	qt4-r2_src_install
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+rm_loc() {
+	rm "${D}"/usr/share/${PN}/locale/${1}.qm || die
+}