[arch-commits] Commit in telepathy-qt/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Nov 29 12:35:59 UTC 2016
Date: Tuesday, November 29, 2016 @ 12:35:59
Author: arojas
Revision: 282325
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
telepathy-qt/repos/extra-i686/PKGBUILD
(from rev 282324, telepathy-qt/trunk/PKGBUILD)
telepathy-qt/repos/extra-x86_64/PKGBUILD
(from rev 282324, telepathy-qt/trunk/PKGBUILD)
Deleted:
telepathy-qt/repos/extra-i686/PKGBUILD
telepathy-qt/repos/extra-i686/glibc-2.20.patch
telepathy-qt/repos/extra-x86_64/PKGBUILD
telepathy-qt/repos/extra-x86_64/glibc-2.20.patch
-------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++++++
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, 84 insertions(+), 180 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-11-29 12:35:24 UTC (rev 282324)
+++ extra-i686/PKGBUILD 2016-11-29 12:35:59 UTC (rev 282325)
@@ -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.7
-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=('86470dd3d7f6de8b8f4f36165486d42f'
- '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 282324, telepathy-qt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-11-29 12:35:59 UTC (rev 282325)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=telepathy-qt
+pkgver=0.9.7
+pkgrel=1
+arch=(i686 x86_64)
+url="http://telepathy.freedesktop.org/wiki/"
+license=(LGPL)
+pkgdesc="A library for Qt-based Telepathy clients"
+depends=(qt5-base telepathy-farstream)
+makedepends=(cmake doxygen python2 qt5-tools)
+conflicts=(telepathy-qt5)
+provides=(telepathy-qt5)
+replaces=(telepathy-qt5)
+source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('86470dd3d7f6de8b8f4f36165486d42f'
+ 'SKIP')
+validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$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
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/glibc-2.20.patch
===================================================================
--- extra-i686/glibc-2.20.patch 2016-11-29 12:35:24 UTC (rev 282324)
+++ extra-i686/glibc-2.20.patch 2016-11-29 12:35:59 UTC (rev 282325)
@@ -1,25 +0,0 @@
-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 2016-11-29 12:35:24 UTC (rev 282324)
+++ extra-x86_64/PKGBUILD 2016-11-29 12:35:59 UTC (rev 282325)
@@ -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.7
-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=('86470dd3d7f6de8b8f4f36165486d42f'
- '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 282324, telepathy-qt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-11-29 12:35:59 UTC (rev 282325)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=telepathy-qt
+pkgver=0.9.7
+pkgrel=1
+arch=(i686 x86_64)
+url="http://telepathy.freedesktop.org/wiki/"
+license=(LGPL)
+pkgdesc="A library for Qt-based Telepathy clients"
+depends=(qt5-base telepathy-farstream)
+makedepends=(cmake doxygen python2 qt5-tools)
+conflicts=(telepathy-qt5)
+provides=(telepathy-qt5)
+replaces=(telepathy-qt5)
+source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('86470dd3d7f6de8b8f4f36165486d42f'
+ 'SKIP')
+validpgpkeys=('AA33B0D27868E36C151780F0FE0B6D736B1195ED') # Alexandr Akulich
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$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
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/glibc-2.20.patch
===================================================================
--- extra-x86_64/glibc-2.20.patch 2016-11-29 12:35:24 UTC (rev 282324)
+++ extra-x86_64/glibc-2.20.patch 2016-11-29 12:35:59 UTC (rev 282325)
@@ -1,25 +0,0 @@
-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