Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=22e80accab45c716abd92016937c31208dc49a95
commit 22e80accab45c716abd92016937c31208dc49a95 Author: crazy <[email protected]> Date: Sun Oct 18 00:36:36 2015 +0200 telepathy-qt4-0.9.6.1-1-x86_64 * pkgver++ * farstream-0.1 -> farstream * added patch for glibc > 2.20 * added patch for newer gst since they moved the header files * now farstream-0.1 can die diff --git a/source/xlib/telepathy-qt4/FrugalBuild b/source/xlib/telepathy-qt4/FrugalBuild index 41caeef..0bbb1b7 100644 --- a/source/xlib/telepathy-qt4/FrugalBuild +++ b/source/xlib/telepathy-qt4/FrugalBuild @@ -3,10 +3,10 @@ pkgname=telepathy-qt4 _F_archive_name=telepathy-qt -pkgver=0.9.5 +pkgver=0.9.6.1 pkgrel=1 pkgdesc="Telepathy Qt4 bindings" -depends=('libqtdbus' 'libqtnetwork' 'libgcc' 'telepathy-farstream' 'farstream-0.1') +depends=('libqtdbus' 'libqtnetwork' 'libgcc' 'telepathy-farstream' 'farstream') makedepends=('libqttest' 'libqtgui') groups=('xlib') archs=('i686' 'x86_64') @@ -14,15 +14,21 @@ Finclude cmake url="http://telepathy.freedesktop.org/wiki/Telepathy-Qt4"; up2date="Flasttar http://telepathy.freedesktop.org/releases/$_F_archive_name"; source=(http://telepathy.freedesktop.org/releases/$_F_archive_name/$_F_archive_name-$pkgver.tar.gz \ - gcc47.patch) -sha1sums=('449d79134700a1802e588727cfdfdb27aafdc194' \ - 'd60b166ca3c69a55e8cc49029726773d64cd1789') + gcc47.patch newer-glibc.patch fix-for-newer-gst-includes.patch) +sha1sums=('c7e913b54b72d4c7134dacc38a48d583f66759ed' \ + 'd60b166ca3c69a55e8cc49029726773d64cd1789' \ + '719bf196b5bcd4681a100573ba83e3f7ab6fd5b1' \ + 'aae8f05531a0cf0960779925d98614052cd39f6f') build(){ - CMake_prepare_build - cmake -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_TESTS=OFF \ + CMake_prepare_build + cmake -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_TESTS=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DDISABLE_WERROR=ON \ -DCMAKE_INSTALL_PREFIX=/usr .. || Fdie - make || Fdie - CMake_install + make || Fdie + CMake_install } + +# optimization OK diff --git a/source/xlib/telepathy-qt4/fix-for-newer-gst-includes.patch b/source/xlib/telepathy-qt4/fix-for-newer-gst-includes.patch new file mode 100644 index 0000000..e495b22 --- /dev/null +++ b/source/xlib/telepathy-qt4/fix-for-newer-gst-includes.patch @@ -0,0 +1,84 @@ +From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider <[email protected]> +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 <[email protected]> + +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/source/xlib/telepathy-qt4/newer-glibc.patch b/source/xlib/telepathy-qt4/newer-glibc.patch new file mode 100644 index 0000000..ddf6984 --- /dev/null +++ b/source/xlib/telepathy-qt4/newer-glibc.patch @@ -0,0 +1,24 @@ +From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider <[email protected]> +Date: Fri, 5 Jun 2015 12:47:13 +0200 +Subject: CMake: Fixed deprecated _BSD_SOURCE. + +Since glibc-2.20 _DEFAULT_SOURCE definition is also required. + +Reviewed-by: Alexandr Akulich + +diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake +index d34b24d..dc98697 100644 +--- a/cmake/modules/TelepathyDefaults.cmake ++++ b/cmake/modules/TelepathyDefaults.cmake +@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif(${NOT_RELEASE} EQUAL 1) + + if(CMAKE_SYSTEM_NAME MATCHES Linux) +- add_definitions(-D_BSD_SOURCE) ++ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) + endif(CMAKE_SYSTEM_NAME MATCHES Linux) + + # Compiler coverage +-- +cgit v0.10.2 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
