diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-qt/qthelp/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-qt/qthelp/files')
-rw-r--r-- | dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 | ||||
-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 |
3 files changed, 81 insertions, 0 deletions
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch new file mode 100644 index 000000000000..cc7621969991 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch @@ -0,0 +1,21 @@ +--- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 ++++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 +@@ -14,6 +14,8 @@ + + PROJECTNAME = Assistant + ++DESTDIR = ../../../bin ++ + FORMS += helpdialog.ui \ + mainwindow.ui \ + tabbedbrowser.ui \ +@@ -59,6 +61,9 @@ + 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 \ 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 new file mode 100644 index 000000000000..e157381c8f05 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch @@ -0,0 +1,35 @@ +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 new file mode 100644 index 000000000000..4ba6b6ff7417 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch @@ -0,0 +1,25 @@ +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 + |