[arch-commits] Commit in kdebindings/trunk (3 files)

Pierre Schmitz pierre at archlinux.org
Wed Jul 23 19:21:46 EDT 2008


    Date: Wednesday, July 23, 2008 @ 19:21:45
  Author: pierre
Revision: 6134

upgpkg: kdebindings 4.1.0-1
    updating to 4.1.0

Modified:
  kdebindings/trunk/PKGBUILD
Deleted:
  kdebindings/trunk/fix-perl-policy.patch
  kdebindings/trunk/python24.patch

-----------------------+
 PKGBUILD              |   61 +++------
 fix-perl-policy.patch |   21 ---
 python24.patch        |  316 ------------------------------------------------
 3 files changed, 26 insertions(+), 372 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-23 23:19:42 UTC (rev 6133)
+++ PKGBUILD	2008-07-23 23:21:45 UTC (rev 6134)
@@ -1,41 +1,32 @@
-# $Id$
-# Contributor: Roman Kreisel <roman.kreisel at epost.de>
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebindings
-pkgver=3.5.9
-kdever=3.5.9 # if minor 0, then without .0
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="KDE Bindings."
-arch=(i686 x86_64)
-url="http://www.kde.org"
-license=('GPL')
-groups=('kde')
-makedepends=('jdk' 'gtk' 'pkgconfig')
-depends=('kdelibs>=3.5.9' 'ruby' 'qscintilla-qt3')
+pkgdesc="KDE Language Bindings"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+depends=('kdepimlibs' 'python' 'ruby' 'qscintilla')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'sip' 'pyqt')
+options=('docs')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2"
+        'ktexteditor.patch')
+md5sums=('b76d5138f9194bcc0a000bb905cf4246'
+         '20a34ec3fed8b51a6793468ba77b3b56')
 
-# for easier build, just uncomment the mirror you want to use
-  mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
-# mirror="ftp.kde.org/pub/kde/"             # main server
-# mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
-options=(!makeflags)
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
-	fix-perl-policy.patch)
-
 build() {
-  # Source the QT and KDE profile
-  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh 
-  [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
-  # start building
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np0 -i ../fix-perl-policy.patch || return 1
-  ./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking \
-  --enable-gcc-hidden-visibility DO_NOT_COMPILE="python" --enable-final
-  #        --enable-final # remove this if you build with < 1512mb ram.
-  # python packages are seperated from kdebindings
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1    
-  rm -rf $startdir/pkg/usr/lib/perl5/core_perl/perllocal.pod
+	cd $srcdir/${pkgname}-${pkgver}
+	patch -p0 -i $srcdir/ktexteditor.patch
+	cd ..
+	mkdir build
+	cd build
+
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_csharp=OFF
+	make
+	make DESTDIR=$pkgdir install
 }
-md5sums=('ba780920f6b810a30a61b1ffa888706b'
-         '7ba28a153587501bf83c099c2a9876a8')

Deleted: fix-perl-policy.patch
===================================================================
--- fix-perl-policy.patch	2008-07-23 23:19:42 UTC (rev 6133)
+++ fix-perl-policy.patch	2008-07-23 23:21:45 UTC (rev 6134)
@@ -1,21 +0,0 @@
---- dcopperl/Makefile.PL.orig	2001-09-02 16:24:30.000000000 +0300
-+++ dcopperl/Makefile.PL	2005-02-05 16:00:11.376798384 +0200
-@@ -31,6 +31,7 @@
-     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
-     XSOPT	=> '-C++',
-     CCFLAGS	=> '-x c++',
-+    INSTALLDIRS => 'vendor',
- );
- 
- sub MY::xs_c {
---- dcopperl/Makefile.PL.in.orig	2003-12-28 15:43:20.000000000 +0200
-+++ dcopperl/Makefile.PL.in	2005-02-05 16:00:21.002335080 +0200
-@@ -17,6 +17,7 @@
-     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
-     XSOPT	=> '-C++',
-     CCFLAGS	=> '-x c++',
-+    INSTALLDIRS => 'vendor',
- );
- 
- sub MY::xs_c {
- 

Deleted: python24.patch
===================================================================
--- python24.patch	2008-07-23 23:19:42 UTC (rev 6133)
+++ python24.patch	2008-07-23 23:21:45 UTC (rev 6134)
@@ -1,316 +0,0 @@
---- branches/KDE/3.5/kdebindings/dcoppython/shell/marshaller.cpp #626831:626832
-@@ -24,6 +24,10 @@
- 
- #include <kurl.h>
- 
-+#if PY_VERSION_HEX < 0x02050000
-+typedef int Py_ssize_t;
-+#endif
-+
- namespace PythonDCOP {
- 
- #include "marshal_funcs.h"
-@@ -124,7 +128,7 @@
-     if (!PyDict_Check(obj)) return false;
- 
- 
--    ssize_t c=0;
-+    Py_ssize_t c=0;
-     PyObject *key, *val;
-     while (PyDict_Next(obj, &c, &key, &val)==1)
-       if (!key_type.isMarshallable(key) ||
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/bytearray.sip #626831:626832
-@@ -620,7 +620,7 @@
-     QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QCString *acpp;
-     DCOPRef *bcpp;
- 
-@@ -705,7 +705,7 @@
-     QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *acpp;
-     DCOPRef *bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kaccel.sip #626831:626832
-@@ -209,7 +209,7 @@
-     QMap<int,QString> *map = new QMap<int,QString>;
- 
-         PyObject *key, *value;
--        ssize_t pos = 0;
-+        _SIP_SSIZE_T pos = 0;
-         int iKey;
-         QString *sData;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kcompletion.sip #626831:626832
-@@ -201,7 +201,7 @@
-     QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
- 
-     PyObject *key, *value;
--        ssize_t pos = 0;
-+        _SIP_SSIZE_T pos = 0;
-         KShortcut *cValue;
-         int iserr;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kconfig.sip #626831:626832
-@@ -158,7 +158,7 @@
-     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
- 
-     PyObject *aelem, *belem;
--    ssize_t  pos = 0;
-+    _SIP_SSIZE_T  pos = 0;
-     QString *acpp;
-     QString *bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kconfigdata.sip #626831:626832
-@@ -141,7 +141,7 @@
-     QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     KEntryKey *acpp;
-     KEntry *bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kmacroexpander.sip #626831:626832
-@@ -169,7 +169,7 @@
-     QMap<QChar,QString> *map = new QMap<QChar,QString>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QChar *cKey;
-     QString *sData;
- 
-@@ -255,7 +255,7 @@
-     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *sKey;
-     QStringList *slData;
- 
-@@ -343,7 +343,7 @@
-     QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QChar *cKey;
-     QStringList *slData;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdecore/kurl.sip #626831:626832
-@@ -234,7 +234,7 @@
-         void                 __setitem__ (int, const KURL&);
- %MethodCode
- //takes index | (int) | value | (KURL)
--    ssize_t len;
-+    _SIP_SSIZE_T len;
- 
-     len = sipCpp -> count();
- 
-@@ -248,7 +248,7 @@
- %MethodCode
- //takes range | (a Python slice) | urlList | (KURL.List)
- 
--    ssize_t len, start, stop, step, slicelength;
-+    _SIP_SSIZE_T len, start, stop, step, slicelength;
- 
-     len = sipCpp -> count();
- 
-@@ -278,7 +278,7 @@
-         void                 __delitem__ (int);
- %MethodCode
- //takes index | (int)
--    ssize_t len;
-+    _SIP_SSIZE_T len;
- 
-     len = sipCpp -> count();
- 
-@@ -291,7 +291,7 @@
-         void                 __delitem__ (SIP_PYSLICE);
- %MethodCode
- //takes range | (a Python slice)
--    ssize_t len, start, stop, step, slicelength;
-+    _SIP_SSIZE_T len, start, stop, step, slicelength;
- 
-     len = sipCpp -> count();
-     if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
-@@ -308,7 +308,7 @@
- %MethodCode
- //returns (KURL)
- //takes index | (int)
--    ssize_t len;
-+    _SIP_SSIZE_T len;
- 
-     len = sipCpp -> count();
- 
-@@ -322,7 +322,7 @@
- %MethodCode
- //returns (KURL.List)
- //takes range | (a Python slice)
--    ssize_t len, start, stop, step, slicelength;
-+    _SIP_SSIZE_T len, start, stop, step, slicelength;
- 
-     len = sipCpp -> count();
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kdeui/kkeydialog.sip #626831:626832
-@@ -231,7 +231,7 @@
-     QDict<int>* qdict = new QDict<int>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *a0;
-     int a1;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kio/authinfo.sip #626831:626832
-@@ -176,7 +176,7 @@
-     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *sKey;
-     QStringList *sData;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kio/global.sip #626831:626832
-@@ -675,7 +675,7 @@
-     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *acpp;
-     QString *bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kio/kservicetype.sip #626831:626832
-@@ -184,7 +184,7 @@
-     QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *acpp;
-     QVariant::Type bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kmdi/kmdichildfrm.sip #626831:626832
-@@ -245,7 +245,7 @@
-     QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
- 
-     PyObject *key, *value;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QString *a0;
-     QWidget::FocusPolicy a1;
- 
---- branches/KDE/3.5/kdebindings/python/pykde/sip/kparts/browserextension.sip #626831:626832
-@@ -404,7 +404,7 @@
-     QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QCString *acpp;
-     QCString *bcpp;
- 
-@@ -487,7 +487,7 @@
-     QMap<QCString,int> *cppmap = new QMap<QCString,int>;
- 
-     PyObject *aelem, *belem;
--    ssize_t pos = 0;
-+    _SIP_SSIZE_T pos = 0;
-     QCString *acpp;
-     int bcpp;
- 
---- branches/KDE/3.5/kdebindings/python/pyqt/sip/qt/qdir.sip #626831:626832
-@@ -238,7 +238,7 @@
- 
- 	QString operator[](int) const;
- %MethodCode
--		ssize_t len;
-+		_SIP_SSIZE_T len;
- 
- 		Py_BEGIN_ALLOW_THREADS
- 		len = sipCpp -> count();
-@@ -256,7 +256,7 @@
- 
- 	QStringList operator[](SIP_PYSLICE) const;
- %MethodCode
--		ssize_t len, start, stop, step, slicelength;
-+		_SIP_SSIZE_T len, start, stop, step, slicelength;
- 
- 		Py_BEGIN_ALLOW_THREADS
- 		len = sipCpp -> count();
---- branches/KDE/3.5/kdebindings/python/pyqt/sip/qt/qstring.sip #626831:626832
-@@ -746,7 +746,7 @@
- 
- 	QString operator[](SIP_PYSLICE) const;
- %MethodCode
--		ssize_t len, start, stop, step, slicelength;
-+		_SIP_SSIZE_T len, start, stop, step, slicelength;
- 
- 		len = sipCpp -> length();
- 
---- branches/KDE/3.5/kdebindings/python/pyqt/sip/qt/qstringlist.sip #626831:626832
-@@ -99,7 +99,7 @@
- 
- 	void __setitem__(int,const QString &);
- %MethodCode
--		ssize_t len;
-+		_SIP_SSIZE_T len;
- 
- 		len = sipCpp -> count();
- 
-@@ -111,7 +111,7 @@
- 
- 	void __setitem__(SIP_PYSLICE,const QStringList &);
- %MethodCode
--		ssize_t len, start, stop, step, slicelength;
-+		_SIP_SSIZE_T len, start, stop, step, slicelength;
- 
- 		len = sipCpp -> count();
- 
-@@ -142,7 +142,7 @@
- 
- 	void __delitem__(int);
- %MethodCode
--		ssize_t len;
-+		_SIP_SSIZE_T len;
- 
- 		len = sipCpp -> count();
- 
-@@ -154,7 +154,7 @@
- 
- 	void __delitem__(SIP_PYSLICE);
- %MethodCode
--		ssize_t len, start, stop, step, slicelength;
-+		_SIP_SSIZE_T len, start, stop, step, slicelength;
- 
- 		len = sipCpp -> count();
- 
-@@ -170,7 +170,7 @@
- 
- 	QString operator[](int);
- %MethodCode
--		ssize_t len;
-+		_SIP_SSIZE_T len;
- 
- 		len = sipCpp -> count();
- 
-@@ -182,7 +182,7 @@
- 
- 	QStringList operator[](SIP_PYSLICE);
- %MethodCode
--		ssize_t len, start, stop, step, slicelength;
-+		_SIP_SSIZE_T len, start, stop, step, slicelength;
- 
- 		len = sipCpp -> count();
- 





More information about the arch-commits mailing list