[arch-commits] Commit in telepathy-qt/repos (6 files)

Antonio Rojas arojas at archlinux.org
Mon Aug 17 18:41:03 UTC 2015


    Date: Monday, August 17, 2015 @ 20:41:03
  Author: arojas
Revision: 243837

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  telepathy-qt/repos/extra-i686/PKGBUILD
    (from rev 243836, telepathy-qt/trunk/PKGBUILD)
  telepathy-qt/repos/extra-i686/glibc-2.20.patch
    (from rev 243836, telepathy-qt/trunk/glibc-2.20.patch)
  telepathy-qt/repos/extra-x86_64/PKGBUILD
    (from rev 243836, telepathy-qt/trunk/PKGBUILD)
  telepathy-qt/repos/extra-x86_64/glibc-2.20.patch
    (from rev 243836, telepathy-qt/trunk/glibc-2.20.patch)
Deleted:
  telepathy-qt/repos/extra-i686/PKGBUILD
  telepathy-qt/repos/extra-x86_64/PKGBUILD

-------------------------------+
 /PKGBUILD                     |  140 ++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD           |   65 ------------------
 extra-i686/glibc-2.20.patch   |   25 +++++++
 extra-x86_64/PKGBUILD         |   65 ------------------
 extra-x86_64/glibc-2.20.patch |   25 +++++++
 5 files changed, 190 insertions(+), 130 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-08-17 18:40:15 UTC (rev 243836)
+++ extra-i686/PKGBUILD	2015-08-17 18:41:03 UTC (rev 243837)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=telepathy-qt
-pkgname=(telepathy-qt4 telepathy-qt5)
-pkgver=0.9.6
-pkgrel=1
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/"
-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')
-validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
-
-prepare() {
-  mkdir build{,-qt4}
-}
-
-build() {
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DDESIRED_QT_VERSION=5 \
-    -DENABLE_EXAMPLES=OFF \
-    -DENABLE_TESTS=OFF
-  make
-  cd ..
-
-  cd build-qt4
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DDESIRED_QT_VERSION=4 \
-    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
-    -DENABLE_EXAMPLES=OFF \
-    -DENABLE_TESTS=OFF
-  make
-}
-
-package_telepathy-qt4() {
-  pkgdesc="A library for Qt4-based Telepathy clients"
-  depends=(qt4 telepathy-farstream)
-  conflicts=(telepathy-qt)
-  replaces=(telepathy-qt)
-  provides=(telepathy-qt)
-
-  cd build-qt4
-  make DESTDIR="$pkgdir" install
-}
-
-package_telepathy-qt5() {
-  pkgdesc="A library for Qt5-based Telepathy clients"
-  depends=(qt5-base telepathy-farstream)
-
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: telepathy-qt/repos/extra-i686/PKGBUILD (from rev 243836, telepathy-qt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-08-17 18:41:03 UTC (rev 243837)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=telepathy-qt
+pkgname=(telepathy-qt4 telepathy-qt5)
+pkgver=0.9.6.1
+pkgrel=1
+arch=(i686 x86_64)
+url="http://telepathy.freedesktop.org/wiki/"
+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} '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 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DDESIRED_QT_VERSION=5 \
+    -DENABLE_EXAMPLES=OFF \
+    -DENABLE_TESTS=OFF
+  make
+  cd ..
+
+  cd build-qt4
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DDESIRED_QT_VERSION=4 \
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+    -DENABLE_EXAMPLES=OFF \
+    -DENABLE_TESTS=OFF
+  make
+}
+
+package_telepathy-qt4() {
+  pkgdesc="A library for Qt4-based Telepathy clients"
+  depends=(qt4 telepathy-farstream)
+  conflicts=(telepathy-qt)
+  replaces=(telepathy-qt)
+  provides=(telepathy-qt)
+
+  cd build-qt4
+  make DESTDIR="$pkgdir" install
+}
+
+package_telepathy-qt5() {
+  pkgdesc="A library for Qt5-based Telepathy clients"
+  depends=(qt5-base telepathy-farstream)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: telepathy-qt/repos/extra-i686/glibc-2.20.patch (from rev 243836, telepathy-qt/trunk/glibc-2.20.patch)
===================================================================
--- extra-i686/glibc-2.20.patch	                        (rev 0)
+++ extra-i686/glibc-2.20.patch	2015-08-17 18:41:03 UTC (rev 243837)
@@ -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
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-08-17 18:40:15 UTC (rev 243836)
+++ extra-x86_64/PKGBUILD	2015-08-17 18:41:03 UTC (rev 243837)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=telepathy-qt
-pkgname=(telepathy-qt4 telepathy-qt5)
-pkgver=0.9.6
-pkgrel=1
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/"
-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')
-validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
-
-prepare() {
-  mkdir build{,-qt4}
-}
-
-build() {
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DDESIRED_QT_VERSION=5 \
-    -DENABLE_EXAMPLES=OFF \
-    -DENABLE_TESTS=OFF
-  make
-  cd ..
-
-  cd build-qt4
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DDESIRED_QT_VERSION=4 \
-    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
-    -DENABLE_EXAMPLES=OFF \
-    -DENABLE_TESTS=OFF
-  make
-}
-
-package_telepathy-qt4() {
-  pkgdesc="A library for Qt4-based Telepathy clients"
-  depends=(qt4 telepathy-farstream)
-  conflicts=(telepathy-qt)
-  replaces=(telepathy-qt)
-  provides=(telepathy-qt)
-
-  cd build-qt4
-  make DESTDIR="$pkgdir" install
-}
-
-package_telepathy-qt5() {
-  pkgdesc="A library for Qt5-based Telepathy clients"
-  depends=(qt5-base telepathy-farstream)
-
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: telepathy-qt/repos/extra-x86_64/PKGBUILD (from rev 243836, telepathy-qt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-08-17 18:41:03 UTC (rev 243837)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=telepathy-qt
+pkgname=(telepathy-qt4 telepathy-qt5)
+pkgver=0.9.6.1
+pkgrel=1
+arch=(i686 x86_64)
+url="http://telepathy.freedesktop.org/wiki/"
+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} '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 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DDESIRED_QT_VERSION=5 \
+    -DENABLE_EXAMPLES=OFF \
+    -DENABLE_TESTS=OFF
+  make
+  cd ..
+
+  cd build-qt4
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DDESIRED_QT_VERSION=4 \
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+    -DENABLE_EXAMPLES=OFF \
+    -DENABLE_TESTS=OFF
+  make
+}
+
+package_telepathy-qt4() {
+  pkgdesc="A library for Qt4-based Telepathy clients"
+  depends=(qt4 telepathy-farstream)
+  conflicts=(telepathy-qt)
+  replaces=(telepathy-qt)
+  provides=(telepathy-qt)
+
+  cd build-qt4
+  make DESTDIR="$pkgdir" install
+}
+
+package_telepathy-qt5() {
+  pkgdesc="A library for Qt5-based Telepathy clients"
+  depends=(qt5-base telepathy-farstream)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: telepathy-qt/repos/extra-x86_64/glibc-2.20.patch (from rev 243836, telepathy-qt/trunk/glibc-2.20.patch)
===================================================================
--- extra-x86_64/glibc-2.20.patch	                        (rev 0)
+++ extra-x86_64/glibc-2.20.patch	2015-08-17 18:41:03 UTC (rev 243837)
@@ -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
+



More information about the arch-commits mailing list