From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/kchmviewer-7.7-force-qtwebkit.patch | 26 ---------------------- .../files/kchmviewer-7.7-underlinking.patch | 11 --------- 2 files changed, 37 deletions(-) delete mode 100644 app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch delete mode 100644 app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch (limited to 'app-text/kchmviewer/files') diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch deleted file mode 100644 index 897c62a998c2..000000000000 --- a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 75bfed89cbdd..000000000000 --- a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } - -- cgit v1.2.3