[arch-commits] Commit in kdebindings-python/repos (8 files)

Andrea Scarpino andrea at archlinux.org
Fri Nov 9 08:25:51 UTC 2012


    Date: Friday, November 9, 2012 @ 03:25:50
  Author: andrea
Revision: 170592

db-move: moved kdebindings-python from [testing] to [extra] (i686, x86_64)

Added:
  kdebindings-python/repos/extra-i686/PKGBUILD
    (from rev 170578, kdebindings-python/repos/testing-i686/PKGBUILD)
  kdebindings-python/repos/extra-x86_64/PKGBUILD
    (from rev 170578, kdebindings-python/repos/testing-x86_64/PKGBUILD)
Deleted:
  kdebindings-python/repos/extra-i686/PKGBUILD
  kdebindings-python/repos/extra-i686/pyqt495.patch
  kdebindings-python/repos/extra-x86_64/PKGBUILD
  kdebindings-python/repos/extra-x86_64/pyqt495.patch
  kdebindings-python/repos/testing-i686/
  kdebindings-python/repos/testing-x86_64/

----------------------------+
 extra-i686/PKGBUILD        |  144 ++++++++++++++++++++-----------------------
 extra-i686/pyqt495.patch   |   95 ----------------------------
 extra-x86_64/PKGBUILD      |  144 ++++++++++++++++++++-----------------------
 extra-x86_64/pyqt495.patch |   95 ----------------------------
 4 files changed, 138 insertions(+), 340 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-11-09 08:25:46 UTC (rev 170591)
+++ extra-i686/PKGBUILD	2012-11-09 08:25:50 UTC (rev 170592)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-i686/PKGBUILD (from rev 170578, kdebindings-python/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-11-09 08:25:50 UTC (rev 170592)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+         'kdebindings-python2')
+pkgver=4.9.3
+pkgrel=1
+url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('4a72a307d5780f013e12607b9cddb425f81ffeef')
+
+build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package_kdebindings-python() {
+  pkgdesc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  pkgdesc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+    "${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+    "${pkgdir}"/usr/share/sip/python2-PyKDE4
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}

Deleted: extra-i686/pyqt495.patch
===================================================================
--- extra-i686/pyqt495.patch	2012-11-09 08:25:46 UTC (rev 170591)
+++ extra-i686/pyqt495.patch	2012-11-09 08:25:50 UTC (rev 170592)
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame at kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon at simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.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)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-11-09 08:25:46 UTC (rev 170591)
+++ extra-x86_64/PKGBUILD	2012-11-09 08:25:50 UTC (rev 170592)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-x86_64/PKGBUILD (from rev 170578, kdebindings-python/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-11-09 08:25:50 UTC (rev 170592)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+         'kdebindings-python2')
+pkgver=4.9.3
+pkgrel=1
+url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('4a72a307d5780f013e12607b9cddb425f81ffeef')
+
+build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package_kdebindings-python() {
+  pkgdesc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  pkgdesc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+    "${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+    "${pkgdir}"/usr/share/sip/python2-PyKDE4
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}

Deleted: extra-x86_64/pyqt495.patch
===================================================================
--- extra-x86_64/pyqt495.patch	2012-11-09 08:25:46 UTC (rev 170591)
+++ extra-x86_64/pyqt495.patch	2012-11-09 08:25:50 UTC (rev 170592)
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame at kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon at simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.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)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-




More information about the arch-commits mailing list