forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-libs/libmygpo-qt: 1.1.0 version bump
Same as we have with 1.1.0_pre20180401, but disabling failing test. Package-Manager: Portage-2.3.31, Repoman-2.3.9
- Loading branch information
Showing
3 changed files
with
187 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 | ||
DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a | ||
DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 |
136 changes: 136 additions & 0 deletions
136
media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 | ||
From: Andreas Sturmlechner <[email protected]> | ||
Date: Sun, 15 Apr 2018 22:20:34 +0200 | ||
Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more | ||
strict | ||
|
||
--- | ||
CMakeLists.txt | 22 +++++++++++----------- | ||
1 file changed, 11 insertions(+), 11 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 2a1f652..eb006d9 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -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" ) | ||
|
||
-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) | ||
+option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) | ||
|
||
if( NOT BUILD_WITH_QT4 ) | ||
- find_package(Qt5Core QUIET) | ||
- if( Qt5Core_DIR ) | ||
- set(MYGPO_QT_VERSION_SUFFIX 5) | ||
- | ||
- macro(qt_wrap_cpp) | ||
- qt5_wrap_cpp(${ARGN}) | ||
- endmacro() | ||
+ 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() | ||
|
||
# pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for | ||
# Qt5 | ||
set(MYGPO_QT_MAJOR_VERSION "5") | ||
set(MYGPO_QT4_QJSON_DEP "") | ||
-endif() | ||
- | ||
-if( NOT Qt5Core_DIR ) | ||
+else() | ||
message(STATUS "Could not find Qt5, searching for Qt4 instead...") | ||
message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") | ||
if( MYGPO_BUILD_TESTS ) | ||
-- | ||
2.17.0 | ||
|
||
|
||
From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 | ||
From: Andreas Sturmlechner <[email protected]> | ||
Date: Sun, 15 Apr 2018 22:29:33 +0200 | ||
Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) | ||
|
||
--- | ||
CMakeLists.txt | 3 --- | ||
src/CMakeLists.txt | 8 ++++++-- | ||
tests/CMakeLists.txt | 12 +++++++++--- | ||
3 files changed, 15 insertions(+), 8 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index eb006d9..fa4b0cb 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -34,9 +34,6 @@ else() | ||
set( QT_DONT_USE_QTGUI TRUE ) | ||
include( ${QT_USE_FILE} ) | ||
|
||
- macro(qt5_use_modules) | ||
- endmacro() | ||
- | ||
macro(qt_wrap_cpp) | ||
qt4_wrap_cpp(${ARGN}) | ||
endmacro() | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 802125b..253e81e 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) | ||
|
||
add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) | ||
|
||
-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) | ||
set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) | ||
-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) | ||
+ | ||
+if( NOT BUILD_WITH_QT4 ) | ||
+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) | ||
+else() | ||
+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) | ||
+endif() | ||
|
||
install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) | ||
|
||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
index a3e3223..4f77158 100644 | ||
--- a/tests/CMakeLists.txt | ||
+++ b/tests/CMakeLists.txt | ||
@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU | ||
|
||
# UrlBuilder library | ||
add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) | ||
-qt5_use_modules( UrlBuilder Core ) | ||
+if( NOT BUILD_WITH_QT4 ) | ||
+ target_link_libraries( UrlBuilder Qt5::Core ) | ||
+endif() | ||
# JSONCreator library | ||
QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) | ||
add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) | ||
-qt5_use_modules( JsonCreator Core Network ) | ||
+if( NOT BUILD_WITH_QT4 ) | ||
+ target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) | ||
+endif() | ||
|
||
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) | ||
|
||
@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) | ||
add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) | ||
target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) | ||
add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) | ||
- qt5_use_modules(${_name} Network Test) | ||
+ if( NOT BUILD_WITH_QT4 ) | ||
+ target_link_libraries(${_name} Qt5::Network Qt5::Test) | ||
+ endif() | ||
endmacro(add_libmygpo_test) | ||
|
||
add_libmygpo_test( UrlBuilderTest.cpp ) | ||
-- | ||
2.17.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# Copyright 1999-2018 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=6 | ||
|
||
inherit cmake-utils | ||
|
||
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="test" | ||
|
||
RDEPEND=" | ||
dev-qt/qtcore:5 | ||
dev-qt/qtnetwork:5 | ||
" | ||
DEPEND="${RDEPEND} | ||
virtual/pkgconfig | ||
test? ( dev-qt/qttest:5 ) | ||
" | ||
|
||
PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) | ||
|
||
src_configure() { | ||
local mycmakeargs=( | ||
-DBUILD_WITH_QT4=OFF | ||
-DMYGPO_BUILD_TESTS=$(usex test) | ||
) | ||
|
||
cmake-utils_src_configure | ||
} | ||
|
||
src_test() { | ||
# bug: 653312 | ||
local myctestargs=( | ||
-E "(JsonCreatorTest-test)" | ||
) | ||
|
||
cmake-utils_src_test | ||
} |