1 |
commit: 11d73f9ba26a36e9ed893b2561a8d76f29e357b1 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 1 12:44:59 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 1 13:01:54 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d73f9b |
7 |
|
8 |
www-client/qupzilla: backport patch from upstream solving build failure with Qt 5.5 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
.../qupzilla/files/qupzilla-1.8.6-qt55.patch | 105 +++++++++++++++++++++ |
13 |
www-client/qupzilla/qupzilla-1.8.6-r1.ebuild | 2 + |
14 |
2 files changed, 107 insertions(+) |
15 |
|
16 |
diff --git a/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch b/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch |
17 |
new file mode 100644 |
18 |
index 0000000..8014398 |
19 |
--- /dev/null |
20 |
+++ b/www-client/qupzilla/files/qupzilla-1.8.6-qt55.patch |
21 |
@@ -0,0 +1,105 @@ |
22 |
+From 739e01796a3587c21e7496b43a5a3cdb3fb6d7c5 Mon Sep 17 00:00:00 2001 |
23 |
+From: David Rosca <nowrep@×××××.com> |
24 |
+Date: Thu, 11 Jun 2015 20:21:39 +0200 |
25 |
+Subject: [PATCH] Fix build with Qt 5.5 and gcc 4.9 |
26 |
+ |
27 |
+--- |
28 |
+ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 1 + |
29 |
+ src/lib/plugins/qtwebkit/spellcheck/speller.h | 2 +- |
30 |
+ src/plugins.pri | 2 -- |
31 |
+ src/plugins/TabManager/TabManager.pro | 8 +------- |
32 |
+ src/plugins/TabManager/tabmanagerplugin.h | 1 - |
33 |
+ src/plugins/TabManager/tabmanagerwidget.cpp | 1 + |
34 |
+ src/plugins/TabManager/tldextractor/tldextractor.h | 1 + |
35 |
+ 7 files changed, 5 insertions(+), 11 deletions(-) |
36 |
+ |
37 |
+diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp |
38 |
+index 836658d..42e2f8a 100644 |
39 |
+--- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp |
40 |
++++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp |
41 |
+@@ -48,6 +48,7 @@ |
42 |
+ #include "qtlocalpeer.h" |
43 |
+ #include <QtCore/QCoreApplication> |
44 |
+ #include <QtCore/QTime> |
45 |
++#include <QDataStream> |
46 |
+ |
47 |
+ #if defined(Q_OS_WIN) |
48 |
+ #include <QtCore/QLibrary> |
49 |
+diff --git a/src/lib/plugins/qtwebkit/spellcheck/speller.h b/src/lib/plugins/qtwebkit/spellcheck/speller.h |
50 |
+index e3c1657..b711a46 100644 |
51 |
+--- a/src/lib/plugins/qtwebkit/spellcheck/speller.h |
52 |
++++ b/src/lib/plugins/qtwebkit/spellcheck/speller.h |
53 |
+@@ -40,7 +40,7 @@ class QUPZILLA_EXPORT Speller : public QObject |
54 |
+ QString code; |
55 |
+ QString name; |
56 |
+ |
57 |
+- bool operator==(const Language &other) { |
58 |
++ bool operator==(const Language &other) const { |
59 |
+ return this->name == other.name && |
60 |
+ this->name.left(2) == other.name.left(2); |
61 |
+ // Compare only first two chars of name. |
62 |
+diff --git a/src/plugins.pri b/src/plugins.pri |
63 |
+index d7e9f4c..2784d79 100644 |
64 |
+--- a/src/plugins.pri |
65 |
++++ b/src/plugins.pri |
66 |
+@@ -27,8 +27,6 @@ INCLUDEPATH += $$PWD/lib/3rdparty \ |
67 |
+ DEPENDPATH += $$INCLUDEPATH \ |
68 |
+ $$PWD/lib/data \ |
69 |
+ |
70 |
+-include(lib/3rdparty/qtsingleapplication/qtsingleapplication.pri) |
71 |
+- |
72 |
+ TEMPLATE = lib |
73 |
+ CONFIG += plugin |
74 |
+ DESTDIR = $$QZ_DESTDIR/plugins/ |
75 |
+diff --git a/src/plugins/TabManager/TabManager.pro b/src/plugins/TabManager/TabManager.pro |
76 |
+index c2bff69..d47baec 100644 |
77 |
+--- a/src/plugins/TabManager/TabManager.pro |
78 |
++++ b/src/plugins/TabManager/TabManager.pro |
79 |
+@@ -21,10 +21,4 @@ TRANSLATIONS = \ |
80 |
+ include(tldextractor/tldextractor.pri) |
81 |
+ |
82 |
+ PLUGIN_DIR = $$PWD |
83 |
+-srcdir = $$(QUPZILLA_SRCDIR) |
84 |
+-equals(srcdir, "") { |
85 |
+- include(../../plugins.pri) |
86 |
+-} |
87 |
+-else { |
88 |
+- include($$srcdir/src/plugins.pri) |
89 |
+-} |
90 |
++include(../../plugins.pri) |
91 |
+diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h |
92 |
+index 680ea70..2dcc480 100644 |
93 |
+--- a/src/plugins/TabManager/tabmanagerplugin.h |
94 |
++++ b/src/plugins/TabManager/tabmanagerplugin.h |
95 |
+@@ -25,7 +25,6 @@ |
96 |
+ #include <QDebug> |
97 |
+ #include <QLabel> |
98 |
+ #include <QMessageBox> |
99 |
+-#include <QWebElement> |
100 |
+ #include <QVBoxLayout> |
101 |
+ #include <QPointer> |
102 |
+ |
103 |
+diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp |
104 |
+index 6f9fdd3..eda4dbe 100644 |
105 |
+--- a/src/plugins/TabManager/tabmanagerwidget.cpp |
106 |
++++ b/src/plugins/TabManager/tabmanagerwidget.cpp |
107 |
+@@ -34,6 +34,7 @@ |
108 |
+ #include <QDesktopWidget> |
109 |
+ #include <QDialogButtonBox> |
110 |
+ #include <QStackedWidget> |
111 |
++#include <QWebView> |
112 |
+ #include <QDialog> |
113 |
+ #include <QTimer> |
114 |
+ #include <QLabel> |
115 |
+diff --git a/src/plugins/TabManager/tldextractor/tldextractor.h b/src/plugins/TabManager/tldextractor/tldextractor.h |
116 |
+index b0163db..7dc5204 100644 |
117 |
+--- a/src/plugins/TabManager/tldextractor/tldextractor.h |
118 |
++++ b/src/plugins/TabManager/tldextractor/tldextractor.h |
119 |
+@@ -21,6 +21,7 @@ |
120 |
+ #define TLDExtractor_Version "1.0" |
121 |
+ |
122 |
+ #include <QHash> |
123 |
++#include <QObject> |
124 |
+ #include <QStringList> |
125 |
+ |
126 |
+ class TLDExtractor : public QObject |
127 |
|
128 |
diff --git a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild |
129 |
index 21a113e..bc7359d 100644 |
130 |
--- a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild |
131 |
+++ b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild |
132 |
@@ -59,6 +59,8 @@ src_prepare() { |
133 |
# patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142 |
134 |
epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch |
135 |
|
136 |
+ epatch "${FILESDIR}"/${P}-qt55.patch |
137 |
+ |
138 |
epatch_user |
139 |
|
140 |
# remove outdated prebuilt localizations |