1 |
commit: 4ea23d69ad0e2567f32002ec5f8351bdb65c0e9e |
2 |
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 11 15:48:47 2018 +0000 |
4 |
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 11 15:48:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea23d69 |
7 |
|
8 |
app-text/fbreader: fix building on the 17.1 profile |
9 |
|
10 |
Closes: https://bugs.gentoo.org/644084 |
11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
12 |
|
13 |
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 84 ++++ |
14 |
.../fbreader/files/fbreader-0.99.4-combined.patch | 535 +++++++++++++++++++++ |
15 |
2 files changed, 619 insertions(+) |
16 |
|
17 |
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild |
18 |
new file mode 100644 |
19 |
index 00000000000..41a203a894e |
20 |
--- /dev/null |
21 |
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild |
22 |
@@ -0,0 +1,84 @@ |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+ |
26 |
+EAPI=6 |
27 |
+ |
28 |
+inherit eutils multilib flag-o-matic qmake-utils |
29 |
+ |
30 |
+DESCRIPTION="E-Book Reader. Supports many e-book formats" |
31 |
+HOMEPAGE="http://www.fbreader.org/" |
32 |
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz" |
33 |
+ |
34 |
+LICENSE="GPL-2" |
35 |
+SLOT="0" |
36 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86" |
37 |
+IUSE="debug" |
38 |
+ |
39 |
+RDEPEND=" |
40 |
+ app-arch/bzip2 |
41 |
+ dev-libs/expat |
42 |
+ dev-libs/libunibreak |
43 |
+ dev-libs/fribidi |
44 |
+ dev-db/sqlite |
45 |
+ net-misc/curl |
46 |
+ sys-libs/zlib |
47 |
+ dev-qt/qtcore:5 |
48 |
+ dev-qt/qtgui:5 |
49 |
+ dev-qt/qtwidgets:5 |
50 |
+ dev-qt/qtnetwork:5[ssl] |
51 |
+" |
52 |
+DEPEND="${RDEPEND} |
53 |
+ virtual/pkgconfig |
54 |
+" |
55 |
+ |
56 |
+# bugs #452636, #515698, #516794, #437262, #592588 |
57 |
+PATCHES=( "${FILESDIR}"/${P}-combined.patch ) |
58 |
+ |
59 |
+src_prepare() { |
60 |
+ default |
61 |
+ |
62 |
+ append-cflags -std=c++11 |
63 |
+ |
64 |
+ # Let portage decide about the compiler |
65 |
+ sed -e "/^CC = /d" \ |
66 |
+ -i makefiles/arch/desktop.mk || die "removing CC line failed" |
67 |
+ |
68 |
+ # let portage strip the binary |
69 |
+ sed -e '/@strip/d' \ |
70 |
+ -i fbreader/desktop/Makefile || die |
71 |
+ |
72 |
+ # Respect *FLAGS |
73 |
+ sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \ |
74 |
+ -i makefiles/arch/desktop.mk || die "CFLAGS sed failed" |
75 |
+ sed -e "/^ CFLAGS +=/d" \ |
76 |
+ -i makefiles/config.mk || die "CFLAGS sed failed" |
77 |
+ sed -e "/^ LDFLAGS += -s$/d" \ |
78 |
+ -i makefiles/config.mk || die "LDFLAGS sed failed" |
79 |
+ sed -e "/^LDFLAGS =$/d" \ |
80 |
+ -i makefiles/arch/desktop.mk || die "LDFLAGS sed failed" |
81 |
+ |
82 |
+ # Qt5 moc |
83 |
+ sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \ |
84 |
+ -i makefiles/arch/desktop.mk || die "updating desktop.mk failed" |
85 |
+ |
86 |
+ echo "TARGET_ARCH = desktop" > makefiles/target.mk |
87 |
+ echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk |
88 |
+ |
89 |
+ echo "UI_TYPE = qt4" >> makefiles/target.mk |
90 |
+ |
91 |
+ if use debug; then |
92 |
+ echo "TARGET_STATUS = debug" >> makefiles/target.mk |
93 |
+ else |
94 |
+ echo "TARGET_STATUS = release" >> makefiles/target.mk |
95 |
+ fi |
96 |
+} |
97 |
+ |
98 |
+src_compile() { |
99 |
+ # bug #484516 |
100 |
+ emake -j1 |
101 |
+} |
102 |
+ |
103 |
+src_install() { |
104 |
+ default |
105 |
+ dosym FBReader /usr/bin/fbreader |
106 |
+} |
107 |
|
108 |
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch |
109 |
new file mode 100644 |
110 |
index 00000000000..f75c0fdf1e2 |
111 |
--- /dev/null |
112 |
+++ b/app-text/fbreader/files/fbreader-0.99.4-combined.patch |
113 |
@@ -0,0 +1,535 @@ |
114 |
+diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile |
115 |
+--- fbreader-0.99.4.orig/fbreader/Makefile 2012-11-30 19:41:25.000000000 +0700 |
116 |
++++ fbreader-0.99.4/fbreader/Makefile 2018-01-11 22:18:18.000208200 +0700 |
117 |
+@@ -23,5 +23,5 @@ |
118 |
+ done; |
119 |
+ @echo -n 'Linking $(TARGET) ...' |
120 |
+- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 |
121 |
++ @$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 |
122 |
+ @echo ' OK' |
123 |
+ |
124 |
+diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop |
125 |
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop 2012-11-30 19:41:25.000000000 +0700 |
126 |
++++ fbreader-0.99.4/fbreader/desktop/desktop 2018-01-11 22:13:58.401219117 +0700 |
127 |
+@@ -22,2 +22,3 @@ |
128 |
+ Icon=FBReader |
129 |
+ Categories=Office;Viewer;Literature; |
130 |
++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain; |
131 |
+diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp |
132 |
+--- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 19:41:25.000000000 +0700 |
133 |
++++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp 2018-01-11 22:18:33.000207569 +0700 |
134 |
+@@ -60,5 +60,5 @@ |
135 |
+ return false; |
136 |
+ } |
137 |
+- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0}; |
138 |
++ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0}; |
139 |
+ if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) { |
140 |
+ clear(); |
141 |
+diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk |
142 |
+--- fbreader-0.99.4.orig/makefiles/arch/desktop.mk 2012-11-30 19:41:25.000000000 +0700 |
143 |
++++ fbreader-0.99.4/makefiles/arch/desktop.mk 2018-01-11 22:18:40.119207269 +0700 |
144 |
+@@ -15,27 +15,9 @@ |
145 |
+ CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG |
146 |
+ LDFLAGS = |
147 |
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) |
148 |
++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) |
149 |
+ |
150 |
+-ifeq "$(UI_TYPE)" "qt" |
151 |
+- MOC = moc-qt3 |
152 |
+- QTINCLUDE = -I /usr/include/qt3 |
153 |
+-else |
154 |
+- MOC = $(shell pkg-config QtCore --variable=moc_location) |
155 |
+- QTINCLUDE = -I $(shell pkg-config --cflags QtCore) |
156 |
+-endif |
157 |
+- |
158 |
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft) |
159 |
+- |
160 |
+-ifeq "$(UI_TYPE)" "qt" |
161 |
+- UILIBS = -lqt-mt |
162 |
+-endif |
163 |
+- |
164 |
+-ifeq "$(UI_TYPE)" "qt4" |
165 |
+- UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork) |
166 |
+-endif |
167 |
+- |
168 |
+-ifeq "$(UI_TYPE)" "gtk" |
169 |
+- UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg |
170 |
+-endif |
171 |
++MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc" |
172 |
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network) |
173 |
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network) |
174 |
+ |
175 |
+ RM = rm -rvf |
176 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp |
177 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2012-11-30 19:41:25.000000000 +0700 |
178 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2018-01-11 22:18:40.120207269 +0700 |
179 |
+@@ -18,7 +18,7 @@ |
180 |
+ */ |
181 |
+ |
182 |
+-#include <QtGui/QBoxLayout> |
183 |
+-#include <QtGui/QLineEdit> |
184 |
+-#include <QtGui/QToolBar> |
185 |
++#include <QtWidgets/QBoxLayout> |
186 |
++#include <QtWidgets/QLineEdit> |
187 |
++#include <QtWidgets/QToolBar> |
188 |
+ #include <QtGui/QKeyEvent> |
189 |
+ |
190 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp |
191 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2012-11-30 19:41:25.000000000 +0700 |
192 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2018-01-11 22:18:40.120207269 +0700 |
193 |
+@@ -18,15 +18,15 @@ |
194 |
+ */ |
195 |
+ |
196 |
+-#include <QtGui/QApplication> |
197 |
++#include <QtWidgets/QApplication> |
198 |
+ #include <QtGui/QPixmap> |
199 |
+ #include <QtGui/QImage> |
200 |
+ #include <QtGui/QIcon> |
201 |
+-#include <QtGui/QToolBar> |
202 |
+-#include <QtGui/QMenuBar> |
203 |
+-#include <QtGui/QMenu> |
204 |
+-#include <QtGui/QToolButton> |
205 |
+-#include <QtGui/QLayout> |
206 |
++#include <QtWidgets/QToolBar> |
207 |
++#include <QtWidgets/QMenuBar> |
208 |
++#include <QtWidgets/QMenu> |
209 |
++#include <QtWidgets/QToolButton> |
210 |
++#include <QtWidgets/QLayout> |
211 |
+ #include <QtGui/QWheelEvent> |
212 |
+-#include <QtGui/QDockWidget> |
213 |
++#include <QtWidgets/QDockWidget> |
214 |
+ #include <QtCore/QObjectList> |
215 |
+ |
216 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h |
217 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2012-11-30 19:41:25.000000000 +0700 |
218 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2018-01-11 22:18:40.120207269 +0700 |
219 |
+@@ -23,6 +23,6 @@ |
220 |
+ #include <map> |
221 |
+ |
222 |
+-#include <QtGui/QMainWindow> |
223 |
+-#include <QtGui/QAction> |
224 |
++#include <QtWidgets/QMainWindow> |
225 |
++#include <QtWidgets/QAction> |
226 |
+ #include <QtGui/QCursor> |
227 |
+ |
228 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp |
229 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2012-11-30 19:41:25.000000000 +0700 |
230 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2018-01-11 22:18:40.120207269 +0700 |
231 |
+@@ -18,6 +18,6 @@ |
232 |
+ */ |
233 |
+ |
234 |
+-#include <QtGui/QApplication> |
235 |
+-#include <QtGui/QPushButton> |
236 |
++#include <QtWidgets/QApplication> |
237 |
++#include <QtWidgets/QPushButton> |
238 |
+ |
239 |
+ #include <ZLDialogManager.h> |
240 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h |
241 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2012-11-30 19:41:25.000000000 +0700 |
242 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2018-01-11 22:18:40.120207269 +0700 |
243 |
+@@ -21,6 +21,6 @@ |
244 |
+ #define __ZLQTDIALOG_H__ |
245 |
+ |
246 |
+-#include <QtGui/QDialog> |
247 |
+-#include <QtGui/QLayout> |
248 |
++#include <QtWidgets/QDialog> |
249 |
++#include <QtWidgets/QLayout> |
250 |
+ |
251 |
+ #include <ZLDialog.h> |
252 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp |
253 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2012-11-30 19:41:25.000000000 +0700 |
254 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2018-01-11 22:18:40.120207269 +0700 |
255 |
+@@ -18,8 +18,8 @@ |
256 |
+ */ |
257 |
+ |
258 |
+-#include <QtGui/QApplication> |
259 |
+-#include <QtGui/QDesktopWidget> |
260 |
+-#include <QtGui/QWidget> |
261 |
+-#include <QtGui/QLayout> |
262 |
++#include <QtWidgets/QApplication> |
263 |
++#include <QtWidgets/QDesktopWidget> |
264 |
++#include <QtWidgets/QWidget> |
265 |
++#include <QtWidgets/QLayout> |
266 |
+ |
267 |
+ #include "ZLQtDialogContent.h" |
268 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp |
269 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2012-11-30 19:41:25.000000000 +0700 |
270 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2018-01-11 22:18:40.120207269 +0700 |
271 |
+@@ -18,9 +18,9 @@ |
272 |
+ */ |
273 |
+ |
274 |
+-#include <QtGui/QApplication> |
275 |
+-#include <QtGui/QMessageBox> |
276 |
+-#include <QtGui/QFileDialog> |
277 |
++#include <QtWidgets/QApplication> |
278 |
++#include <QtWidgets/QMessageBox> |
279 |
++#include <QtWidgets/QFileDialog> |
280 |
+ #include <QtGui/QClipboard> |
281 |
+-#include <QtGui/QDesktopWidget> |
282 |
++#include <QtWidgets/QDesktopWidget> |
283 |
+ |
284 |
+ #include "ZLQtDialogManager.h" |
285 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp |
286 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2012-11-30 19:41:25.000000000 +0700 |
287 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2018-01-11 22:18:40.120207269 +0700 |
288 |
+@@ -18,5 +18,5 @@ |
289 |
+ */ |
290 |
+ |
291 |
+-#include <QtGui/QFileDialog> |
292 |
++#include <QtWidgets/QFileDialog> |
293 |
+ |
294 |
+ #include "ZLQtOpenFileDialog.h" |
295 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp |
296 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2012-11-30 19:41:25.000000000 +0700 |
297 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2018-01-11 22:18:40.121207269 +0700 |
298 |
+@@ -20,14 +20,14 @@ |
299 |
+ #include <cctype> |
300 |
+ |
301 |
+-#include <QtGui/QCheckBox> |
302 |
+-#include <QtGui/QComboBox> |
303 |
+-#include <QtGui/QLabel> |
304 |
+-#include <QtGui/QGroupBox> |
305 |
+-#include <QtGui/QRadioButton> |
306 |
+-#include <QtGui/QPushButton> |
307 |
+-#include <QtGui/QSpinBox> |
308 |
+-#include <QtGui/QLineEdit> |
309 |
+-#include <QtGui/QSlider> |
310 |
+-#include <QtGui/QLayout> |
311 |
++#include <QtWidgets/QCheckBox> |
312 |
++#include <QtWidgets/QComboBox> |
313 |
++#include <QtWidgets/QLabel> |
314 |
++#include <QtWidgets/QGroupBox> |
315 |
++#include <QtWidgets/QRadioButton> |
316 |
++#include <QtWidgets/QPushButton> |
317 |
++#include <QtWidgets/QSpinBox> |
318 |
++#include <QtWidgets/QLineEdit> |
319 |
++#include <QtWidgets/QSlider> |
320 |
++#include <QtWidgets/QLayout> |
321 |
+ |
322 |
+ #include <ZLStringUtil.h> |
323 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp |
324 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2012-11-30 19:41:25.000000000 +0700 |
325 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2018-01-11 22:18:40.121207269 +0700 |
326 |
+@@ -18,9 +18,9 @@ |
327 |
+ */ |
328 |
+ |
329 |
+-#include <QtGui/QApplication> |
330 |
+-#include <QtGui/QDesktopWidget> |
331 |
+-#include <QtGui/QLayout> |
332 |
+-#include <QtGui/QPushButton> |
333 |
+-#include <QtGui/QButtonGroup> |
334 |
++#include <QtWidgets/QApplication> |
335 |
++#include <QtWidgets/QDesktopWidget> |
336 |
++#include <QtWidgets/QLayout> |
337 |
++#include <QtWidgets/QPushButton> |
338 |
++#include <QtWidgets/QButtonGroup> |
339 |
+ #include <QtGui/QResizeEvent> |
340 |
+ |
341 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h |
342 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2012-11-30 19:41:25.000000000 +0700 |
343 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2018-01-11 22:18:40.121207269 +0700 |
344 |
+@@ -21,7 +21,7 @@ |
345 |
+ #define __ZLQTOPTIONSDIALOG_H__ |
346 |
+ |
347 |
+-#include <QtGui/QWidget> |
348 |
+-#include <QtGui/QTabWidget> |
349 |
+-#include <QtGui/QDialog> |
350 |
++#include <QtWidgets/QWidget> |
351 |
++#include <QtWidgets/QTabWidget> |
352 |
++#include <QtWidgets/QDialog> |
353 |
+ |
354 |
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h" |
355 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp |
356 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2012-11-30 19:41:25.000000000 +0700 |
357 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2018-01-11 22:18:40.121207269 +0700 |
358 |
+@@ -20,9 +20,9 @@ |
359 |
+ #include <unistd.h> |
360 |
+ |
361 |
+-#include <QtGui/QApplication> |
362 |
+-#include <QtGui/QDesktopWidget> |
363 |
+-#include <QtGui/QWidget> |
364 |
+-#include <QtGui/QLabel> |
365 |
+-#include <QtGui/QLayout> |
366 |
++#include <QtWidgets/QApplication> |
367 |
++#include <QtWidgets/QDesktopWidget> |
368 |
++#include <QtWidgets/QWidget> |
369 |
++#include <QtWidgets/QLabel> |
370 |
++#include <QtWidgets/QLayout> |
371 |
+ #include <QtCore/QThreadPool> |
372 |
+ |
373 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h |
374 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2012-11-30 19:41:25.000000000 +0700 |
375 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2018-01-11 22:18:40.121207269 +0700 |
376 |
+@@ -23,9 +23,9 @@ |
377 |
+ #include <string> |
378 |
+ |
379 |
+-#include <QtGui/QWidget> |
380 |
++#include <QtWidgets/QWidget> |
381 |
+ #include <QtGui/QCursor> |
382 |
+-#include <QtGui/QDialog> |
383 |
+-#include <QtGui/QProgressBar> |
384 |
+-#include <QtGui/QLabel> |
385 |
++#include <QtWidgets/QDialog> |
386 |
++#include <QtWidgets/QProgressBar> |
387 |
++#include <QtWidgets/QLabel> |
388 |
+ #include <QtCore/QRunnable> |
389 |
+ |
390 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp |
391 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2012-11-30 19:41:25.000000000 +0700 |
392 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2018-01-11 22:18:40.120207269 +0700 |
393 |
+@@ -20,10 +20,10 @@ |
394 |
+ #include <algorithm> |
395 |
+ |
396 |
+-#include <QtGui/QSplitter> |
397 |
+-#include <QtGui/QVBoxLayout> |
398 |
+-#include <QtGui/QHBoxLayout> |
399 |
+-#include <QtGui/QScrollBar> |
400 |
+ #include <QtGui/QResizeEvent> |
401 |
+ #include <QtCore/QDebug> |
402 |
++#include <QtWidgets/QSplitter> |
403 |
++#include <QtWidgets/QVBoxLayout> |
404 |
++#include <QtWidgets/QHBoxLayout> |
405 |
++#include <QtWidgets/QScrollBar> |
406 |
+ |
407 |
+ #include <ZLFile.h> |
408 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h |
409 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2012-11-30 19:41:25.000000000 +0700 |
410 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2018-01-11 22:18:40.121207269 +0700 |
411 |
+@@ -25,10 +25,10 @@ |
412 |
+ #include <QtCore/QMap> |
413 |
+ |
414 |
+-#include <QtGui/QDialog> |
415 |
+-#include <QtGui/QScrollArea> |
416 |
+-#include <QtGui/QPushButton> |
417 |
+-#include <QtGui/QLabel> |
418 |
+-#include <QtGui/QLineEdit> |
419 |
+-#include <QtGui/QWidget> |
420 |
++#include <QtWidgets/QDialog> |
421 |
++#include <QtWidgets/QScrollArea> |
422 |
++#include <QtWidgets/QPushButton> |
423 |
++#include <QtWidgets/QLabel> |
424 |
++#include <QtWidgets/QLineEdit> |
425 |
++#include <QtWidgets/QWidget> |
426 |
+ |
427 |
+ #include <ZLTreeDialog.h> |
428 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp |
429 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 19:41:25.000000000 +0700 |
430 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2018-01-11 22:13:28.444220377 +0700 |
431 |
+@@ -49,3 +49,4 @@ |
432 |
+ path = replacement + path.substr(1); |
433 |
+ } |
434 |
++ ZLUnixFSManager::normalizeRealPath(path); |
435 |
+ } |
436 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h |
437 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h 2012-11-30 19:41:25.000000000 +0700 |
438 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h 2018-01-11 22:18:40.121207269 +0700 |
439 |
+@@ -21,5 +21,5 @@ |
440 |
+ #define __ZLQAPPLICATION_H__ |
441 |
+ |
442 |
+-#include <QtGui/QApplication> |
443 |
++#include <QtWidgets/QApplication> |
444 |
+ |
445 |
+ class ZLQApplication : public QApplication { |
446 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp |
447 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2012-11-30 19:41:25.000000000 +0700 |
448 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2018-01-11 22:18:40.121207269 +0700 |
449 |
+@@ -20,5 +20,5 @@ |
450 |
+ #include <QtCore/QTextCodec> |
451 |
+ #include <QtCore/QFile> |
452 |
+-#include <QtGui/QApplication> |
453 |
++#include <QtWidgets/QApplication> |
454 |
+ #include <QtGui/QFileOpenEvent> |
455 |
+ |
456 |
+@@ -73,5 +73,5 @@ |
457 |
+ new ZLQApplication(argc, argv); |
458 |
+ |
459 |
+- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8")); |
460 |
++ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8")); |
461 |
+ |
462 |
+ ZLibrary::parseArguments(argc, argv); |
463 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp |
464 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2012-11-30 19:41:25.000000000 +0700 |
465 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2018-01-11 22:18:40.120207269 +0700 |
466 |
+@@ -25,5 +25,7 @@ |
467 |
+ #include <QtCore/QList> |
468 |
+ #include <QtCore/QTimer> |
469 |
++#include <QtCore/QUrlQuery> |
470 |
+ |
471 |
++#include <QtNetwork/QNetworkCookie> |
472 |
+ #include <QtNetwork/QNetworkRequest> |
473 |
+ #include <QtNetwork/QNetworkReply> |
474 |
+@@ -150,10 +152,10 @@ |
475 |
+ if (!scope.request->postParameters().empty()) { |
476 |
+ QByteArray data; |
477 |
+- QUrl tmp; |
478 |
++ QUrlQuery tmp; |
479 |
+ typedef std::pair<std::string, std::string> string_pair; |
480 |
+ foreach (const string_pair &pair, scope.request->postParameters()) { |
481 |
+ tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second)); |
482 |
+ } |
483 |
+- data = tmp.encodedQuery(); |
484 |
++ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery(); |
485 |
+ reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data); |
486 |
+ } else { |
487 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp |
488 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 19:41:25.000000000 +0700 |
489 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-01-11 22:13:39.639219906 +0700 |
490 |
+@@ -87,5 +87,5 @@ |
491 |
+ |
492 |
+ void QtWaitingSpinner::setRoundness(qreal roundness) { |
493 |
+- myRoundness = std::max(0.0, std::min(100.0, roundness)); |
494 |
++ myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness)); |
495 |
+ } |
496 |
+ |
497 |
+@@ -149,5 +149,5 @@ |
498 |
+ qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1); |
499 |
+ qreal resultAlpha = color.alphaF() - gradation * distance; |
500 |
+- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds |
501 |
++ resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds |
502 |
+ color.setAlphaF(resultAlpha); |
503 |
+ return color; |
504 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h |
505 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2012-11-30 19:41:25.000000000 +0700 |
506 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2018-01-11 22:18:40.121207269 +0700 |
507 |
+@@ -4,5 +4,5 @@ |
508 |
+ #include <QtCore/QTimer> |
509 |
+ |
510 |
+-#include <QtGui/QWidget> |
511 |
++#include <QtWidgets/QWidget> |
512 |
+ #include <QtGui/QColor> |
513 |
+ |
514 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp |
515 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2012-11-30 19:41:25.000000000 +0700 |
516 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2018-01-11 22:18:40.120207269 +0700 |
517 |
+@@ -18,12 +18,12 @@ |
518 |
+ */ |
519 |
+ |
520 |
+-#include <QtGui/QVBoxLayout> |
521 |
+-#include <QtGui/QHBoxLayout> |
522 |
+ #include <QtGui/QPixmap> |
523 |
+ #include <QtGui/QPalette> |
524 |
+ #include <QtGui/QPainter> |
525 |
+ #include <QtGui/QPaintEvent> |
526 |
+-#include <QtGui/QScrollBar> |
527 |
+ #include <QtCore/QTimer> |
528 |
++#include <QtWidgets/QVBoxLayout> |
529 |
++#include <QtWidgets/QHBoxLayout> |
530 |
++#include <QtWidgets/QScrollBar> |
531 |
+ |
532 |
+ #include <QtCore/QDebug> |
533 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h |
534 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2012-11-30 19:41:25.000000000 +0700 |
535 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2018-01-11 22:18:40.120207269 +0700 |
536 |
+@@ -21,10 +21,10 @@ |
537 |
+ #define __ZLQTITEMSLISTWIDGET_H__ |
538 |
+ |
539 |
+-#include <QtGui/QWidget> |
540 |
+-#include <QtGui/QFrame> |
541 |
+-#include <QtGui/QPushButton> |
542 |
+-#include <QtGui/QLabel> |
543 |
+-#include <QtGui/QVBoxLayout> |
544 |
+-#include <QtGui/QScrollArea> |
545 |
++#include <QtWidgets/QWidget> |
546 |
++#include <QtWidgets/QFrame> |
547 |
++#include <QtWidgets/QPushButton> |
548 |
++#include <QtWidgets/QLabel> |
549 |
++#include <QtWidgets/QVBoxLayout> |
550 |
++#include <QtWidgets/QScrollArea> |
551 |
+ |
552 |
+ #include <ZLTreeTitledNode.h> |
553 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp |
554 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2012-11-30 19:41:25.000000000 +0700 |
555 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2018-01-11 22:18:40.120207269 +0700 |
556 |
+@@ -18,8 +18,8 @@ |
557 |
+ */ |
558 |
+ |
559 |
+-#include <QtGui/QVBoxLayout> |
560 |
+-#include <QtGui/QHBoxLayout> |
561 |
+-#include <QtGui/QScrollBar> |
562 |
+-#include <QtGui/QGraphicsDropShadowEffect> |
563 |
++#include <QtWidgets/QVBoxLayout> |
564 |
++#include <QtWidgets/QHBoxLayout> |
565 |
++#include <QtWidgets/QScrollBar> |
566 |
++#include <QtWidgets/QGraphicsDropShadowEffect> |
567 |
+ |
568 |
+ #include <QtCore/QDebug> |
569 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h |
570 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2012-11-30 19:41:25.000000000 +0700 |
571 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2018-01-11 22:18:40.121207269 +0700 |
572 |
+@@ -21,9 +21,9 @@ |
573 |
+ #define __ZLQTPREVIEWWIDGET_H__ |
574 |
+ |
575 |
+-#include <QtGui/QWidget> |
576 |
+-#include <QtGui/QPushButton> |
577 |
+-#include <QtGui/QLabel> |
578 |
+-#include <QtGui/QScrollArea> |
579 |
+-#include <QtGui/QVBoxLayout> |
580 |
++#include <QtWidgets/QWidget> |
581 |
++#include <QtWidgets/QPushButton> |
582 |
++#include <QtWidgets/QLabel> |
583 |
++#include <QtWidgets/QScrollArea> |
584 |
++#include <QtWidgets/QVBoxLayout> |
585 |
+ #include <QtCore/QSet> |
586 |
+ |
587 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp |
588 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2012-11-30 19:41:25.000000000 +0700 |
589 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2018-01-11 22:18:40.120207269 +0700 |
590 |
+@@ -19,7 +19,7 @@ |
591 |
+ |
592 |
+ #include <QtCore/QDebug> |
593 |
+-#include <QtGui/QStyle> |
594 |
+-#include <QtGui/QCompleter> |
595 |
+-#include <QtGui/QStringListModel> |
596 |
++#include <QtCore/QStringListModel> |
597 |
++#include <QtWidgets/QStyle> |
598 |
++#include <QtWidgets/QCompleter> |
599 |
+ |
600 |
+ #include <ZLibrary.h> |
601 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h |
602 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2012-11-30 19:41:25.000000000 +0700 |
603 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2018-01-11 22:18:40.121207269 +0700 |
604 |
+@@ -22,6 +22,6 @@ |
605 |
+ |
606 |
+ #include <QtCore/QSet> |
607 |
+-#include <QtGui/QLabel> |
608 |
+-#include <QtGui/QLineEdit> |
609 |
++#include <QtWidgets/QLabel> |
610 |
++#include <QtWidgets/QLineEdit> |
611 |
+ |
612 |
+ #include "QtWaitingSpinner.h" |
613 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp |
614 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2012-11-30 19:41:25.000000000 +0700 |
615 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2018-01-11 22:18:40.121207269 +0700 |
616 |
+@@ -20,6 +20,6 @@ |
617 |
+ #include <algorithm> |
618 |
+ |
619 |
+-#include <QtGui/QLayout> |
620 |
+-#include <QtGui/QScrollBar> |
621 |
++#include <QtWidgets/QLayout> |
622 |
++#include <QtWidgets/QScrollBar> |
623 |
+ #include <QtGui/QPainter> |
624 |
+ #include <QtGui/QPixmap> |
625 |
+@@ -186,9 +186,9 @@ |
626 |
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) { |
627 |
+ if (direction == ZLView::VERTICAL) { |
628 |
+- myRightScrollBar->setShown(enabled && myShowScrollBarAtRight); |
629 |
+- myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight); |
630 |
++ myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight); |
631 |
++ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight); |
632 |
+ } else { |
633 |
+- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom); |
634 |
+- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom); |
635 |
++ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom); |
636 |
++ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom); |
637 |
+ } |
638 |
+ } |
639 |
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h |
640 |
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2012-11-30 19:41:25.000000000 +0700 |
641 |
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2018-01-11 22:18:40.121207269 +0700 |
642 |
+@@ -21,5 +21,5 @@ |
643 |
+ #define __ZLQTVIEWWIDGET_H__ |
644 |
+ |
645 |
+-#include <QtGui/QWidget> |
646 |
++#include <QtWidgets/QWidget> |
647 |
+ |
648 |
+ #include "../../../../core/src/view/ZLViewWidget.h" |