1 |
commit: 5fb9f7dcc80a4c3e292a11271a99a7d14e635a5d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 25 14:38:27 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 25 14:44:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb9f7dc |
7 |
|
8 |
media-libs/libmygpo-qt: 1.1.0 version bump |
9 |
|
10 |
Same as we have with 1.1.0_pre20180401, but disabling failing test. |
11 |
|
12 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
13 |
|
14 |
media-libs/libmygpo-qt/Manifest | 1 + |
15 |
.../files/libmygpo-qt-1.1.0-qt-5.11b3.patch | 136 +++++++++++++++++++++ |
16 |
media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild | 50 ++++++++ |
17 |
3 files changed, 187 insertions(+) |
18 |
|
19 |
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest |
20 |
index 1e3435cbea5..811410b283d 100644 |
21 |
--- a/media-libs/libmygpo-qt/Manifest |
22 |
+++ b/media-libs/libmygpo-qt/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 |
25 |
+DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a |
26 |
DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 |
27 |
|
28 |
diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..77c1c74f42d |
31 |
--- /dev/null |
32 |
+++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch |
33 |
@@ -0,0 +1,136 @@ |
34 |
+From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 |
35 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
36 |
+Date: Sun, 15 Apr 2018 22:20:34 +0200 |
37 |
+Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more |
38 |
+ strict |
39 |
+ |
40 |
+--- |
41 |
+ CMakeLists.txt | 22 +++++++++++----------- |
42 |
+ 1 file changed, 11 insertions(+), 11 deletions(-) |
43 |
+ |
44 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
45 |
+index 2a1f652..eb006d9 100644 |
46 |
+--- a/CMakeLists.txt |
47 |
++++ b/CMakeLists.txt |
48 |
+@@ -5,25 +5,25 @@ project( libmygpo-qt ) |
49 |
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) |
50 |
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) |
51 |
+ |
52 |
+-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) |
53 |
++option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) |
54 |
+ |
55 |
+ if( NOT BUILD_WITH_QT4 ) |
56 |
+- find_package(Qt5Core QUIET) |
57 |
+- if( Qt5Core_DIR ) |
58 |
+- set(MYGPO_QT_VERSION_SUFFIX 5) |
59 |
+- |
60 |
+- macro(qt_wrap_cpp) |
61 |
+- qt5_wrap_cpp(${ARGN}) |
62 |
+- endmacro() |
63 |
++ if( MYGPO_BUILD_TESTS ) |
64 |
++ find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) |
65 |
++ else() |
66 |
++ find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG) |
67 |
+ endif() |
68 |
++ set(MYGPO_QT_VERSION_SUFFIX 5) |
69 |
++ |
70 |
++ macro(qt_wrap_cpp) |
71 |
++ qt5_wrap_cpp(${ARGN}) |
72 |
++ endmacro() |
73 |
+ |
74 |
+ # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for |
75 |
+ # Qt5 |
76 |
+ set(MYGPO_QT_MAJOR_VERSION "5") |
77 |
+ set(MYGPO_QT4_QJSON_DEP "") |
78 |
+-endif() |
79 |
+- |
80 |
+-if( NOT Qt5Core_DIR ) |
81 |
++else() |
82 |
+ message(STATUS "Could not find Qt5, searching for Qt4 instead...") |
83 |
+ message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") |
84 |
+ if( MYGPO_BUILD_TESTS ) |
85 |
+-- |
86 |
+2.17.0 |
87 |
+ |
88 |
+ |
89 |
+From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 |
90 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
91 |
+Date: Sun, 15 Apr 2018 22:29:33 +0200 |
92 |
+Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) |
93 |
+ |
94 |
+--- |
95 |
+ CMakeLists.txt | 3 --- |
96 |
+ src/CMakeLists.txt | 8 ++++++-- |
97 |
+ tests/CMakeLists.txt | 12 +++++++++--- |
98 |
+ 3 files changed, 15 insertions(+), 8 deletions(-) |
99 |
+ |
100 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
101 |
+index eb006d9..fa4b0cb 100644 |
102 |
+--- a/CMakeLists.txt |
103 |
++++ b/CMakeLists.txt |
104 |
+@@ -34,9 +34,6 @@ else() |
105 |
+ set( QT_DONT_USE_QTGUI TRUE ) |
106 |
+ include( ${QT_USE_FILE} ) |
107 |
+ |
108 |
+- macro(qt5_use_modules) |
109 |
+- endmacro() |
110 |
+- |
111 |
+ macro(qt_wrap_cpp) |
112 |
+ qt4_wrap_cpp(${ARGN}) |
113 |
+ endmacro() |
114 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
115 |
+index 802125b..253e81e 100644 |
116 |
+--- a/src/CMakeLists.txt |
117 |
++++ b/src/CMakeLists.txt |
118 |
+@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) |
119 |
+ |
120 |
+ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) |
121 |
+ |
122 |
+-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) |
123 |
+ set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) |
124 |
+-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) |
125 |
++ |
126 |
++if( NOT BUILD_WITH_QT4 ) |
127 |
++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) |
128 |
++else() |
129 |
++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) |
130 |
++endif() |
131 |
+ |
132 |
+ install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) |
133 |
+ |
134 |
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
135 |
+index a3e3223..4f77158 100644 |
136 |
+--- a/tests/CMakeLists.txt |
137 |
++++ b/tests/CMakeLists.txt |
138 |
+@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU |
139 |
+ |
140 |
+ # UrlBuilder library |
141 |
+ add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) |
142 |
+-qt5_use_modules( UrlBuilder Core ) |
143 |
++if( NOT BUILD_WITH_QT4 ) |
144 |
++ target_link_libraries( UrlBuilder Qt5::Core ) |
145 |
++endif() |
146 |
+ # JSONCreator library |
147 |
+ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) |
148 |
+ add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) |
149 |
+-qt5_use_modules( JsonCreator Core Network ) |
150 |
++if( NOT BUILD_WITH_QT4 ) |
151 |
++ target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) |
152 |
++endif() |
153 |
+ |
154 |
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) |
155 |
+ |
156 |
+@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) |
157 |
+ add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) |
158 |
+ target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) |
159 |
+ add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) |
160 |
+- qt5_use_modules(${_name} Network Test) |
161 |
++ if( NOT BUILD_WITH_QT4 ) |
162 |
++ target_link_libraries(${_name} Qt5::Network Qt5::Test) |
163 |
++ endif() |
164 |
+ endmacro(add_libmygpo_test) |
165 |
+ |
166 |
+ add_libmygpo_test( UrlBuilderTest.cpp ) |
167 |
+-- |
168 |
+2.17.0 |
169 |
+ |
170 |
|
171 |
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild |
172 |
new file mode 100644 |
173 |
index 00000000000..c15e441151e |
174 |
--- /dev/null |
175 |
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild |
176 |
@@ -0,0 +1,50 @@ |
177 |
+# Copyright 1999-2018 Gentoo Foundation |
178 |
+# Distributed under the terms of the GNU General Public License v2 |
179 |
+ |
180 |
+EAPI=6 |
181 |
+ |
182 |
+inherit cmake-utils |
183 |
+ |
184 |
+DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" |
185 |
+HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" |
186 |
+ |
187 |
+if [[ ${PV} == *9999* ]]; then |
188 |
+ EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" |
189 |
+ inherit git-r3 |
190 |
+else |
191 |
+ SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
192 |
+ KEYWORDS="amd64 ~x86" |
193 |
+fi |
194 |
+ |
195 |
+LICENSE="LGPL-2.1" |
196 |
+SLOT="0" |
197 |
+IUSE="test" |
198 |
+ |
199 |
+RDEPEND=" |
200 |
+ dev-qt/qtcore:5 |
201 |
+ dev-qt/qtnetwork:5 |
202 |
+" |
203 |
+DEPEND="${RDEPEND} |
204 |
+ virtual/pkgconfig |
205 |
+ test? ( dev-qt/qttest:5 ) |
206 |
+" |
207 |
+ |
208 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) |
209 |
+ |
210 |
+src_configure() { |
211 |
+ local mycmakeargs=( |
212 |
+ -DBUILD_WITH_QT4=OFF |
213 |
+ -DMYGPO_BUILD_TESTS=$(usex test) |
214 |
+ ) |
215 |
+ |
216 |
+ cmake-utils_src_configure |
217 |
+} |
218 |
+ |
219 |
+src_test() { |
220 |
+ # bug: 653312 |
221 |
+ local myctestargs=( |
222 |
+ -E "(JsonCreatorTest-test)" |
223 |
+ ) |
224 |
+ |
225 |
+ cmake-utils_src_test |
226 |
+} |