| 1 |
commit: 20771fe04feb054dbb48aaf1c215b9f2ab548026 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Sep 3 15:53:35 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 18:51:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20771fe0 |
| 7 |
|
| 8 |
dev-libs/grantlee: remove unused patches |
| 9 |
|
| 10 |
.../files/grantlee-0.1.9-qt-test-optional.patch | 46 ---------------------- |
| 11 |
dev-libs/grantlee/files/grantlee-slot.patch | 40 ------------------- |
| 12 |
2 files changed, 86 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch |
| 15 |
deleted file mode 100644 |
| 16 |
index 6af42cb..00000000 |
| 17 |
--- a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,46 +0,0 @@ |
| 20 |
-From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001 |
| 21 |
-From: Johannes Huber <johu@g.o> |
| 22 |
-Date: Thu, 22 Mar 2012 11:37:57 +0100 |
| 23 |
-Subject: [PATCH] Search only for qt-test if test build option is enabled. |
| 24 |
- |
| 25 |
-Build fails on systems were no qt-test is installed and the build option |
| 26 |
-for tests is disabled. See downstream bug report |
| 27 |
-https://bugs.gentoo.org/show_bug.cgi?id=409131. |
| 28 |
---- |
| 29 |
- templates/CMakeLists.txt | 6 +++++- |
| 30 |
- textdocument/CMakeLists.txt | 6 +++++- |
| 31 |
- 2 files changed, 10 insertions(+), 2 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt |
| 34 |
-index 0594cc3..eec0f12 100644 |
| 35 |
---- a/templates/CMakeLists.txt |
| 36 |
-+++ b/templates/CMakeLists.txt |
| 37 |
-@@ -1,5 +1,9 @@ |
| 38 |
- |
| 39 |
--find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) |
| 40 |
-+if (BUILD_TESTS) |
| 41 |
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) |
| 42 |
-+else (BUILD_TESTS) |
| 43 |
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript) |
| 44 |
-+endif (BUILD_TESTS) |
| 45 |
- |
| 46 |
- include(${Grantlee_USE_FILE}) |
| 47 |
- |
| 48 |
-diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt |
| 49 |
-index d456663..8fa2892 100644 |
| 50 |
---- a/textdocument/CMakeLists.txt |
| 51 |
-+++ b/textdocument/CMakeLists.txt |
| 52 |
-@@ -1,5 +1,9 @@ |
| 53 |
- |
| 54 |
--find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest) |
| 55 |
-+if (BUILD_TESTS) |
| 56 |
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) |
| 57 |
-+else (BUILD_TESTS) |
| 58 |
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript) |
| 59 |
-+endif (BUILD_TESTS) |
| 60 |
- |
| 61 |
- include(${QT_USE_FILE}) |
| 62 |
- |
| 63 |
--- |
| 64 |
-1.7.9.4 |
| 65 |
- |
| 66 |
|
| 67 |
diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch |
| 68 |
deleted file mode 100644 |
| 69 |
index 814fb9d..00000000 |
| 70 |
--- a/dev-libs/grantlee/files/grantlee-slot.patch |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,40 +0,0 @@ |
| 73 |
-Install headers to a custom location to permit slotting with Qt4 version. |
| 74 |
- |
| 75 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 76 |
-index 45f8673..7832a3b 100644 |
| 77 |
---- a/CMakeLists.txt |
| 78 |
-+++ b/CMakeLists.txt |
| 79 |
-@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 |
| 80 |
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) |
| 81 |
- set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} ) |
| 82 |
- set( BIN_INSTALL_DIR bin ) |
| 83 |
--set( INCLUDE_INSTALL_DIR include ) |
| 84 |
-+set( INCLUDE_INSTALL_DIR include/grantlee5 ) |
| 85 |
- set( DATA_INSTALL_DIR share/apps ) |
| 86 |
- |
| 87 |
- # set up RPATH/install_name_dir |
| 88 |
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt |
| 89 |
-index 789205c..7045449 100644 |
| 90 |
---- a/templates/lib/CMakeLists.txt |
| 91 |
-+++ b/templates/lib/CMakeLists.txt |
| 92 |
-@@ -79,6 +79,7 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates) |
| 93 |
- generate_export_header(Grantlee_Templates) |
| 94 |
- set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates) |
| 95 |
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) |
| 96 |
-+target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
| 97 |
- |
| 98 |
- if (BUILD_TESTS) |
| 99 |
- set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT") |
| 100 |
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt |
| 101 |
-index 14163db..7c609f9 100644 |
| 102 |
---- a/textdocument/lib/CMakeLists.txt |
| 103 |
-+++ b/textdocument/lib/CMakeLists.txt |
| 104 |
-@@ -24,7 +24,7 @@ add_library(Grantlee_TextDocument SHARED |
| 105 |
- generate_export_header(Grantlee_TextDocument) |
| 106 |
- add_library(Grantlee::TextDocument ALIAS Grantlee_TextDocument) |
| 107 |
- set_property(TARGET Grantlee_TextDocument PROPERTY EXPORT_NAME TextDocument) |
| 108 |
-- |
| 109 |
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
| 110 |
- |
| 111 |
- target_link_libraries(Grantlee_TextDocument |
| 112 |
- LINK_PUBLIC Qt5::Gui |
Archives