summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-10-07 11:48:44 +0200
committersibel <lesibel at free dot fr>2010-10-07 11:48:44 +0200
commita9740ac94279cbca6e8f548ef507bf214b9ab614 (patch)
tree9e465bea4028eb49d3f448e9d38f7f9c36c211ff
parentb923632d78183ad0bbe134ea7f65eac23e1487ea (diff)
downloadnutyx-pakxe-a9740ac94279cbca6e8f548ef507bf214b9ab614.tar.gz
nutyx-pakxe-a9740ac94279cbca6e8f548ef507bf214b9ab614.tar.bz2
nutyx-pakxe-a9740ac94279cbca6e8f548ef507bf214b9ab614.tar.xz
nutyx-pakxe-a9740ac94279cbca6e8f548ef507bf214b9ab614.zip
maj de kdebindings#4.5.2-1
-rw-r--r--kde/kdebindings/.md5sum3
-rwxr-xr-xkde/kdebindings/Pkgfile28
-rw-r--r--kde/kdebindings/fix-pyqt4-build.patch64
3 files changed, 77 insertions, 18 deletions
diff --git a/kde/kdebindings/.md5sum b/kde/kdebindings/.md5sum
index 90f670f8b..da98f3b93 100644
--- a/kde/kdebindings/.md5sum
+++ b/kde/kdebindings/.md5sum
@@ -1 +1,2 @@
-ac762e1d382d63194c387246daa9cc74 kdebindings-4.5.1.tar.bz2
+0f194ec6cb172ca1b958f4257020d24c fix-pyqt4-build.patch
+02f6a8397beb6a034fe9025f03f6bd02 kdebindings-4.5.2.tar.bz2
diff --git a/kde/kdebindings/Pkgfile b/kde/kdebindings/Pkgfile
index 5b0def061..81d57b0e7 100755
--- a/kde/kdebindings/Pkgfile
+++ b/kde/kdebindings/Pkgfile
@@ -2,31 +2,25 @@
# URL: http://www.kde.org
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-# Depends on: kdegraphics, kdebase-runtime, kdebase-workspace, qscintilla, kdepimlibs, ruby, pyqt
+# Depends on: kdepim-runtime, kdegraphics, qscintilla
name=kdebindings
-version=4.5.1
+version=4.5.2
release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2
+ fix-pyqt4-build.patch)
+
build() {
+ unset MAKEFLAGS
cd $name-$version
- mkdir build
- cd build
- # fix build with ruby 1.9
- # see http://bugs.archlinux.org/task/16175
-# find ../$name-$version
- find ../ruby -name CMakeLists.txt \
- -exec sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/i686-linux|" {} \;
+ patch -Np0 -i ../fix-pyqt4-build.patch
+
+ mkdir build
+ cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_java=OFF \
- -DBUILD_php=OFF \
- -DBUILD_falcon=OFF \
- -DBUILD_doc=OFF \
- -DENABLE_KROSSRUBY=OFF \
- -DWITH_PolkitQt=OFF
+ -DCMAKE_BUILD_TYPE=Release
make
make DESTDIR=$PKG install
}
diff --git a/kde/kdebindings/fix-pyqt4-build.patch b/kde/kdebindings/fix-pyqt4-build.patch
new file mode 100644
index 000000000..249ccb850
--- /dev/null
+++ b/kde/kdebindings/fix-pyqt4-build.patch
@@ -0,0 +1,64 @@
+--- python/pykde4/sip/kdecore/typedefs.sip
++++ python/pykde4/sip/kdecore/typedefs.sip
+@@ -733,61 +733,6 @@
+ };
+
+
+-%MappedType QList<uint>
+-{
+-%TypeHeaderCode
+-#include <qlist.h>
+-%End
+-
+-%ConvertFromTypeCode
+- // Create the list.
+- PyObject *l;
+-
+- if ((l = PyList_New(sipCpp->size())) == NULL)
+- return NULL;
+-
+- // Set the list elements.
+- for (int i = 0; i < sipCpp->size(); ++i) {
+- PyObject *pobj;
+-
+-#if PY_MAJOR_VERSION >= 3
+- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
+-#else
+- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
+-#endif
+- Py_DECREF(l);
+-
+- return NULL;
+- }
+-
+- PyList_SET_ITEM(l, i, pobj);
+- }
+-
+- return l;
+-%End
+-
+-%ConvertToTypeCode
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- return PyList_Check(sipPy);
+-
+- QList<uint> *ql = new QList<uint>;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-#if PY_MAJOR_VERSION >= 3
+- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#else
+- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#endif
+- }
+-
+- *sipCppPtr = ql;
+-
+- return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE*>
+ %MappedType QStack<TYPE*>
+ {