diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-qt/qthelp/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-qt/qthelp/files')
-rw-r--r-- | dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch | 35 | ||||
-rw-r--r-- | dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch | 25 |
2 files changed, 0 insertions, 60 deletions
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch deleted file mode 100644 index e157381c8f05..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -Date: Wed, 6 May 2015 23:21:54 +0200 -Subject: [PATCH] Install assistant_adp binary. - ---- - tools/assistant/compat/compat.pro | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro -index 171106a..a14e3f8 100755 ---- a/tools/assistant/compat/compat.pro -+++ b/tools/assistant/compat/compat.pro -@@ -14,6 +14,8 @@ QT += xml network - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ mac { - TARGET = Assistant_adp - } - -+target.path = $$[QT_INSTALL_BINS] -+INSTALLS += target -+ - TRANSLATIONS = translations/assistant_adp_de.ts \ - translations/assistant_adp_ja.ts \ - translations/assistant_adp_pl.ts \ --- -2.4.0 - diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch deleted file mode 100644 index 4ba6b6ff7417..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -Date: Wed, 6 May 2015 22:44:57 +0200 -Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers. - -See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47 ---- - bin/syncqt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bin/syncqt b/bin/syncqt -index dd94d4d..cc5a7bf 100755 ---- a/bin/syncqt -+++ b/bin/syncqt -@@ -81,6 +81,7 @@ my %modules = ( # path to module name map - "ActiveQt" => "$basedir/src/activeqt", - "QtTest" => "$basedir/src/testlib", - "QtHelp" => "$basedir/tools/assistant/lib", -+ "QtAssistant" => "$basedir/tools/assistant/compat/lib", - "QtDesigner" => "$basedir/tools/designer/src/lib", - "QtUiTools" => "$basedir/tools/designer/src/uitools", - "QtDBus" => "$basedir/src/dbus", --- -2.4.0 - |