* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2015-11-22 17:48 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-11-22 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 892812b39d0554daee5eba923cde77e9ca96114d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 17:46:09 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:48:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892812b3
net-libs/telepathy-qt: ensure correct version of Qt is used
Package-Manager: portage-2.2.25
.../files/telepathy-qt-0.9.6.1-qtpath.patch | 21 +++++++++++++++++++++
net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
new file mode 100644
index 0000000..3753b90
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
@@ -0,0 +1,21 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+--- cmake/modules/FindQt.cmake
++++ cmake/modules/FindQt.cmake
+@@ -19,7 +19,7 @@
+ IF(NOT QT5_INSTALLED)
+ IF(NOT QT_QMAKE_EXECUTABLE)
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5
+- PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
++ PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH)
+ SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
+ ENDIF(NOT QT_QMAKE_EXECUTABLE)
+
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
index d920d98..4beccda 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -53,6 +53,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
PATCHES=(
"${FILESDIR}/${PV}-default-source.patch"
"${FILESDIR}/${PV}-yes-release.patch"
+ "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2015-11-22 17:48 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-11-22 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 6bf584ff1904e088ae9be93b3fe63d47a4d37584
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 17:47:57 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:48:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf584ff
net-libs/telepathy-qt: backport patch from upstream solving build failure with >=media-libs/gstreamer-1.5
Package-Manager: portage-2.2.25
.../files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch | 83 ++++++++++++++++++++++
net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild | 1 +
2 files changed, 84 insertions(+)
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
new file mode 100644
index 0000000..bf519fa
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch
@@ -0,0 +1,83 @@
+From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001
+From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
+Date: Tue, 29 Sep 2015 20:52:15 +0200
+Subject: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly
+
+Since GStreamer-1.5.1 config header file moved to LIBDIR.
+
+Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
+
+diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
+index 250bfdb..dd71430 100644
+--- a/TelepathyQt/Farstream/CMakeLists.txt
++++ b/TelepathyQt/Farstream/CMakeLists.txt
+@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
+ include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}
+ ${TELEPATHY_GLIB_INCLUDE_DIR}
+ ${FARSTREAM_INCLUDE_DIR}
+- ${GSTREAMER_INCLUDE_DIR}
++ ${GSTREAMER_INCLUDE_DIRS}
+ ${GLIB2_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR}
+ ${DBUS_INCLUDE_DIR})
+diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
+index 63fb41c..ffdd7a9 100644
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -13,12 +13,12 @@
+
+ # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
+
+-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+ # in cache already
+ SET(GSTREAMER_FIND_QUIETLY TRUE)
+-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+ SET(GSTREAMER_FIND_QUIETLY FALSE)
+-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+
+ IF (NOT WIN32)
+ # use pkg-config to get the directories and then use these values
+@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+ PATH_SUFFIXES gstreamer-1.0
+ )
+
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++ PATHS
++ ${PC_GSTREAMER_INCLUDEDIR}
++ ${PC_GSTREAMER_INCLUDE_DIRS}
++ PATH_SUFFIXES gstreamer-1.0
++ )
++
++SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+ PATHS
+ ${PC_GSTREAMER_LIBDIR}
+@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR)
+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+ ENDIF (GSTREAMER_INCLUDE_DIR)
+
++IF (GSTREAMER_CONF_INCLUDE_DIR)
++ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")
++ELSE (GSTREAMER_CONF_INCLUDE_DIR)
++ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")
++ENDIF (GSTREAMER_CONF_INCLUDE_DIR)
++
+ IF (GSTREAMER_LIBRARIES)
+ #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
+ ELSE (GSTREAMER_LIBRARIES)
+@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES)
+
+
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY)
+
+-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
++MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
+--
+cgit v0.10.2
+
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
index 4beccda..e783322 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -53,6 +53,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
PATCHES=(
"${FILESDIR}/${PV}-default-source.patch"
"${FILESDIR}/${PV}-yes-release.patch"
+ "${FILESDIR}/${P}-gstreamer-1.5.patch"
"${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2016-06-02 13:55 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-06-02 13:55 UTC (permalink / raw
To: gentoo-commits
commit: ccf30fa3e98841494c0f0cd826edf1aa4c522b18
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 13:54:58 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 13:55:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf30fa3
net-libs/telepathy-qt: Build fixes and restrict tests
Revision bump adds 3 upstream patches to fix build failures:
- Ensure to pick python 2.7 interpreter
- Fix includes
- Add service dependencies
Gentoo-bug: 549448
Gentoo-bug: 568318
Gentoo-bug: 577382
Package-Manager: portage-2.3.0_rc1
.../files/telepathy-qt-0.9.6.1-includes.patch | 24 +++++
.../files/telepathy-qt-0.9.6.1-python.patch | 43 ++++++++
.../files/telepathy-qt-0.9.6.1-qtpath.patch | 4 +-
...telepathy-qt-0.9.6.1-service-dependencies.patch | 22 ++++
.../telepathy-qt/telepathy-qt-0.9.6.1-r1.ebuild | 112 +++++++++++++++++++++
5 files changed, 203 insertions(+), 2 deletions(-)
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
new file mode 100644
index 0000000..6496d25
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-includes.patch
@@ -0,0 +1,24 @@
+From 1e1f53e9d91684918c34ec50392f86287e001a1e Mon Sep 17 00:00:00 2001
+From: Alexandr Akulich <akulichalexander@gmail.com>
+Date: Fri, 15 Jan 2016 18:52:59 +0500
+Subject: [PATCH] BaseChannel: Reduced includes (doesn't depend on client stuff
+ anymore).
+
+---
+ TelepathyQt/base-channel.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/TelepathyQt/base-channel.cpp b/TelepathyQt/base-channel.cpp
+index eb41463..720d58e 100644
+--- a/TelepathyQt/base-channel.cpp
++++ b/TelepathyQt/base-channel.cpp
+@@ -26,7 +26,8 @@
+
+ #include "TelepathyQt/_gen/base-channel.moc.hpp"
+ #include "TelepathyQt/_gen/base-channel-internal.moc.hpp"
+-#include "TelepathyQt/future-internal.h"
++#include "TelepathyQt/_gen/future-constants.h"
++#include "TelepathyQt/_gen/future-types.h"
+
+ #include "TelepathyQt/debug-internal.h"
+
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
new file mode 100644
index 0000000..9eb6c32
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-python.patch
@@ -0,0 +1,43 @@
+From 3716c048d65d4984513591cb8b1031858201db6c Mon Sep 17 00:00:00 2001
+From: Alex Merry <alex.merry@kde.org>
+Date: Sun, 16 Aug 2015 20:30:41 +0100
+Subject: [PATCH] Tell CMake what version of Python we want to find.
+
+This ensures that Python 2 is found if possible, rather than Python 3.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91659
+
+Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ cmake/modules/FindPythonLibrary.cmake | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a014ce..a01b586 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,8 +133,8 @@ macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
+ set(CMAKE_REQUIRED_FLAGS "")
+
+ # Find python version >= 2.5
+-find_package(PythonLibrary REQUIRED)
+ set(REQUIRED_PY 2.5)
++find_package(PythonLibrary ${REQUIRED_PY} REQUIRED)
+ if(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
+ message(STATUS "Python ${PYTHON_SHORT_VERSION} found")
+ else(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
+diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake
+index 2585859..c6bb712 100644
+--- a/cmake/modules/FindPythonLibrary.cmake
++++ b/cmake/modules/FindPythonLibrary.cmake
+@@ -28,7 +28,8 @@ if(EXISTS PYTHON_LIBRARY)
+ # Already in cache, be silent
+ set(PYTHONLIBRARY_FOUND TRUE)
+ else(EXISTS PYTHON_LIBRARY)
+- FIND_PACKAGE(PythonInterp)
++ message(STATUS "PythonLibrary find version: ${PythonLibrary_FIND_VERSION}")
++ FIND_PACKAGE(PythonInterp ${PythonLibrary_FIND_VERSION})
+
+ if(PYTHONINTERP_FOUND)
+ FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH})
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
index 3753b90..a14e1da 100644
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
@@ -8,8 +8,8 @@ is necessary to find the correct version explicitly.
Once qmake is found, it is queried for the correct location of all other items.
---- cmake/modules/FindQt.cmake
-+++ cmake/modules/FindQt.cmake
+--- a/cmake/modules/FindQt.cmake
++++ b/cmake/modules/FindQt.cmake
@@ -19,7 +19,7 @@
IF(NOT QT5_INSTALLED)
IF(NOT QT_QMAKE_EXECUTABLE)
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
new file mode 100644
index 0000000..1b3bd76
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-service-dependencies.patch
@@ -0,0 +1,22 @@
+From 7389dc990c67d4269f3a79c924c054e87f2e4ac5 Mon Sep 17 00:00:00 2001
+From: Alexandr Akulich <akulichalexander@gmail.com>
+Date: Fri, 15 Jan 2016 18:54:09 +0500
+Subject: [PATCH] CMakeLists: Added missing service dependence.
+
+telepathy-qt-service depends on generated stable and future types and consts.
+---
+ TelepathyQt/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
+index 58668cd..1b32d32 100644
+--- a/TelepathyQt/CMakeLists.txt
++++ b/TelepathyQt/CMakeLists.txt
+@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)
+ #endif (ENABLE_COMPILER_COVERAGE)
+ # lets build a static only library until we have a stable API/ABI
+ add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
++ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)
+
+ # generate service moc files
+ foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1-r1.ebuild
new file mode 100644
index 0000000..1ac2c44
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 cmake-utils virtualx multibuild
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug farstream +qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ farstream? (
+ >=net-libs/telepathy-farstream-0.2.2
+ >=net-libs/telepathy-glib-0.18.0
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ )
+ !net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-python/dbus-python
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${P}-default-source.patch"
+ "${FILESDIR}/${P}-yes-release.patch"
+ "${FILESDIR}/${P}-gstreamer-1.5.patch"
+ "${FILESDIR}/${P}-qtpath.patch"
+ "${FILESDIR}/${P}-python.patch"
+ "${FILESDIR}/${P}-includes.patch"
+ "${FILESDIR}/${P}-service-dependencies.patch"
+)
+
+# bug 549448 - last checked with 0.9.6.1
+RESTRICT="test"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DENABLE_DEBUG_OUTPUT=$(usex debug)
+ -DENABLE_FARSTREAM=$(usex farstream)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_EXAMPLES=OFF
+ )
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ mycmakeargs+=( -DDESIRED_QT_VERSION=4 )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+ mycmakeargs+=( -DDESIRED_QT_VERSION=5 )
+ fi
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ _test_runner() {
+ ctest -E '(CallChannel)'
+ }
+
+ mytest() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ virtx _test_runner
+ popd > /dev/null || die
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2016-06-02 13:55 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-06-02 13:55 UTC (permalink / raw
To: gentoo-commits
commit: e0f543be37dced078b3600e411808b5a7275e6be
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 11:27:04 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 13:55:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f543be
net-libs/telepathy-qt: Unify patch naming
Package-Manager: portage-2.3.0_rc1
...ult-source.patch => telepathy-qt-0.9.6.1-default-source.patch} | 0
...1-yes-release.patch => telepathy-qt-0.9.6.1-yes-release.patch} | 0
net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-default-source.patch
similarity index 100%
rename from net-libs/telepathy-qt/files/0.9.6.1-default-source.patch
rename to net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-default-source.patch
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
similarity index 100%
rename from net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch
rename to net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
index 6b376bc..7de0313 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -51,10 +51,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog HACKING NEWS README )
PATCHES=(
- "${FILESDIR}/${PV}-default-source.patch"
- "${FILESDIR}/${PV}-yes-release.patch"
+ "${FILESDIR}/${P}-default-source.patch"
+ "${FILESDIR}/${P}-yes-release.patch"
"${FILESDIR}/${P}-gstreamer-1.5.patch"
- "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
+ "${FILESDIR}/${P}-qtpath.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2019-12-03 5:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-12-03 5:04 UTC (permalink / raw
To: gentoo-commits
commit: 00dd2f57177a30363df7c76c534c8cdc2276a4a5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 17:25:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 05:03:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00dd2f57
net-libs/telepathy-qt: Drop 0.9.7-r1
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/telepathy-qt/Manifest | 1 -
.../files/telepathy-qt-0.9.6.1-qtpath.patch | 21 --------
.../files/telepathy-qt-0.9.6.1-yes-release.patch | 17 -------
.../files/telepathy-qt-0.9.7-deps.patch | 37 --------------
net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild | 57 ----------------------
5 files changed, 133 deletions(-)
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index d915ef01694..a4f9a110b5d 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,2 +1 @@
-DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
deleted file mode 100644
index a14e1da1a65..00000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -19,7 +19,7 @@
- IF(NOT QT5_INSTALLED)
- IF(NOT QT_QMAKE_EXECUTABLE)
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5
-- PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
-+ PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH)
- SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
- ENDIF(NOT QT_QMAKE_EXECUTABLE)
-
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
deleted file mode 100644
index 97a880c72ca..00000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
-index d34b24d..eb51454 100644
---- a/cmake/modules/TelepathyDefaults.cmake
-+++ b/cmake/modules/TelepathyDefaults.cmake
-@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- set(DEPRECATED_DECLARATIONS_FLAGS)
- endif (CXX_DEPRECATED_DECLARATIONS)
-
-- if(${TP_QT_NANO_VERSION} EQUAL 0)
-- set(NOT_RELEASE 0)
-- else(${TP_QT_NANO_VERSION} EQUAL 0)
-- set(NOT_RELEASE 1)
-- endif(${TP_QT_NANO_VERSION} EQUAL 0)
-+ set(NOT_RELEASE 0)
-
- set(desired
- all
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
deleted file mode 100644
index 033ece79bb5..00000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200
-+++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200
-@@ -22,8 +22,6 @@
- # QT_QTDBUS_LIBRARY The QtDBus library
- # QT_QTGUI_LIBRARY The QtGui library
- # QT_QTNETWORK_LIBRARY The QtNetwork library
--# QT_QTTEST_LIBRARY The QtTest library
--# QT_QTWIDGETS_LIBRARY The QtWidgets library
- # QT_QTXML_LIBRARY The QtXml library
- #
- # also defined, but NOT for general use are
-@@ -65,23 +63,19 @@
- find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED)
-
- # Copy includes and library names into the same style as pkgconfig used for Qt4
--set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
-+set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
-
- set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
- set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES})
- set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES})
- set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
--set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES})
--set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES})
- set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES})
-
--set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY})
-+set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY})
-
- SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR})
- SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
deleted file mode 100644
index 493cfb62bd2..00000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug farstream"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- farstream? (
- >=net-libs/telepathy-farstream-0.2.2
- >=net-libs/telepathy-glib-0.18.0
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.9.6.1-yes-release.patch"
- "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
- "${FILESDIR}/${P}-deps.patch"
-)
-
-# bug 549448 - last checked with 0.9.7
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESIRED_QT_VERSION=5
- -DENABLE_DEBUG_OUTPUT=$(usex debug)
- -DENABLE_FARSTREAM=$(usex farstream)
- -DENABLE_TESTS=OFF
- -DENABLE_EXAMPLES=OFF
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2022-10-25 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-10-25 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 15e71b212fbc628bf8f742192b6525f4d87cab6d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 19:37:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 19:37:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e71b21
net-libs/telepathy-qt: Fix building tests with newer glib
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...lepathy-qt-0.9.8-fix-tests-finding-glib-2.patch | 23 ++++++++++++++++++++++
....9.8-r1.ebuild => telepathy-qt-0.9.8-r2.ebuild} | 7 ++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
new file mode 100644
index 000000000000..0ac61c48a87a
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
@@ -0,0 +1,23 @@
+From 188dece432d090809c5ad88a91cd573c5af61c09 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 6 Jun 2022 09:44:53 +0200
+Subject: [PATCH] Fix build with newer glib
+
+gunixconnection.h is now at /usr/include/glib-2.0/gio/gunixconnection.h
+---
+ cmake/modules/FindGIOUnix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindGIOUnix.cmake b/cmake/modules/FindGIOUnix.cmake
+index 263c093e..7f5513b3 100644
+--- a/cmake/modules/FindGIOUnix.cmake
++++ b/cmake/modules/FindGIOUnix.cmake
+@@ -21,7 +21,7 @@ pkg_check_modules(PC_LibGIOUnix gio-unix-2.0)
+ find_path(GIOUNIX_MAIN_INCLUDE_DIR
+ NAMES gio/gunixconnection.h
+ HINTS ${PC_LibGIOUnix_INCLUDEDIR}
+- PATH_SUFFIXES gio-unix-2.0)
++ PATH_SUFFIXES gio-unix-2.0 glib-2.0)
+
+ set(GIOUNIX_INCLUDE_DIR "${GIOUNIX_MAIN_INCLUDE_DIR}")
+
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
similarity index 93%
rename from net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
rename to net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
index af50e027063c..89e203b7332d 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="xml(+)"
inherit python-any-r1 cmake virtualx
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="debug farstream test"
REQUIRED_USE="test? ( farstream )"
-
RESTRICT="!test? ( test )"
RDEPEND="
@@ -47,6 +46,8 @@ BDEPEND="${PYTHON_DEPS}
)
"
+PATCHES=( "${FILESDIR}/${P}-fix-tests-finding-glib-2.patch" )
+
python_check_deps() {
use test || return 0
python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-25 19:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-25 19:40 [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-12-03 5:04 Andreas Sturmlechner
2016-06-02 13:55 Johannes Huber
2016-06-02 13:55 Johannes Huber
2015-11-22 17:48 Michael Palimaka
2015-11-22 17:48 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox