Date: Monday, February 24, 2014 @ 19:01:27 Author: bpiotrowski Revision: 106173
archrelease: copy trunk to community-i686, community-x86_64 Added: kadu/repos/community-i686/PKGBUILD (from rev 106172, kadu/trunk/PKGBUILD) kadu/repos/community-i686/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (from rev 106172, kadu/trunk/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) kadu/repos/community-i686/kadu.install (from rev 106172, kadu/trunk/kadu.install) kadu/repos/community-x86_64/PKGBUILD (from rev 106172, kadu/trunk/PKGBUILD) kadu/repos/community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (from rev 106172, kadu/trunk/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) kadu/repos/community-x86_64/kadu.install (from rev 106172, 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 | 90 ++++++++++++ /kadu.install | 24 +++ community-i686/PKGBUILD | 40 ----- community-i686/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch | 12 + community-i686/kadu.install | 12 - community-x86_64/PKGBUILD | 40 ----- community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch | 12 + community-x86_64/kadu.install | 12 - 8 files changed, 138 insertions(+), 104 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-02-24 18:01:17 UTC (rev 106172) +++ community-i686/PKGBUILD 2014-02-24 18:01:27 UTC (rev 106173) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Mateusz Herych -# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> - -pkgname=kadu -pkgver=0.12.3 -pkgrel=3 -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') -makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng') -install=kadu.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8') - -prepare() { - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - -build() { - mkdir build - cd build - - cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib - make -} - -package() { - cd build - make DESTDIR=$pkgdir LIBDIR=/usr/lib install - - mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk - rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} -} Copied: kadu/repos/community-i686/PKGBUILD (from rev 106172, kadu/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-02-24 18:01:27 UTC (rev 106173) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> + +pkgname=kadu +pkgver=0.12.3 +pkgrel=4 +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') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng') +install=kadu.install +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 + kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) +md5sums=('c5d6f0bd384cd96090819ea018eb8ad8' + '76e53a1f77699ba81c076f9254bb28c5') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + +build() { + mkdir build + cd build + + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" LIBDIR=/usr/lib install + + mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk + rm -rf "$pkgdir"/usr/{lib,include}/{libgadu*,pkgconfig} +} Copied: kadu/repos/community-i686/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (from rev 106172, kadu/trunk/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) =================================================================== --- community-i686/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (rev 0) +++ community-i686/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch 2014-02-24 18:01:27 UTC (rev 106173) @@ -0,0 +1,12 @@ +diff -rupN a/plugins/jabber_protocol/3rdparty/CMakeLists.txt b/plugins/jabber_protocol/3rdparty/CMakeLists.txt +--- a/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-09-14 21:54:35.000000000 +0000 ++++ b/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-24 17:43:59.696495517 +0000 +@@ -26,7 +26,7 @@ macro (kadu_jabber_automoc) + get_filename_component (_basename ${_current_MOC} NAME_WE) + set (_header ${_abs_FILE}) + set (_moc ${_abs_PATH}/${_current_MOC}) +- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") ++ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}") + MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) + endforeach (_current_MOC_INC) + endif (_match) Deleted: community-i686/kadu.install =================================================================== --- community-i686/kadu.install 2014-02-24 18:01:17 UTC (rev 106172) +++ community-i686/kadu.install 2014-02-24 18:01:27 UTC (rev 106173) @@ -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 106172, kadu/trunk/kadu.install) =================================================================== --- community-i686/kadu.install (rev 0) +++ community-i686/kadu.install 2014-02-24 18:01:27 UTC (rev 106173) @@ -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 2014-02-24 18:01:17 UTC (rev 106172) +++ community-x86_64/PKGBUILD 2014-02-24 18:01:27 UTC (rev 106173) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Mateusz Herych -# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> - -pkgname=kadu -pkgver=0.12.3 -pkgrel=3 -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') -makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng') -install=kadu.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8') - -prepare() { - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - -build() { - mkdir build - cd build - - cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib - make -} - -package() { - cd build - make DESTDIR=$pkgdir LIBDIR=/usr/lib install - - mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk - rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} -} Copied: kadu/repos/community-x86_64/PKGBUILD (from rev 106172, kadu/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-02-24 18:01:27 UTC (rev 106173) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> + +pkgname=kadu +pkgver=0.12.3 +pkgrel=4 +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') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng') +install=kadu.install +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 + kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) +md5sums=('c5d6f0bd384cd96090819ea018eb8ad8' + '76e53a1f77699ba81c076f9254bb28c5') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + +build() { + mkdir build + cd build + + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" LIBDIR=/usr/lib install + + mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk + rm -rf "$pkgdir"/usr/{lib,include}/{libgadu*,pkgconfig} +} Copied: kadu/repos/community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (from rev 106172, kadu/trunk/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch) =================================================================== --- community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch (rev 0) +++ community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch 2014-02-24 18:01:27 UTC (rev 106173) @@ -0,0 +1,12 @@ +diff -rupN a/plugins/jabber_protocol/3rdparty/CMakeLists.txt b/plugins/jabber_protocol/3rdparty/CMakeLists.txt +--- a/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-09-14 21:54:35.000000000 +0000 ++++ b/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-24 17:43:59.696495517 +0000 +@@ -26,7 +26,7 @@ macro (kadu_jabber_automoc) + get_filename_component (_basename ${_current_MOC} NAME_WE) + set (_header ${_abs_FILE}) + set (_moc ${_abs_PATH}/${_current_MOC}) +- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") ++ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}") + MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) + endforeach (_current_MOC_INC) + endif (_match) Deleted: community-x86_64/kadu.install =================================================================== --- community-x86_64/kadu.install 2014-02-24 18:01:17 UTC (rev 106172) +++ community-x86_64/kadu.install 2014-02-24 18:01:27 UTC (rev 106173) @@ -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 106172, kadu/trunk/kadu.install) =================================================================== --- community-x86_64/kadu.install (rev 0) +++ community-x86_64/kadu.install 2014-02-24 18:01:27 UTC (rev 106173) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} +