diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-10-10 03:44:26 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-10-10 03:44:46 +1100 |
commit | bc4214b01b5728521b0e0357e5284b696ab7eb4e (patch) | |
tree | bf7251ede0b32548122eaa73a2a75c4b6ec3dce2 /app-text/kchmviewer/files | |
parent | sys-apps/yum: keyword for ppc. (diff) | |
download | gentoo-bc4214b01b5728521b0e0357e5284b696ab7eb4e.tar.gz gentoo-bc4214b01b5728521b0e0357e5284b696ab7eb4e.tar.bz2 gentoo-bc4214b01b5728521b0e0357e5284b696ab7eb4e.zip |
app-text/kchmviewer: version bump
Package-Manager: portage-2.3.1
Diffstat (limited to 'app-text/kchmviewer/files')
-rw-r--r-- | app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch | 26 | ||||
-rw-r--r-- | app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch | 11 |
2 files changed, 37 insertions, 0 deletions
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch new file mode 100644 index 000000000000..897c62a998c2 --- /dev/null +++ b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch @@ -0,0 +1,26 @@ +Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine. + +--- a/src/src.pro ++++ b/src/src.pro +@@ -113,21 +113,11 @@ + }
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+- # Qt 5
+- greaterThan(QT_MINOR_VERSION, 5) {
+- # Qt 5.6+
+- error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
+- QT += webengine webenginewidgets
+- DEFINES += USE_WEBENGINE
+- SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
+- HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
+- } else {
+ # Qt 5.0-5.5
+ QT += webkit webkitwidgets
+ DEFINES += USE_WEBKIT
+ SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
+ HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+- }
+ } else {
+ message("Qt4 is not supported anymore, please do not report any errors")
+ QT += webkit webkitwidgets
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch new file mode 100644 index 000000000000..75bfed89cbdd --- /dev/null +++ b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch @@ -0,0 +1,11 @@ +--- a/src/src.pro ++++ b/src/src.pro +@@ -108,7 +108,7 @@ + HEADERS += dbus_interface.h
+ SOURCES += dbus_interface.cpp
+ CONFIG += dbus
+- LIBS += ../lib/libebook/libebook.a
++ LIBS += ../lib/libebook/libebook.a -lchm -lzip
+ POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
+
|