Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=80879a17e6abb3bfd3e059c1a471a894a7ce078e
commit 80879a17e6abb3bfd3e059c1a471a894a7ce078e Author: crazy <[email protected]> Date: Fri Sep 23 22:36:58 2016 +0200 telepathy-qt5-0.9.7-4-x86_64 * fix glib2 detection *again* diff --git a/source/xlib/telepathy-qt5/FrugalBuild b/source/xlib/telepathy-qt5/FrugalBuild index 505ba26..f92fd70 100644 --- a/source/xlib/telepathy-qt5/FrugalBuild +++ b/source/xlib/telepathy-qt5/FrugalBuild @@ -4,7 +4,7 @@ pkgname=telepathy-qt5 _F_archive_name=telepathy-qt pkgver=0.9.7 -pkgrel=3 +pkgrel=4 pkgdesc="Telepathy Qt5 bindings" groups=('xlib') archs=('i686' 'x86_64') @@ -16,7 +16,7 @@ url="http://telepathy.freedesktop.org/wiki/Telepathy-Qt4"; up2date="Flasttar http://telepathy.freedesktop.org/releases/$_F_archive_name"; source=(https://github.com/TelepathyQt/telepathy-qt/archive/master.zip fix-qt5-glib-detection.patch) sha1sums=('78d2ef5ef6293a24830964bc20f6a5a9c23686e4' \ - 'fe893dcc13527e952f611797de4378c1df2cecdf') + '7b630ca2bb1f6eb5552d44fd74343f227a545e05') replaces=('telepathy-qt4') conflicts=('telepathy-qt4') @@ -24,16 +24,17 @@ conflicts=('telepathy-qt4') _F_cd_path="telepathy-qt-master" build(){ - CMake_prepare_build - cmake \ + CMake_prepare_build + cmake \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TESTS=OFF \ -DENABLE_EXAMPLES=OFF \ -DDISABLE_WERROR=ON \ -DDESIRED_QT_VERSION=5 \ -DCMAKE_INSTALL_PREFIX=/usr .. || Fdie - make || Fdie - CMake_install + make || Fdie + CMake_install + Fmkdir usr/share/telepathy } # optimization OK diff --git a/source/xlib/telepathy-qt5/fix-qt5-glib-detection.patch b/source/xlib/telepathy-qt5/fix-qt5-glib-detection.patch index e84dcd8..f5dd14d 100644 --- a/source/xlib/telepathy-qt5/fix-qt5-glib-detection.patch +++ b/source/xlib/telepathy-qt5/fix-qt5-glib-detection.patch @@ -5,7 +5,7 @@ diff -Naur telepathy-qt-master/CMakeLists.txt telepathy-qt-master-glib-fix/CMake # set the flags (-fPIE) here so that CHECK_CXX_SOURCE_COMPILES works properly if qt5 was built with # -reduce-locations set(CMAKE_REQUIRED_FLAGS "${TP_QT_EXECUTABLE_LINKER_FLAGS}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_VERSION_TAGGING=1") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DQT_NO_VERSION_TAGGING=1") CHECK_CXX_SOURCE_COMPILES(" #include <QtCore/QtGlobal> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
