Date: Monday, December 7, 2015 @ 01:33:07
Author: bpiotrowski
Revision: 253112
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
telepathy-qt/repos/staging-i686/
telepathy-qt/repos/staging-i686/PKGBUILD
(from rev 253111, telepathy-qt/trunk/PKGBUILD)
telepathy-qt/repos/staging-i686/glibc-2.20.patch
(from rev 253111, telepathy-qt/trunk/glibc-2.20.patch)
telepathy-qt/repos/staging-x86_64/
telepathy-qt/repos/staging-x86_64/PKGBUILD
(from rev 253111, telepathy-qt/trunk/PKGBUILD)
telepathy-qt/repos/staging-x86_64/glibc-2.20.patch
(from rev 253111, telepathy-qt/trunk/glibc-2.20.patch)
---------------------------------+
staging-i686/PKGBUILD | 74 ++++++++++++++++++++++++++++++++++++++
staging-i686/glibc-2.20.patch | 25 ++++++++++++
staging-x86_64/PKGBUILD | 74 ++++++++++++++++++++++++++++++++++++++
staging-x86_64/glibc-2.20.patch | 25 ++++++++++++
4 files changed, 198 insertions(+)
Copied: telepathy-qt/repos/staging-i686/PKGBUILD (from rev 253111,
telepathy-qt/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-07 00:33:07 UTC (rev 253112)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Ionut Biru <[email protected]>
+
+pkgbase=telepathy-qt
+pkgname=(telepathy-qt4 telepathy-qt5)
+pkgver=0.9.6.1
+pkgrel=2
+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'
+
gstreamer-1.6.patch::"http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=ec4a3d62";)
+md5sums=('bebebfbe29d194a9ba00b4f422a44f74'
+ 'SKIP'
+ '8b5f10988c8e26551c3f5283413f0b92'
+ '0bd5aa2a0aad18f812c9602b890e910e')
+validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
+
+prepare() {
+ mkdir build{,-qt4}
+
+# Fix build with glibc 2.20
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../glibc-2.20.patch
+# Fix build with gstreamer 1.6
+ patch -p1 -i ../gstreamer-1.6.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/staging-i686/glibc-2.20.patch (from rev 253111,
telepathy-qt/trunk/glibc-2.20.patch)
===================================================================
--- staging-i686/glibc-2.20.patch (rev 0)
+++ staging-i686/glibc-2.20.patch 2015-12-07 00:33:07 UTC (rev 253112)
@@ -0,0 +1,25 @@
+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
+
Copied: telepathy-qt/repos/staging-x86_64/PKGBUILD (from rev 253111,
telepathy-qt/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-07 00:33:07 UTC (rev 253112)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Ionut Biru <[email protected]>
+
+pkgbase=telepathy-qt
+pkgname=(telepathy-qt4 telepathy-qt5)
+pkgver=0.9.6.1
+pkgrel=2
+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'
+
gstreamer-1.6.patch::"http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=ec4a3d62";)
+md5sums=('bebebfbe29d194a9ba00b4f422a44f74'
+ 'SKIP'
+ '8b5f10988c8e26551c3f5283413f0b92'
+ '0bd5aa2a0aad18f812c9602b890e910e')
+validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
+
+prepare() {
+ mkdir build{,-qt4}
+
+# Fix build with glibc 2.20
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../glibc-2.20.patch
+# Fix build with gstreamer 1.6
+ patch -p1 -i ../gstreamer-1.6.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/staging-x86_64/glibc-2.20.patch (from rev 253111,
telepathy-qt/trunk/glibc-2.20.patch)
===================================================================
--- staging-x86_64/glibc-2.20.patch (rev 0)
+++ staging-x86_64/glibc-2.20.patch 2015-12-07 00:33:07 UTC (rev 253112)
@@ -0,0 +1,25 @@
+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
+
