1 |
commit: ed4d3f945c9f50f16ae0d7678c646a53e8e4972c |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 8 16:18:36 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 8 17:15:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4d3f94 |
7 |
|
8 |
net-libs/telepathy-qt: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5358 |
11 |
|
12 |
.../telepathy-qt-0.9.6.1-default-source.patch | 25 ------- |
13 |
.../files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch | 83 ---------------------- |
14 |
.../files/telepathy-qt-0.9.6.1-includes.patch | 24 ------- |
15 |
.../files/telepathy-qt-0.9.6.1-python.patch | 43 ----------- |
16 |
...telepathy-qt-0.9.6.1-service-dependencies.patch | 22 ------ |
17 |
5 files changed, 197 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-default-source.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-default-source.patch |
20 |
deleted file mode 100644 |
21 |
index 0366b0fa7f3..00000000000 |
22 |
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-default-source.patch |
23 |
+++ /dev/null |
24 |
@@ -1,25 +0,0 @@ |
25 |
-From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001 |
26 |
-From: Niels Ole Salscheider <niels_ole@××××××××××××××××××.de> |
27 |
-Date: Fri, 5 Jun 2015 12:47:13 +0200 |
28 |
-Subject: CMake: Fixed deprecated _BSD_SOURCE. |
29 |
- |
30 |
-Since glibc-2.20 _DEFAULT_SOURCE definition is also required. |
31 |
- |
32 |
-Reviewed-by: Alexandr Akulich |
33 |
- |
34 |
-diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake |
35 |
-index d34b24d..dc98697 100644 |
36 |
---- a/cmake/modules/TelepathyDefaults.cmake |
37 |
-+++ b/cmake/modules/TelepathyDefaults.cmake |
38 |
-@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
39 |
- endif(${NOT_RELEASE} EQUAL 1) |
40 |
- |
41 |
- if(CMAKE_SYSTEM_NAME MATCHES Linux) |
42 |
-- add_definitions(-D_BSD_SOURCE) |
43 |
-+ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) |
44 |
- endif(CMAKE_SYSTEM_NAME MATCHES Linux) |
45 |
- |
46 |
- # Compiler coverage |
47 |
--- |
48 |
-cgit v0.10.2 |
49 |
- |
50 |
|
51 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch |
52 |
deleted file mode 100644 |
53 |
index bf519fa782d..00000000000 |
54 |
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch |
55 |
+++ /dev/null |
56 |
@@ -1,83 +0,0 @@ |
57 |
-From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 |
58 |
-From: Niels Ole Salscheider <niels_ole@××××××××××××××××××.de> |
59 |
-Date: Tue, 29 Sep 2015 20:52:15 +0200 |
60 |
-Subject: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly |
61 |
- |
62 |
-Since GStreamer-1.5.1 config header file moved to LIBDIR. |
63 |
- |
64 |
-Reviewed-by: Alexandr Akulich <akulichalexander@×××××.com> |
65 |
- |
66 |
-diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt |
67 |
-index 250bfdb..dd71430 100644 |
68 |
---- a/TelepathyQt/Farstream/CMakeLists.txt |
69 |
-+++ b/TelepathyQt/Farstream/CMakeLists.txt |
70 |
-@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND) |
71 |
- include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR} |
72 |
- ${TELEPATHY_GLIB_INCLUDE_DIR} |
73 |
- ${FARSTREAM_INCLUDE_DIR} |
74 |
-- ${GSTREAMER_INCLUDE_DIR} |
75 |
-+ ${GSTREAMER_INCLUDE_DIRS} |
76 |
- ${GLIB2_INCLUDE_DIR} |
77 |
- ${LIBXML2_INCLUDE_DIR} |
78 |
- ${DBUS_INCLUDE_DIR}) |
79 |
-diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake |
80 |
-index 63fb41c..ffdd7a9 100644 |
81 |
---- a/cmake/modules/FindGStreamer.cmake |
82 |
-+++ b/cmake/modules/FindGStreamer.cmake |
83 |
-@@ -13,12 +13,12 @@ |
84 |
- |
85 |
- # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) |
86 |
- |
87 |
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
88 |
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
89 |
- # in cache already |
90 |
- SET(GSTREAMER_FIND_QUIETLY TRUE) |
91 |
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
92 |
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
93 |
- SET(GSTREAMER_FIND_QUIETLY FALSE) |
94 |
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
95 |
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) |
96 |
- |
97 |
- IF (NOT WIN32) |
98 |
- # use pkg-config to get the directories and then use these values |
99 |
-@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h |
100 |
- PATH_SUFFIXES gstreamer-1.0 |
101 |
- ) |
102 |
- |
103 |
-+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h |
104 |
-+ PATHS |
105 |
-+ ${PC_GSTREAMER_INCLUDEDIR} |
106 |
-+ ${PC_GSTREAMER_INCLUDE_DIRS} |
107 |
-+ PATH_SUFFIXES gstreamer-1.0 |
108 |
-+ ) |
109 |
-+ |
110 |
-+SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR}) |
111 |
-+ |
112 |
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 |
113 |
- PATHS |
114 |
- ${PC_GSTREAMER_LIBDIR} |
115 |
-@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR) |
116 |
- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") |
117 |
- ENDIF (GSTREAMER_INCLUDE_DIR) |
118 |
- |
119 |
-+IF (GSTREAMER_CONF_INCLUDE_DIR) |
120 |
-+ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}") |
121 |
-+ELSE (GSTREAMER_CONF_INCLUDE_DIR) |
122 |
-+ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found") |
123 |
-+ENDIF (GSTREAMER_CONF_INCLUDE_DIR) |
124 |
-+ |
125 |
- IF (GSTREAMER_LIBRARIES) |
126 |
- #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") |
127 |
- ELSE (GSTREAMER_LIBRARIES) |
128 |
-@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES) |
129 |
- |
130 |
- |
131 |
- INCLUDE(FindPackageHandleStandardArgs) |
132 |
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) |
133 |
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY) |
134 |
- |
135 |
--MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) |
136 |
-+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) |
137 |
--- |
138 |
-cgit v0.10.2 |
139 |
- |
140 |
|
141 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-includes.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-includes.patch |
142 |
deleted file mode 100644 |
143 |
index 6496d25a9de..00000000000 |
144 |
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-includes.patch |
145 |
+++ /dev/null |
146 |
@@ -1,24 +0,0 @@ |
147 |
-From 1e1f53e9d91684918c34ec50392f86287e001a1e Mon Sep 17 00:00:00 2001 |
148 |
-From: Alexandr Akulich <akulichalexander@×××××.com> |
149 |
-Date: Fri, 15 Jan 2016 18:52:59 +0500 |
150 |
-Subject: [PATCH] BaseChannel: Reduced includes (doesn't depend on client stuff |
151 |
- anymore). |
152 |
- |
153 |
---- |
154 |
- TelepathyQt/base-channel.cpp | 3 ++- |
155 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
156 |
- |
157 |
-diff --git a/TelepathyQt/base-channel.cpp b/TelepathyQt/base-channel.cpp |
158 |
-index eb41463..720d58e 100644 |
159 |
---- a/TelepathyQt/base-channel.cpp |
160 |
-+++ b/TelepathyQt/base-channel.cpp |
161 |
-@@ -26,7 +26,8 @@ |
162 |
- |
163 |
- #include "TelepathyQt/_gen/base-channel.moc.hpp" |
164 |
- #include "TelepathyQt/_gen/base-channel-internal.moc.hpp" |
165 |
--#include "TelepathyQt/future-internal.h" |
166 |
-+#include "TelepathyQt/_gen/future-constants.h" |
167 |
-+#include "TelepathyQt/_gen/future-types.h" |
168 |
- |
169 |
- #include "TelepathyQt/debug-internal.h" |
170 |
- |
171 |
|
172 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-python.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-python.patch |
173 |
deleted file mode 100644 |
174 |
index 9eb6c32f03e..00000000000 |
175 |
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-python.patch |
176 |
+++ /dev/null |
177 |
@@ -1,43 +0,0 @@ |
178 |
-From 3716c048d65d4984513591cb8b1031858201db6c Mon Sep 17 00:00:00 2001 |
179 |
-From: Alex Merry <alex.merry@×××.org> |
180 |
-Date: Sun, 16 Aug 2015 20:30:41 +0100 |
181 |
-Subject: [PATCH] Tell CMake what version of Python we want to find. |
182 |
- |
183 |
-This ensures that Python 2 is found if possible, rather than Python 3. |
184 |
- |
185 |
-https://bugs.freedesktop.org/show_bug.cgi?id=91659 |
186 |
- |
187 |
-Reviewed-by: Alexandr Akulich <akulichalexander@×××××.com> |
188 |
---- |
189 |
- CMakeLists.txt | 2 +- |
190 |
- cmake/modules/FindPythonLibrary.cmake | 3 ++- |
191 |
- 2 files changed, 3 insertions(+), 2 deletions(-) |
192 |
- |
193 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
194 |
-index 9a014ce..a01b586 100644 |
195 |
---- a/CMakeLists.txt |
196 |
-+++ b/CMakeLists.txt |
197 |
-@@ -133,8 +133,8 @@ macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support" |
198 |
- set(CMAKE_REQUIRED_FLAGS "") |
199 |
- |
200 |
- # Find python version >= 2.5 |
201 |
--find_package(PythonLibrary REQUIRED) |
202 |
- set(REQUIRED_PY 2.5) |
203 |
-+find_package(PythonLibrary ${REQUIRED_PY} REQUIRED) |
204 |
- if(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY}) |
205 |
- message(STATUS "Python ${PYTHON_SHORT_VERSION} found") |
206 |
- else(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY}) |
207 |
-diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake |
208 |
-index 2585859..c6bb712 100644 |
209 |
---- a/cmake/modules/FindPythonLibrary.cmake |
210 |
-+++ b/cmake/modules/FindPythonLibrary.cmake |
211 |
-@@ -28,7 +28,8 @@ if(EXISTS PYTHON_LIBRARY) |
212 |
- # Already in cache, be silent |
213 |
- set(PYTHONLIBRARY_FOUND TRUE) |
214 |
- else(EXISTS PYTHON_LIBRARY) |
215 |
-- FIND_PACKAGE(PythonInterp) |
216 |
-+ message(STATUS "PythonLibrary find version: ${PythonLibrary_FIND_VERSION}") |
217 |
-+ FIND_PACKAGE(PythonInterp ${PythonLibrary_FIND_VERSION}) |
218 |
- |
219 |
- if(PYTHONINTERP_FOUND) |
220 |
- FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH}) |
221 |
|
222 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-service-dependencies.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-service-dependencies.patch |
223 |
deleted file mode 100644 |
224 |
index 1b3bd7608ca..00000000000 |
225 |
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-service-dependencies.patch |
226 |
+++ /dev/null |
227 |
@@ -1,22 +0,0 @@ |
228 |
-From 7389dc990c67d4269f3a79c924c054e87f2e4ac5 Mon Sep 17 00:00:00 2001 |
229 |
-From: Alexandr Akulich <akulichalexander@×××××.com> |
230 |
-Date: Fri, 15 Jan 2016 18:54:09 +0500 |
231 |
-Subject: [PATCH] CMakeLists: Added missing service dependence. |
232 |
- |
233 |
-telepathy-qt-service depends on generated stable and future types and consts. |
234 |
---- |
235 |
- TelepathyQt/CMakeLists.txt | 1 + |
236 |
- 1 file changed, 1 insertion(+) |
237 |
- |
238 |
-diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt |
239 |
-index 58668cd..1b32d32 100644 |
240 |
---- a/TelepathyQt/CMakeLists.txt |
241 |
-+++ b/TelepathyQt/CMakeLists.txt |
242 |
-@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT) |
243 |
- #endif (ENABLE_COMPILER_COVERAGE) |
244 |
- # lets build a static only library until we have a stable API/ABI |
245 |
- add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS}) |
246 |
-+ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen) |
247 |
- |
248 |
- # generate service moc files |
249 |
- foreach(moc_src ${telepathy_qt_service_MOC_SRCS}) |