[arch-commits] Commit in telepathy-qt/trunk (PKGBUILD glibc-2.20.patch)

[Antonio Rojas]

    Date: Monday, August 17, 2015 @ 20:40:15
  Author: arojas
Revision: 243836

Update to 0.9.6.1

Added:
  telepathy-qt/trunk/glibc-2.20.patch
Modified:
  telepathy-qt/trunk/PKGBUILD

------------------+
 PKGBUILD         |   17 +++++++++++------
 glibc-2.20.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-17 18:04:03 UTC (rev 243835)
+++ PKGBUILD	2015-08-17 18:40:15 UTC (rev 243836)
@@ -5,7 +5,7 @@
 
 pkgbase=telepathy-qt
 pkgname=(telepathy-qt4 telepathy-qt5)
-pkgver=0.9.6
+pkgver=0.9.6.1
 pkgrel=1
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/"
@@ -12,18 +12,23 @@
 license=(LGPL)
 makedepends=(qt4 telepathy-farstream libxslt python2 cmake doxygen qt5-base)
 options=(staticlibs)
-source=("http://telepathy.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz"{,.asc})
-md5sums=('1f18935f30dcf90282a2d6d65fcde752'
-         'SKIP')
+source=("http://telepathy.freedesktop.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"{,.asc} 'glibc-2.20.patch')
+md5sums=('bebebfbe29d194a9ba00b4f422a44f74'
+         'SKIP'
+         '8b5f10988c8e26551c3f5283413f0b92')
 validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
 
 prepare() {
   mkdir build{,-qt4}
+
+# Fix build with glibc 2.20
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../glibc-2.20.patch
 }
 
 build() {
   cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
@@ -34,7 +39,7 @@
   cd ..
 
   cd build-qt4
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \

Added: glibc-2.20.patch
===================================================================
--- glibc-2.20.patch	                        (rev 0)
+++ glibc-2.20.patch	2015-08-17 18:40:15 UTC (rev 243836)
@@ -0,0 +1,25 @@
+From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001
+From: Niels Ole Salscheider <niels_ole at salscheider-online.de>
+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
+