[arch-commits] Commit in kdebindings/trunk (PKGBUILD pyqt-4.7.4-fix.patch)
Andrea Scarpino
andrea at archlinux.org
Tue Jul 27 09:09:27 UTC 2010
Date: Tuesday, July 27, 2010 @ 05:09:26
Author: andrea
Revision: 86185
moved to [testing]
Modified:
kdebindings/trunk/PKGBUILD
Deleted:
kdebindings/trunk/pyqt-4.7.4-fix.patch
----------------------+
PKGBUILD | 43 +++++++++++++++----------------------------
pyqt-4.7.4-fix.patch | 15 ---------------
2 files changed, 15 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-27 09:09:22 UTC (rev 86184)
+++ PKGBUILD 2010-07-27 09:09:26 UTC (rev 86185)
@@ -1,44 +1,38 @@
# $Id: PKGBUILD 59825 2009-11-28 01:40:17Z andrea $
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
pkgbase=kdebindings
pkgname=('kdebindings-csharp'
'kdebindings-python'
- 'kdebindings-ruby'
'kdebindings-smoke')
-pkgver=4.4.5
-pkgrel=2
+pkgver=4.4.95
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdepimlibs' 'pyqt' 'kdepim-runtime'
- 'ruby' 'mono' 'kdegraphics-okular' 'boost' 'qscintilla')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'pyqt-4.7.4-fix.patch')
-sha1sums=('2f041c5b050da879e8f5d09f668b56881f9f1bb2'
- '1f501de06c7f38fc8f7ceaf550f9c2dd9204ed75')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
+ 'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('4e92f4e693943012e2456c1b9ce7f4b683671fb2')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np0 -i ${srcdir}/pyqt-4.7.4-fix.patch
export MONO_SHARED_DIR="${srcdir}/build/.mono"
mkdir -p "$MONO_SHARED_DIR"
- cd $srcdir/build
+ cd ${srcdir}/build
- # fix build with ruby 1.9
- # see http://bugs.archlinux.org/task/16175
- find ../$pkgbase-$pkgver/ruby -name CMakeLists.txt \
- -exec sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/${CARCH}-linux|" {} \;
-
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_falcon=OFF \
-DBUILD_java=OFF \
+ -DBUILD_ruby=OFF \
-DBUILD_php=OFF \
- -DBUILD_falcon=OFF \
- -DENABLE_KROSSRUBY=OFF \
- -DWITH_PolkitQt=OFF
+ -DWITH_PolkitQt=OFF \
+ -DRUBY_LIBRARY=/usr/lib/ruby/1.9.1 \
+ -DRUBY_INCLUDE_PATH="/usr/lib/ruby/1.9.1/${CARCH}-linux"
make
}
@@ -58,16 +52,9 @@
make DESTDIR=$pkgdir install
}
-package_kdebindings-ruby() {
- pkgdesc='KDE bindings for ruby'
- depends=('kdebindings-smoke' 'ruby')
- cd $srcdir/build/ruby
- make DESTDIR=$pkgdir install
-}
-
package_kdebindings-smoke() {
pkgdesc='Language independent library for Qt and KDE bindings'
- depends=('kdepimlibs' 'qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
+ depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
cd $srcdir/build/smoke
make DESTDIR=$pkgdir install
}
Deleted: pyqt-4.7.4-fix.patch
===================================================================
--- pyqt-4.7.4-fix.patch 2010-07-27 09:09:22 UTC (rev 86184)
+++ pyqt-4.7.4-fix.patch 2010-07-27 09:09:26 UTC (rev 86185)
@@ -1,15 +0,0 @@
-Index: python/pykde4/sip/akonadi/addressattribute.sip
-===================================================================
---- python/pykde4/sip/akonadi/addressattribute.sip (revision 1150375)
-+++ python/pykde4/sip/akonadi/addressattribute.sip (revision 1150562)
-@@ -57,6 +57,10 @@
- else if (dynamic_cast<Akonadi::MessageThreadingAttribute*>(sipCpp))
- sipType = sipType_Akonadi_MessageThreadingAttribute;
- %End
-+private:
-+//force
-+Akonadi::AddressAttribute& operator = (const Akonadi::AddressAttribute&);
-+//end
- };
- };
- %ModuleHeaderCode
More information about the arch-commits
mailing list