diff options
Diffstat (limited to 'media-libs/libmygpo-qt')
| -rw-r--r-- | media-libs/libmygpo-qt/Manifest | 9 | ||||
| -rw-r--r-- | media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch | 26 | ||||
| -rw-r--r-- | media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch (renamed from media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch) | 31 | ||||
| -rw-r--r-- | media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild | 83 | ||||
| -rw-r--r-- | media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild (renamed from media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild) | 16 |
5 files changed, 33 insertions, 132 deletions
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 532e5d6fe9ad..f8be36eb1853 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,8 +1,5 @@ -AUX libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch 2832 BLAKE2B 54d040461db07b12dc5d259d5521693a4af6dc1f2b55af9418f3b45ffe89024f25f4f388406804e7c1acd9980adbce8f08372fda60b4d6099c76d44bfbb1ec2d SHA512 f51a9edfa359f7bced8c70254c7200aed7688fd356159e6dc53298dc376855c7cfe47ad4ab5e809d8e748b41dccad3175e967c173f1d2ae751c7f2c3e46fce27 -AUX libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch 4846 BLAKE2B 05aca9ef29a790243ddc7a8d84cf1c2fe70e51321d4b95c3dd8d3385a29ffa8c2ec12266c6ba742fed458e85f506a0e161b6b89edf96e736c7d922ede8efc94d SHA512 3fa47945af5dff87d781db033b4f9bc34606c8a7a66db5c16091716374774eccd7b3cca16aadadcb063c42a616cfb445ac51e61b055a45832f81742a6e9b2f9e -DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 -DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 -EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d -EBUILD libmygpo-qt-1.1.0_pre20180401.ebuild 876 BLAKE2B 891bb3a733805fe1a35a8ef39e2e62bdad4fa0fe0724182d6d9a231fc78b13c8c21c6a42d27b7b7c1ce7de54d51f043d395eed9388319a1ccde4ef3a31c89005 SHA512 4e7477055a570f8ac70db3857f055fffcc19768dc9027d6fab409680d95ac197b335adf0abcb29737a07b01b7903d3e58d3df1f316622bf1cab0e15cc689e828 +AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c +DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a +EBUILD libmygpo-qt-1.1.0.ebuild 917 BLAKE2B ba6028461c4fe1b3f3f98ec90bbbd241a2370ecdfe9a44f9ce219db3bab73e5c6debdc42a31db2db1d0f57fd0f9784e2067517435f72809bfd40c6af3494c1d2 SHA512 c263ad175340f7d69c461df692940ff2f5dd082a9c6c61fdf32396e8ffb114069e2d078691aa9687928f121031bf103454f98e7d144ee9abaf31b0d945e9ea69 EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch deleted file mode 100644 index 0d3dd764d8f6..000000000000 --- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix the failure of JsonCreatorTest due to mistake in expected string. -The patch is submitted to upstream: https://github.com/gpodder/libmygpo-qt/pull/10 - -From: Golubev Alexander <fatzer2@gmail.com> -Date: Tue, 20 Sep 2016 15:33:30 +0400 - ---- - tests/JsonCreatorTest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp -index b15b006..feb03d5 100644 ---- a/tests/JsonCreatorTest.cpp -+++ b/tests/JsonCreatorTest.cpp -@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() - - output = JsonCreator::episodeActionListToJSON(episodeActions); - QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); -- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); -+ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); - - QCOMPARE(outString2, expected2 ); - } --- -2.7.4 - diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch index 2b10ae4d7bd9..77c1c74f42d3 100644 --- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch @@ -1,17 +1,18 @@ -From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001 +From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> Date: Sun, 15 Apr 2018 22:20:34 +0200 -Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict +Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more + strict --- - CMakeLists.txt | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) + CMakeLists.txt | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a1f652..85d46fd 100644 +index 2a1f652..eb006d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -5,25 +5,21 @@ project( libmygpo-qt ) +@@ -5,25 +5,25 @@ project( libmygpo-qt ) set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) @@ -22,13 +23,17 @@ index 2a1f652..85d46fd 100644 - find_package(Qt5Core QUIET) - if( Qt5Core_DIR ) - set(MYGPO_QT_VERSION_SUFFIX 5) -+ find_package(Qt5 CONFIG REQUIRED Core Network) -+ set(MYGPO_QT_VERSION_SUFFIX 5) - +- - macro(qt_wrap_cpp) - qt5_wrap_cpp(${ARGN}) - endmacro() -- endif() ++ if( MYGPO_BUILD_TESTS ) ++ find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) ++ else() ++ find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG) + endif() ++ set(MYGPO_QT_VERSION_SUFFIX 5) ++ + macro(qt_wrap_cpp) + qt5_wrap_cpp(${ARGN}) + endmacro() @@ -48,7 +53,7 @@ index 2a1f652..85d46fd 100644 2.17.0 -From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001 +From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> Date: Sun, 15 Apr 2018 22:29:33 +0200 Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) @@ -60,10 +65,10 @@ Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85d46fd..d6b3a15 100644 +index eb006d9..fa4b0cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,9 +30,6 @@ else() +@@ -34,9 +34,6 @@ else() set( QT_DONT_USE_QTGUI TRUE ) include( ${QT_USE_FILE} ) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild deleted file mode 100644 index a276eeb094d1..000000000000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils multibuild - -DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" -HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" - inherit git-r3 -else - SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - qt4? ( - >=dev-libs/qjson-0.5[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -DOCS=( AUTHORS README ) -PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) - if use qt5; then - ewarn "Please note that Qt5 support is still experimental." - ewarn "If you find anything to not work with Qt5, please report a bug." - fi -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DMYGPO_BUILD_TESTS=$(usex test) - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=ON) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=OFF) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index 7f7d18f3bf03..5aae16cca567 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -3,8 +3,7 @@ EAPI=6 -COMMIT=b84549b8803033b803f7d4dc14d5dcd7a5c344b7 -inherit cmake-utils vcs-snapshot +inherit cmake-utils DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" @@ -13,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" inherit git-r3 else - SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 x86" fi LICENSE="LGPL-2.1" @@ -40,3 +39,12 @@ src_configure() { cmake-utils_src_configure } + +src_test() { + # bug: 653312 + local myctestargs=( + -E "(JsonCreatorTest-test)" + ) + + cmake-utils_src_test +} |