[arch-commits] Commit in kadu/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Jan 18 17:54:41 UTC 2015
Date: Sunday, January 18, 2015 @ 18:54:40
Author: bpiotrowski
Revision: 126115
archrelease: copy trunk to community-i686, community-x86_64
Added:
kadu/repos/community-i686/PKGBUILD
(from rev 126114, kadu/trunk/PKGBUILD)
kadu/repos/community-i686/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch
(from rev 126114, kadu/trunk/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
kadu/repos/community-i686/kadu.install
(from rev 126114, kadu/trunk/kadu.install)
kadu/repos/community-x86_64/PKGBUILD
(from rev 126114, kadu/trunk/PKGBUILD)
kadu/repos/community-x86_64/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch
(from rev 126114, kadu/trunk/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
kadu/repos/community-x86_64/kadu.install
(from rev 126114, kadu/trunk/kadu.install)
Deleted:
kadu/repos/community-i686/PKGBUILD
kadu/repos/community-i686/kadu.install
kadu/repos/community-x86_64/PKGBUILD
kadu/repos/community-x86_64/kadu.install
------------------------------------------------------------------------------+
/PKGBUILD | 86 ++++++++++
/kadu.install | 24 ++
community-i686/PKGBUILD | 36 ----
community-i686/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch | 48 +++++
community-i686/kadu.install | 12 -
community-x86_64/PKGBUILD | 36 ----
community-x86_64/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch | 48 +++++
community-x86_64/kadu.install | 12 -
8 files changed, 206 insertions(+), 96 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-18 17:54:25 UTC (rev 126114)
+++ community-i686/PKGBUILD 2015-01-18 17:54:40 UTC (rev 126115)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-
-pkgname=kadu
-pkgver=1.3
-pkgrel=1
-pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
-arch=('i686' 'x86_64')
-url='http://www.kadu.net/'
-license=('GPL')
-depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
- 'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja')
-install=kadu.install
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('2ec969746c5ff90f922a0fd3bddf9f22')
-
-build() {
- mkdir build
- cd build
-
- cmake ../$pkgname-$pkgver \
- -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DQT_QMAKE_EXECUTABLE=qmake-qt4
- ninja
-}
-
-package() {
- DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install
- chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so
-}
Copied: kadu/repos/community-i686/PKGBUILD (from rev 126114, kadu/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Mateusz Herych
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+
+pkgname=kadu
+pkgver=1.5
+pkgrel=1
+pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
+arch=('i686' 'x86_64')
+url='http://www.kadu.net/'
+license=('GPL')
+depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
+ 'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja')
+install=kadu.install
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2
+ kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
+md5sums=('bfc653bc3a5b542877a299209db6adaf'
+ 'd706ee1839c629bc8cb06153211b2630')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch
+}
+
+build() {
+ mkdir build
+ cd build
+
+ cmake ../$pkgname-$pkgver \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4
+ ninja
+}
+
+package() {
+ DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install
+ chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so
+}
Copied: kadu/repos/community-i686/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch (from rev 126114, kadu/trunk/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
===================================================================
--- community-i686/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch (rev 0)
+++ community-i686/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,48 @@
+From bb925f636a8a3f662ef2a5f2826a7e0138dba266 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Wed, 31 Dec 2014 01:15:28 +0200
+Subject: [PATCH] Rename INSTALL_PREFIX to KADU_INSTALL_PREFIX.
+
+In CMake 3.1.0, INSTALL_PREFIX is now an optional argument to
+configure_package_config_file(), so our call was confusing the
+function's argument parsing code.
+
+Fix it by renaming INSTALL_PREFIX to KADU_INSTALL_PREFIX.
+
+Signed-off-by: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+---
+ CMakeLists.txt | 4 ++--
+ cmake/KaduConfig.cmake.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef624a9..3f23c71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,8 +195,8 @@ foreach (install_var ${install_vars})
+ endif ()
+ endforeach ()
+
+-set (INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+-set (path_vars INSTALL_PREFIX)
++set (KADU_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
++set (path_vars KADU_INSTALL_PREFIX)
+ if (UNIX AND NOT APPLE)
+ list (APPEND path_vars DESKTOP_FILE_DIR)
+ endif ()
+diff --git a/cmake/KaduConfig.cmake.in b/cmake/KaduConfig.cmake.in
+index 2e22aa4..6a3c683 100644
+--- a/cmake/KaduConfig.cmake.in
++++ b/cmake/KaduConfig.cmake.in
+@@ -20,7 +20,7 @@ endif ()
+ set (KADU_INCLUDE_DIR "@PACKAGE_INCLUDE_DIR@")
+ set (KADU_INCLUDE_DIRS "@PACKAGE_INCLUDE_DIR@" "@PACKAGE_INCLUDE_DIR@/kadu-core")
+ set (KADU_SDK_DIR "@PACKAGE_SDK_DIR@")
+-set (KADU_INSTALL_PREFIX "@PACKAGE_INSTALL_PREFIX@")
++set (KADU_INSTALL_PREFIX "@PACKAGE_KADU_INSTALL_PREFIX@")
+
+ set (KADU_INSTALL_SDK "@INSTALL_SDK@")
+
+--
+1.7.1
+
Deleted: community-i686/kadu.install
===================================================================
--- community-i686/kadu.install 2015-01-18 17:54:25 UTC (rev 126114)
+++ community-i686/kadu.install 2015-01-18 17:54:40 UTC (rev 126115)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: kadu/repos/community-i686/kadu.install (from rev 126114, kadu/trunk/kadu.install)
===================================================================
--- community-i686/kadu.install (rev 0)
+++ community-i686/kadu.install 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-18 17:54:25 UTC (rev 126114)
+++ community-x86_64/PKGBUILD 2015-01-18 17:54:40 UTC (rev 126115)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-
-pkgname=kadu
-pkgver=1.3
-pkgrel=1
-pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
-arch=('i686' 'x86_64')
-url='http://www.kadu.net/'
-license=('GPL')
-depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
- 'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja')
-install=kadu.install
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('2ec969746c5ff90f922a0fd3bddf9f22')
-
-build() {
- mkdir build
- cd build
-
- cmake ../$pkgname-$pkgver \
- -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DQT_QMAKE_EXECUTABLE=qmake-qt4
- ninja
-}
-
-package() {
- DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install
- chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so
-}
Copied: kadu/repos/community-x86_64/PKGBUILD (from rev 126114, kadu/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Mateusz Herych
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+
+pkgname=kadu
+pkgver=1.5
+pkgrel=1
+pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
+arch=('i686' 'x86_64')
+url='http://www.kadu.net/'
+license=('GPL')
+depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
+ 'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja')
+install=kadu.install
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2
+ kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
+md5sums=('bfc653bc3a5b542877a299209db6adaf'
+ 'd706ee1839c629bc8cb06153211b2630')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch
+}
+
+build() {
+ mkdir build
+ cd build
+
+ cmake ../$pkgname-$pkgver \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4
+ ninja
+}
+
+package() {
+ DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install
+ chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so
+}
Copied: kadu/repos/community-x86_64/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch (from rev 126114, kadu/trunk/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch)
===================================================================
--- community-x86_64/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch (rev 0)
+++ community-x86_64/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,48 @@
+From bb925f636a8a3f662ef2a5f2826a7e0138dba266 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Wed, 31 Dec 2014 01:15:28 +0200
+Subject: [PATCH] Rename INSTALL_PREFIX to KADU_INSTALL_PREFIX.
+
+In CMake 3.1.0, INSTALL_PREFIX is now an optional argument to
+configure_package_config_file(), so our call was confusing the
+function's argument parsing code.
+
+Fix it by renaming INSTALL_PREFIX to KADU_INSTALL_PREFIX.
+
+Signed-off-by: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+---
+ CMakeLists.txt | 4 ++--
+ cmake/KaduConfig.cmake.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef624a9..3f23c71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,8 +195,8 @@ foreach (install_var ${install_vars})
+ endif ()
+ endforeach ()
+
+-set (INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+-set (path_vars INSTALL_PREFIX)
++set (KADU_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
++set (path_vars KADU_INSTALL_PREFIX)
+ if (UNIX AND NOT APPLE)
+ list (APPEND path_vars DESKTOP_FILE_DIR)
+ endif ()
+diff --git a/cmake/KaduConfig.cmake.in b/cmake/KaduConfig.cmake.in
+index 2e22aa4..6a3c683 100644
+--- a/cmake/KaduConfig.cmake.in
++++ b/cmake/KaduConfig.cmake.in
+@@ -20,7 +20,7 @@ endif ()
+ set (KADU_INCLUDE_DIR "@PACKAGE_INCLUDE_DIR@")
+ set (KADU_INCLUDE_DIRS "@PACKAGE_INCLUDE_DIR@" "@PACKAGE_INCLUDE_DIR@/kadu-core")
+ set (KADU_SDK_DIR "@PACKAGE_SDK_DIR@")
+-set (KADU_INSTALL_PREFIX "@PACKAGE_INSTALL_PREFIX@")
++set (KADU_INSTALL_PREFIX "@PACKAGE_KADU_INSTALL_PREFIX@")
+
+ set (KADU_INSTALL_SDK "@INSTALL_SDK@")
+
+--
+1.7.1
+
Deleted: community-x86_64/kadu.install
===================================================================
--- community-x86_64/kadu.install 2015-01-18 17:54:25 UTC (rev 126114)
+++ community-x86_64/kadu.install 2015-01-18 17:54:40 UTC (rev 126115)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: kadu/repos/community-x86_64/kadu.install (from rev 126114, kadu/trunk/kadu.install)
===================================================================
--- community-x86_64/kadu.install (rev 0)
+++ community-x86_64/kadu.install 2015-01-18 17:54:40 UTC (rev 126115)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
More information about the arch-commits
mailing list