Commits

arsooy committed 5c633fb

Combining python*-pyside-tools into pyside-tools.

* pyside-tools is the new common package for pyside-tools, all files
that requires python2 or python3 delegated to python-pyside-tools and
python2-pyside-tools
* python-pyside-tools patch manual files too
* removing unused files

  • Participants
  • Parent commits b00d375

Comments (0)

Files changed (7)

File pyside-tools/PKGBUILD

+# Maintainer: arlx_ignacy <ziphims@gmail.com>
+# Contributor: Matthias Maennich <arch@maennich.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+
+# modify this to whatever Python 2 interpreter you're targetting; on my
+# system I use the vanilla python2
+_py2exec=$(which python2)
+# modify this to whatever Python 3 interpreter you're targetting; on my
+# system I use the vanilla python3
+_py3exec=$(which python3)
+
+pkgbase=pyside-tools
+pkgname=('python2-pyside-tools' 'python-pyside-tools' 'pyside-tools')
+pkgver=0.2.14
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://www.pyside.org"
+depends=('python-pyside>=1.1.2')
+makedepends=('cmake' 'automoc4' 'python-shiboken>=1.1.2')
+replaces=('pyside-tools-py3')
+source=("http://www.pyside.org/files/pyside-tools-$pkgver.tar.bz2" 'py3build.patch')
+md5sums=('0a683e1dc426df5834cb1e540d0c6e3f' '02003622eeeebb9ce302375dce05dc05')
+
+build() {
+    echo ""
+}
+
+package_python-pyside-tools() {
+    if [ "$_py3exec" != "" ]; then
+        depends=('pyside-tools')
+        makedepends=('patch' 'sed' 'findutils')
+        pkgdesc='PySide development tools for Python 3.'
+
+        echo "Applying python 3 patch ..."
+        cd "$srcdir/pyside-tools-$pkgver"
+        patch -p1 < ../py3build.patch
+        # of course, if you want to undo the patch you can use:
+        #  $ patch -p1 -R < ../py3build.patch
+
+        if [ -d "$srcdir/build" ]; then
+            rm -r "$srcdir/build"
+        fi
+        mkdir -p "$srcdir/build"
+
+        cd "$srcdir/build"
+        cmake ../pyside-tools-$pkgver -DBUILD_TESTS=False           \
+                                      -DCMAKE_BUILD_TYPE=Release    \
+                                      -DCMAKE_INSTALL_PREFIX=/usr   \
+                                      -DPYTHON_EXECUTABLE=$_py3exec
+        make DESTDIR="$pkgdir" install
+
+        cd "$pkgdir/usr/bin"
+        sed -i -e "1c #!$_py3exec" pyside-uic
+        mv pyside-uic pyside-uic-python3
+        ln -sf pyside-uic-python3 pyside-uic
+        mv pyside-rcc pyside-rcc-python3
+        ln -sf pyside-rcc-python3 pyside-rcc
+
+        # remove unused file
+        rm "$pkgdir/usr/bin/pyside-lupdate"
+        cd "$pkgdir/usr/share/man"
+        find -type f -iname "pyside-lupdate*" -delete
+        for fname in $(find -type f -iname "pyside-rcc*"); do
+            mv "$fname" "${fname/-rcc/-rcc-python3}"
+        done
+        for fname in $(find -type f -iname "pyside-uic*"); do
+            mv "$fname" "${fname/-uic/-uic-python3}"
+        done
+    fi
+}
+
+package_python2-pyside-tools() {
+    if [ "$_py2exec" != "" ]; then
+        depends=('pyside-tools')
+        makedepends=('sed' 'findutils')
+        pkgdesc='PySide development tools for Python 3.'
+
+        if [ -d "$srcdir/build" ]; then
+            rm -r "$srcdir/build"
+        fi
+        mkdir -p "$srcdir/build"
+
+        cd "$srcdir/build"
+        cmake ../pyside-tools-$pkgver -DBUILD_TESTS=False           \
+                                      -DCMAKE_BUILD_TYPE=Release    \
+                                      -DCMAKE_INSTALL_PREFIX=/usr   \
+                                      -DPYTHON_EXECUTABLE=$_py2exec
+        make DESTDIR="$pkgdir" install
+
+        cd "$pkgdir/usr/bin"
+        sed -i -e "1c #!$_py2exec" pyside-uic
+        mv pyside-uic pyside-uic-python2
+        mv pyside-rcc pyside-rcc-python2
+
+        # remove unused file
+        rm "$pkgdir/usr/bin/pyside-lupdate"
+        cd "$pkgdir/usr/share/man"
+        find -type f -iname "pyside-lupdate*" -delete
+        for fname in $(find -type f -iname "pyside-rcc*"); do
+            mv "$fname" "${fname/-rcc/-rcc-python2}"
+        done
+        for fname in $(find -type f -iname "pyside-uic*"); do
+            mv "$fname" "${fname/-uic/-uic-python2}"
+        done
+    fi
+}
+
+package_pyside-tools() {
+    pkgdesc='PySide development tools.'
+    makedepends=('findutils')
+
+    if [ -d "$srcdir/build" ]; then
+        rm -r "$srcdir/build"
+    fi
+    mkdir -p "$srcdir/build"
+
+    cd "$srcdir/build"
+    cmake ../pyside-tools-$pkgver -DBUILD_TESTS=False         \
+                                  -DCMAKE_BUILD_TYPE=Release  \
+                                  -DCMAKE_INSTALL_PREFIX=/usr
+    make DESTDIR="$pkgdir" install
+
+    # remove unused files
+    cd "$pkgdir/usr"
+    rm -r lib
+    cd "$pkgdir/usr/bin"
+    rm -r pyside-uic pyside-rcc
+    cd "$pkgdir/usr/share/man"
+    find -type f -iname "pyside-uic*" -delete
+    find -type f -iname "pyside-rcc*" -delete
+}

File pyside-tools/py3build.patch

+diff --git a/pyrcc/main.cpp b/pyrcc/main.cpp
+index d9cecca..11aadeb 100644
+--- a/pyrcc/main.cpp
++++ b/pyrcc/main.cpp
+@@ -37,7 +37,7 @@
+ // Some static globals
+ static QString initName;
+ static bool verbose = false;
+-static int py_version = 2;
++static int py_version = 3; // arsooy_: by default this binary will create output for Python 3
+ static int compressLevel = CONSTANT_COMPRESSLEVEL_DEFAULT;
+ static int compressThreshold = CONSTANT_COMPRESSTHRESHOLD_DEFAULT;
+ static QString resourceRoot;
+@@ -97,8 +97,8 @@ int showHelp(const char *argv0, const QString &error)
+     fprintf(stderr, "Usage: %s  [options] <inputs>\n\n"
+             "Options:\n"
+             "    -o file           Write output to file rather than stdout\n"
+-            "    -py2              Generate code for any Python v2.x version (default)\n"
+-            "    -py3              Generate code for any Python v3.x version\n"
++            "    -py2              Generate code for any Python v2.x version\n"
++            "    -py3              Generate code for any Python v3.x version (default)\n"
+             "    -name name        Create an external initialization function with name\n"
+             "    -threshold level  Threshold to consider compressing files\n"
+             "    -compress level   Compress input files by level\n"
+diff --git a/pyrcc/pyside-rcc.1 b/pyrcc/pyside-rcc.1
+index da65823..7f630ee 100644
+--- a/pyrcc/pyside-rcc.1
++++ b/pyrcc/pyside-rcc.1
+@@ -11,10 +11,10 @@ pyside\-rcc  [options] <inputs>
+ Write output to file rather than stdout
+ .TP
+ \fB\-py2\fR
+-Generate code for any Python v2.x version (default)
++Generate code for any Python v2.x version
+ .TP
+ \fB\-py3\fR
+-Generate code for any Python v3.x version
++Generate code for any Python v3.x version (default)
+ .TP
+ \fB\-name\fR name
+ Create an external initialization function with name

File python-pyside-tools/2to3.patch

-diff --git a/pysideuic/Compiler/proxy_type.py b/pysideuic/Compiler/proxy_type.py
-index c80843a..0708ecc 100644
---- a/pysideuic/Compiler/proxy_type.py
-+++ b/pysideuic/Compiler/proxy_type.py
-@@ -26,7 +26,7 @@ from pysideuic.Compiler.misc import Literal, moduleMember
- class ProxyType(type):
-     def __init__(*args):
-         type.__init__(*args)
--        for cls in args[0].__dict__.values():
-+        for cls in list(args[0].__dict__.values()):
-             if type(cls) is ProxyType:
-                 cls.module = args[0].__name__
- 
-diff --git a/pysideuic/Compiler/qobjectcreator.py b/pysideuic/Compiler/qobjectcreator.py
-index d46acc0..491a8e0 100644
---- a/pysideuic/Compiler/qobjectcreator.py
-+++ b/pysideuic/Compiler/qobjectcreator.py
-@@ -116,7 +116,7 @@ class _CustomWidgetLoader(object):
-             _, module = self._widgets[widget]
-             imports.setdefault(module, []).append(widget)
- 
--        for module, classes in imports.items():
-+        for module, classes in list(imports.items()):
-             write_code("from %s import %s" % (module, ", ".join(classes)))
- 
- 
-diff --git a/pysideuic/icon_cache.py b/pysideuic/icon_cache.py
-index 523d207..d8c699c 100644
---- a/pysideuic/icon_cache.py
-+++ b/pysideuic/icon_cache.py
-@@ -113,7 +113,7 @@ class _IconSet(object):
-         if self._use_fallback:
-             icon.addFile(self._fallback)
-         else:
--            for role, pixmap in self._roles.items():
-+            for role, pixmap in list(self._roles.items()):
-                 if role.endswith("off"):
-                     mode = role[:-3]
-                     state = qtgui_module.QIcon.Off
-diff --git a/pysideuic/port_v2/as_string.py b/pysideuic/port_v2/as_string.py
-index 23272b2..cb7780c 100644
---- a/pysideuic/port_v2/as_string.py
-+++ b/pysideuic/port_v2/as_string.py
-@@ -23,7 +23,7 @@ import re
- 
- 
- def as_string(obj, encode=True):
--    if isinstance(obj, basestring):
-+    if isinstance(obj, str):
-         s = '"' + _escape(obj.encode('UTF-8')) + '"'
-         return s
- 
-diff --git a/pysideuic/port_v2/invoke.py b/pysideuic/port_v2/invoke.py
-index 7652904..5128092 100644
---- a/pysideuic/port_v2/invoke.py
-+++ b/pysideuic/port_v2/invoke.py
-@@ -33,16 +33,16 @@ def invoke(driver):
-     try:
-         exit_status = driver.invoke()
- 
--    except IOError, e:
-+    except IOError as e:
-         driver.on_IOError(e)
- 
--    except SyntaxError, e:
-+    except SyntaxError as e:
-         driver.on_SyntaxError(e)
- 
--    except NoSuchWidgetError, e:
-+    except NoSuchWidgetError as e:
-         driver.on_NoSuchWidgetError(e)
- 
--    except Exception, e:
-+    except Exception as e:
-         driver.on_Exception(e)
- 
-     return exit_status
-diff --git a/pysideuic/port_v2/load_plugin.py b/pysideuic/port_v2/load_plugin.py
-index 5212d6f..b85ec76 100644
---- a/pysideuic/port_v2/load_plugin.py
-+++ b/pysideuic/port_v2/load_plugin.py
-@@ -33,7 +33,7 @@ def load_plugin(plugin, plugin_globals, plugin_locals):
-         exec(plugin.read(), plugin_globals, plugin_locals)
-     except ImportError:
-         return False
--    except Exception, e:
-+    except Exception as e:
-         raise WidgetPluginError("%s: %s" % (e.__class__, str(e)))
- 
-     return True
-diff --git a/pysideuic/port_v2/proxy_base.py b/pysideuic/port_v2/proxy_base.py
-index 732b2e2..23f4dba 100644
---- a/pysideuic/port_v2/proxy_base.py
-+++ b/pysideuic/port_v2/proxy_base.py
-@@ -23,5 +23,5 @@
- from pysideuic.Compiler.proxy_type import ProxyType
- 
- 
--class ProxyBase(object):
--    __metaclass__ = ProxyType
-+class ProxyBase(object, metaclass=ProxyType):
-+    pass
-diff --git a/pysideuic/port_v2/string_io.py b/pysideuic/port_v2/string_io.py
-index 4657b52..adb9f12 100644
---- a/pysideuic/port_v2/string_io.py
-+++ b/pysideuic/port_v2/string_io.py
-@@ -22,6 +22,6 @@
- 
- # Import the StringIO object.
- try:
--    from cStringIO import StringIO
-+    from io import StringIO
- except ImportError:
--    from StringIO import StringIO
-+    from io import StringIO
-diff --git a/pysideuic/uiparser.py b/pysideuic/uiparser.py
-index c49bfe1..4c7cbe1 100644
---- a/pysideuic/uiparser.py
-+++ b/pysideuic/uiparser.py
-@@ -41,7 +41,7 @@ DEBUG = logger.debug
- 
- if sys.version_info < (2,4,0):
-     def reversed(seq):
--        for i in xrange(len(seq)-1, -1, -1):
-+        for i in range(len(seq)-1, -1, -1):
-             yield seq[i]
- 
- QtCore = None

File python-pyside-tools/PKGBUILD

-# Maintainer: arlx_ignacy <ziphims@gmail.com>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-
-# modify this whatever Python 3 interpreter you're targetting; on my
-# system I use the vanilla python3
-_pyexec=/usr/bin/python3
-
-pkgname=python-pyside-tools
-pkgver=0.2.13
-pkgrel=2
-pkgdesc='PySide development tools (pyuic and pyrcc). (Python 3 build)'
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://www.pyside.org"
-depends=('python-pyside>=1.1.0' 'python')
-makedepends=('cmake' 'automoc4' 'python-shiboken>=1.1.0' 'patch' 'sed')
-replaces=('pyside-tools-py3')
-source=("http://www.pyside.org/files/pyside-tools-$pkgver.tar.bz2"
-        '2to3.patch'
-        'py3uic.patch'
-        'py3build.patch')
-md5sums=('14d3a36df06d680357d7bc1960f19a6d'
-         '88ca14b1e58ca167564afd215930a84b'
-         '9e4d6f040e442713f5e74fc8aae6d8e6'
-         'a4e9a5759d5c6585507d0ee28ca18f2d')
-
-
-build() {
-    cd "$srcdir/pyside-tools-$pkgver"
-
-    msg "Applying patches ..."
-    # this patch from running 2to3-3.2
-    patch -p1 < ../2to3.patch
-    # this patch to make pyside-uic valid for Python 3
-    patch -p1 < ../py3uic.patch
-    # this patch is to differentiate our build as Python 3
-    patch -p1 < ../py3build.patch
-
-    # of course, if you want to undo the patches you can use:
-    #  $ patch -p1 -R < ../py3build.patch
-    #  $ patch -p1 -R < ../py3uic.patch
-    #  $ patch -p1 -R < ../2to3.patch
-
-    cd ..
-    if [ -d build ] ; then
-        msg "Removing last build ..."
-        rm -rf build
-    fi
-
-    mkdir build
-    cd build
-
-    cmake ../pyside-tools-$pkgver -DCMAKE_INSTALL_PREFIX=/usr  \
-                                  -DCMAKE_BUILD_TYPE=Release   \
-                                  -DPYTHON_EXECUTABLE=$_pyexec
-    make
-
-    # change interpreter to what we set it to
-    sed -i -e "1c #!$_pyexec" ../pyside-tools-$pkgver/pyside-uic
-}
-
-
-package() {
-    cd "$srcdir/build"
-    make DESTDIR=$pkgdir install
-}

File python-pyside-tools/py3build.patch

-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc8536..56982ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,13 @@ set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VER
- configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY)
- 
- option(BUILD_TESTS "Build tests." TRUE)
-+set(tools_SUFFIX "-python3")
- 
- # UIC stuff
- if (NOT SITE_PACKAGE)
-     execute_process(
-         COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
--            print sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}')"
-+            print(sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
-         OUTPUT_VARIABLE SITE_PACKAGE
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-     if (NOT SITE_PACKAGE)
-@@ -32,7 +33,8 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside-uic
-         PERMISSIONS
-         OWNER_EXECUTE OWNER_WRITE OWNER_READ
-         GROUP_EXECUTE GROUP_READ
--        WORLD_EXECUTE WORLD_READ)
-+        WORLD_EXECUTE WORLD_READ
-+        RENAME pyside-uic${tools_SUFFIX})
- 
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
-         DESTINATION "${SITE_PACKAGE}/pysideuic")
-@@ -45,7 +47,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
- # Man pages for pyside-uic
- if (NOT win32)
-     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/pysideuic/*.1")
--    install(FILES ${manpages} DESTINATION share/man/man1)
-+
-+    # install man files with suffix
-+    foreach(manfile ${manpages})
-+        get_filename_component(fname ${manfile} NAME_WE)
-+        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
-+    endforeach(manfile)
- endif()
- 
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
-diff --git a/pylupdate/CMakeLists.txt b/pylupdate/CMakeLists.txt
-index bc1bd88..cf7ecbd 100644
---- a/pylupdate/CMakeLists.txt
-+++ b/pylupdate/CMakeLists.txt
-@@ -15,6 +15,7 @@ set(lupdate_MOC_HEADERS translator.h)
- qt4_wrap_cpp(lupdate_MOC_OUTFILES ${lupdate_MOC_HEADERS})
- 
- add_executable(pyside-lupdate ${lupdate_SRC} ${lupdate_MOC_OUTFILES})
-+set_target_properties(pyside-lupdate PROPERTIES OUTPUT_NAME pyside-lupdate${tools_SUFFIX})
- include_directories(pyside-lupdate
-                     ${CMAKE_CURRENT_SOURCE_DIR}
-                     ${QT_INCLUDE_DIR}
-@@ -33,6 +34,11 @@ install(TARGETS pyside-lupdate RUNTIME DESTINATION bin)
- # Man pages
- if (NOT win32)
-     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
--    install(FILES ${manpages} DESTINATION share/man/man1)
-+
-+    # install man files with suffix
-+    foreach(manfile ${manpages})
-+        get_filename_component(fname ${manfile} NAME_WE)
-+        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
-+    endforeach(manfile)
- endif()
- 
-diff --git a/pyrcc/CMakeLists.txt b/pyrcc/CMakeLists.txt
-index c804bd5..cb69b23 100644
---- a/pyrcc/CMakeLists.txt
-+++ b/pyrcc/CMakeLists.txt
-@@ -1,5 +1,6 @@
- 
- add_executable(pyside-rcc main.cpp rcc.cpp)
-+set_target_properties(pyside-rcc PROPERTIES OUTPUT_NAME pyside-rcc${tools_SUFFIX})
- include_directories(pyside-rcc
-                     ${QT_INCLUDE_DIR}
-                     ${QT_QT_INCLUDE_DIR}
-@@ -15,6 +16,11 @@ install(TARGETS pyside-rcc RUNTIME DESTINATION bin)
- # Man pages
- if (NOT win32)
-     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
--    install(FILES ${manpages} DESTINATION share/man/man1)
-+
-+    # install man files with suffix
-+    foreach(manfile ${manpages})
-+        get_filename_component(fname ${manfile} NAME_WE)
-+        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
-+    endforeach(manfile)
- endif()
- 
-diff --git a/pyrcc/main.cpp b/pyrcc/main.cpp
-index d9cecca..11aadeb 100644
---- a/pyrcc/main.cpp
-+++ b/pyrcc/main.cpp
-@@ -37,7 +37,7 @@
- // Some static globals
- static QString initName;
- static bool verbose = false;
--static int py_version = 2;
-+static int py_version = 3; // arsooy_: by default this binary will create output for Python 3
- static int compressLevel = CONSTANT_COMPRESSLEVEL_DEFAULT;
- static int compressThreshold = CONSTANT_COMPRESSTHRESHOLD_DEFAULT;
- static QString resourceRoot;
-@@ -97,8 +97,8 @@ int showHelp(const char *argv0, const QString &error)
-     fprintf(stderr, "Usage: %s  [options] <inputs>\n\n"
-             "Options:\n"
-             "    -o file           Write output to file rather than stdout\n"
--            "    -py2              Generate code for any Python v2.x version (default)\n"
--            "    -py3              Generate code for any Python v3.x version\n"
-+            "    -py2              Generate code for any Python v2.x version\n"
-+            "    -py3              Generate code for any Python v3.x version (default)\n"
-             "    -name name        Create an external initialization function with name\n"
-             "    -threshold level  Threshold to consider compressing files\n"
-             "    -compress level   Compress input files by level\n"

File python-pyside-tools/py3uic.patch

-diff --git a/pysideuic/objcreator.py b/pysideuic/objcreator.py
-index 80c0a89..542974b 100644
---- a/pysideuic/objcreator.py
-+++ b/pysideuic/objcreator.py
-@@ -24,7 +24,7 @@ import sys
- import os.path
- 
- from pysideuic.exceptions import NoSuchWidgetError, WidgetPluginError
--from port_v2.load_plugin import load_plugin
-+from pysideuic.port_v2.load_plugin import load_plugin
- 
- 
- # The list of directories that are searched for widget plugins.  This is
-diff --git a/pysideuic/port_v2/as_string.py b/pysideuic/port_v2/as_string.py
-index cb7780c..ddb65fd 100644
---- a/pysideuic/port_v2/as_string.py
-+++ b/pysideuic/port_v2/as_string.py
-@@ -24,7 +24,7 @@ import re
- 
- def as_string(obj, encode=True):
-     if isinstance(obj, str):
--        s = '"' + _escape(obj.encode('UTF-8')) + '"'
-+        s = '"' + _escape(obj) + '"'
-         return s
- 
-     return str(obj)
-diff --git a/pysideuic/port_v2/ascii_upper.py b/pysideuic/port_v2/ascii_upper.py
-index 05843bf..dbb0c51 100644
---- a/pysideuic/port_v2/ascii_upper.py
-+++ b/pysideuic/port_v2/ascii_upper.py
-@@ -23,7 +23,7 @@ import string
- 
- 
- # A translation table for converting ASCII lower case to upper case.
--_ascii_trans_table = string.maketrans(string.ascii_lowercase,
-+_ascii_trans_table = str.maketrans(string.ascii_lowercase,
-         string.ascii_uppercase)
- 
- 
-diff --git a/pysideuic/uiparser.py b/pysideuic/uiparser.py
-index 4c7cbe1..82823fb 100644
---- a/pysideuic/uiparser.py
-+++ b/pysideuic/uiparser.py
-@@ -31,9 +31,9 @@ except ImportError:
-     from xml.etree.ElementTree import parse, SubElement
- 
- 
--from exceptions import NoSuchWidgetError
--from objcreator import QObjectCreator
--from properties import Properties
-+from pysideuic.exceptions import NoSuchWidgetError
-+from pysideuic.objcreator import QObjectCreator
-+from pysideuic.properties import Properties
- 
- 
- logger = logging.getLogger(__name__)
-diff --git a/tests/rcc/run_test.sh b/tests/rcc/run_test.sh
-index f3b7882..6f592dd 100755
---- a/tests/rcc/run_test.sh
-+++ b/tests/rcc/run_test.sh
-@@ -8,6 +8,6 @@
- # $3: qrc file
- 
- export PYTHONPATH=$PYTHONPATH:`pwd`
--$1 -o `basename $3 .qrc`_rc.py $3
-+$1 -py3 -o `basename $3 .qrc`_rc.py $3
- `pkg-config shiboken --variable=python_interpreter` $2
- 

File python2-pyside-tools/PKGBUILD

-# Maintainer: arlx_ignacy <ziphims@gmail.com>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-
-# modify this to whatever Python 2 interpreter you're targetting; on my
-# system I use the vanilla python2
-_pyexec=/usr/bin/python2
-
-pkgname=python2-pyside-tools
-pkgver=0.2.13
-pkgrel=1
-pkgdesc='PySide development tools (pyuic and pyrcc).'
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://www.pyside.org"
-depends=('python2-pyside>=1.1.0' 'python2')
-makedepends=('cmake' 'automoc4' 'python2-shiboken>=1.1.0' 'patch' 'sed')
-replaces=('pyside-tools')
-source=("http://www.pyside.org/files/pyside-tools-$pkgver.tar.bz2")
-md5sums=('14d3a36df06d680357d7bc1960f19a6d')
-
-
-build() {
-    cd "$srcdir/pyside-tools-$pkgver"
-
-    cd ..
-    if [ -d build ] ; then
-        msg "Removing last build ..."
-        rm -rf build
-    fi
-
-    mkdir build
-    cd build
-
-    cmake ../pyside-tools-$pkgver -DCMAKE_INSTALL_PREFIX=/usr  \
-                                  -DCMAKE_BUILD_TYPE=Release   \
-                                  -DPYTHON_EXECUTABLE=$_pyexec
-    make
-
-    # change interpreter to what we set it to
-    sed -i -e "1c #!$_pyexec" ../pyside-tools-$pkgver/pyside-uic
-}
-
-
-package() {
-    cd "$srcdir/build"
-    make DESTDIR=$pkgdir install
-}