From b11f1a78b50e5f952fa220651922d1fd9fb66b47 Mon Sep 17 00:00:00 2001 From: ertugerata Date: Mon, 7 Sep 2015 23:47:01 +0300 Subject: [PATCH] sip3, python3-sip3 fix deps --- .../language/python/dbus-python3/actions.py | 39 ++++++++ .../files/suppress-warnings.patch | 12 +++ .../language/python/dbus-python3/pspec.xml | 90 +++++++++++++++++++ .../python/dbus-python3/translations.xml | 7 ++ .../language/python/python-qt5/actions.py | 2 +- .../language/python/python-qt5/pspec.xml | 12 ++- programming/language/python/sip3/actions.py | 6 +- programming/language/python/sip3/pspec.xml | 4 + 8 files changed, 164 insertions(+), 8 deletions(-) create mode 100644 programming/language/python/dbus-python3/actions.py create mode 100644 programming/language/python/dbus-python3/files/suppress-warnings.patch create mode 100644 programming/language/python/dbus-python3/pspec.xml create mode 100644 programming/language/python/dbus-python3/translations.xml diff --git a/programming/language/python/dbus-python3/actions.py b/programming/language/python/dbus-python3/actions.py new file mode 100644 index 0000000000..5b872a2b46 --- /dev/null +++ b/programming/language/python/dbus-python3/actions.py @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + shelltools.makedirs("build-python3") + autotools.autoreconf("-fi") + + shelltools.cd("build-python3") + shelltools.system("PYTHON=python3 ../configure --prefix=/usr \ + --localstatedir=/var \ + --disable-api-docs \ + --disable-html-docs \ + --disable-static") + +def build(): + shelltools.cd("build-python3") + autotools.make() + + +def check(): + #autotools.make("check") + pass + +def install(): + shelltools.cd("build-python3") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # remove dbus-python-common files in py3 package + pisitools.removeDir("/usr/include/") + pisitools.removeDir("/usr/lib/pkgconfig") + pisitools.removeDir("/usr/share/") diff --git a/programming/language/python/dbus-python3/files/suppress-warnings.patch b/programming/language/python/dbus-python3/files/suppress-warnings.patch new file mode 100644 index 0000000000..e5d7aedaf7 --- /dev/null +++ b/programming/language/python/dbus-python3/files/suppress-warnings.patch @@ -0,0 +1,12 @@ +diff -Naur dbus-python-0.83.0.orig/dbus/connection.py dbus-python-0.83.0/dbus/connection.py +--- dbus-python-0.83.0.orig/dbus/connection.py 2009-04-22 13:58:33.000000000 +0300 ++++ dbus-python-0.83.0/dbus/connection.py 2009-04-22 13:58:40.000000000 +0300 +@@ -239,7 +239,7 @@ + ProxyObjectClass = ProxyObject + + def __init__(self, *args, **kwargs): +- super(Connection, self).__init__(*args, **kwargs) ++ super(Connection, self).__init__() + + # this if-block is needed because shared bus connections can be + # __init__'ed more than once diff --git a/programming/language/python/dbus-python3/pspec.xml b/programming/language/python/dbus-python3/pspec.xml new file mode 100644 index 0000000000..99c736b5ef --- /dev/null +++ b/programming/language/python/dbus-python3/pspec.xml @@ -0,0 +1,90 @@ + + + + + dbus-python + http://dbus.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + AFL-2.1 + library + D-Bus Python bindings + dbus-python provides a Python module which wraps the D-Bus programming API. + http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz + + + python3 + dbus-devel + dbus-glib-devel + glib2-devel + libpcre-devel + + + suppress-warnings.patch + + + + + dbus-python3 + programming.language.python + D-Bus Python3 bindings + + + python3 + dbus + glib2 + dbus-glib + + + /usr/lib/python3* + + + + + + 2015-06-02 + 1.2.0 + Release bump. + Kamil Atlı + suvarice@gmail.com + + + 2014-05-11 + 1.2.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.2.0 + rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-23 + 1.2.0 + Version bump. Remove dbus-devel from runtime dependencies. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-25 + 1.1.1 + Dep Fixed. + PisiLinux Community + admins@pisilinux.org + + + 2012-11-10 + 1.1.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/programming/language/python/dbus-python3/translations.xml b/programming/language/python/dbus-python3/translations.xml new file mode 100644 index 0000000000..aebfdfa5d2 --- /dev/null +++ b/programming/language/python/dbus-python3/translations.xml @@ -0,0 +1,7 @@ + + + + dbus-python + D-Bus için Python bağlayıcıları + + diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py index 8593bea852..756778ad62 100644 --- a/programming/language/python/python-qt5/actions.py +++ b/programming/language/python/python-qt5/actions.py @@ -20,7 +20,7 @@ def setup(): --sip /usr/bin/sip3 \ --qmake='/usr/lib/qt5/bin/qmake' \ --destdir='/usr/lib/python3.4/site-packages/' \ - --sip-incdir='/usr/include/python3.4' \ + --sip-incdir='/usr/include/python3.4m' \ CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'") diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index aeadf235a7..abc06723fa 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -13,7 +13,8 @@ Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. dbus-devel - libgcc + dbus-python3 + dbus-python-common python3-devel python3-sip3 qt5-base-devel @@ -34,6 +35,7 @@ mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz + python3-qt5-common Common files shared between python-qt5 and python3-qt5 @@ -48,11 +50,13 @@ /usr/share/sip/PyQt5 + python3-qt5 A set of Python 3.x bindings for the Qt 5.x Toolkit libgcc + dbus python3 python3-qt5-common qt5-base @@ -70,6 +74,7 @@ /usr/lib/qt5/plugins + python3-qt5-docs Documentation for python-qt5 bindings @@ -80,11 +85,12 @@ /usr/share/doc + - 2015-06-14 + 2015-09-07 5.4.2 - First release + Version bump. Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org diff --git a/programming/language/python/sip3/actions.py b/programming/language/python/sip3/actions.py index 99b4188075..eb44f1d43b 100644 --- a/programming/language/python/sip3/actions.py +++ b/programming/language/python/sip3/actions.py @@ -9,6 +9,7 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import pythonmodules from pisi.actionsapi import get + WorkDir = "sip-%s" % get.srcVERSION() py3dir = "python3.4" @@ -16,7 +17,7 @@ def setup(): pythonmodules.run('configure.py \ -b /usr/bin \ -d /usr/lib/%s/site-packages/ \ - -e /usr/include/%s/ \ + -e /usr/include/%sm/ \ CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") def build(): @@ -27,6 +28,3 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) pisitools.rename("/usr/bin/sip", "sip3") - - -# By PiSiDo 2.3.1 diff --git a/programming/language/python/sip3/pspec.xml b/programming/language/python/sip3/pspec.xml index 5e9ece45a0..9f0c060166 100644 --- a/programming/language/python/sip3/pspec.xml +++ b/programming/language/python/sip3/pspec.xml @@ -19,6 +19,7 @@ sip-outoftree.patch + sip3 @@ -37,6 +38,7 @@ libgcc + python3-sip3 @@ -53,6 +55,7 @@ sip3 + sip3-devel @@ -68,6 +71,7 @@ sip3 + 2015-06-14