From 9b6e379a03ab7c1e3fd20edb6da18cfb001584c7 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:29:34 +0300 Subject: [PATCH 01/36] qt5-wayland moved into contrib repo --- desktop/toolkit/qt5/qt5-wayland/actions.py | 26 ------ desktop/toolkit/qt5/qt5-wayland/pspec.xml | 85 ------------------- .../toolkit/qt5/qt5-wayland/translations.xml | 13 --- 3 files changed, 124 deletions(-) delete mode 100644 desktop/toolkit/qt5/qt5-wayland/actions.py delete mode 100644 desktop/toolkit/qt5/qt5-wayland/pspec.xml delete mode 100644 desktop/toolkit/qt5/qt5-wayland/translations.xml diff --git a/desktop/toolkit/qt5/qt5-wayland/actions.py b/desktop/toolkit/qt5/qt5-wayland/actions.py deleted file mode 100644 index 993576f48f..0000000000 --- a/desktop/toolkit/qt5/qt5-wayland/actions.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 qt5 -from pisi.actionsapi import get - -def setup(): - qt5.configure() - -def build(): - qt5.make() - -def install(): - qt5.install("INSTALL_ROOT=%s" % get.installDIR()) - - #I hope qtchooser will manage this issue - for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): - pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin) - - pisitools.insinto("/usr/share/licenses/qt5-wayland/", "LGPL_EXCEPTION.txt") diff --git a/desktop/toolkit/qt5/qt5-wayland/pspec.xml b/desktop/toolkit/qt5/qt5-wayland/pspec.xml deleted file mode 100644 index d884626845..0000000000 --- a/desktop/toolkit/qt5/qt5-wayland/pspec.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - qt5-wayland - http://qt.digia.com/ - - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - Provides APIs for Wayland - Provides APIs for Wayland - LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz - - qt5-base-devel - qt5-declarative-devel - libxkbcommon-devel - xorg-server-xwayland - glib2-devel - libX11-devel - libgcc - mesa-devel - fontconfig-devel - freetype-devel - libXrender-devel - libudev-devel - libXcomposite-devel - libxkbcommon-devel - wayland-client - wayland-cursor - - - - - qt5-wayland - - mesa - qt5-base - fontconfig - libXrender - libxkbcommon - libXcomposite - libXcomposite - wayland-client - wayland-cursor - - - /usr/lib - /usr/lib/qt5 - /usr/share/licenses - /usr/lib/qt5/bin - /usr/bin - - - - - qt5-wayland-devel - - qt5-base-devel - - - /usr/lib/pkgconfig - /usr/include/qt5 - - - - - - - 2015-06-03 - 5.4.2 - Version bump - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - 2015-05-09 - 5.4.1 - First release - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - diff --git a/desktop/toolkit/qt5/qt5-wayland/translations.xml b/desktop/toolkit/qt5/qt5-wayland/translations.xml deleted file mode 100644 index 657aeb9046..0000000000 --- a/desktop/toolkit/qt5/qt5-wayland/translations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - qt5-wayland - Wayland için API'ler sağlar - Wayland için API'ler sağlar - - - - qt5-wayland-devel - qt5-wayland için geliştirme dosyaları - - From cf1ad259887735f277f6362e009d5bc80efb35a4 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:30:05 +0300 Subject: [PATCH 02/36] qt5-webengine moved into contrib repo --- desktop/toolkit/qt5/qt5-webengine/actions.py | 30 ---- desktop/toolkit/qt5/qt5-webengine/pspec.xml | 135 ------------------ .../qt5/qt5-webengine/translations.xml | 8 -- 3 files changed, 173 deletions(-) delete mode 100644 desktop/toolkit/qt5/qt5-webengine/actions.py delete mode 100644 desktop/toolkit/qt5/qt5-webengine/pspec.xml delete mode 100644 desktop/toolkit/qt5/qt5-webengine/translations.xml diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py deleted file mode 100644 index 6fa6e87ee9..0000000000 --- a/desktop/toolkit/qt5/qt5-webengine/actions.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/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 qt5 -from pisi.actionsapi import get - -def setup(): - shelltools.export("QT5LINK", "/usr/lib/qt5/bin") - shelltools.export("QT5DIR", "/usr/lib/qt5") - shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.8.8.3" % get.CFLAGS()) - qt5.configure() - - -def build(): - qt5.make() - -def install(): - qt5.install("INSTALL_ROOT=%s" % get.installDIR()) - - #I hope qtchooser will manage this issue - for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): - pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin) - - pisitools.dodoc("LICENSE.LGPLv3") diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml deleted file mode 100644 index ba98ed7e07..0000000000 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - qt5-webengine - http://qt.digia.com/ - - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - Provides support for web applications using the Chromium browser project - Provides support for web applications using the Chromium browser project - LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz - - qt5-base-devel - qt5-declarative-devel - nss-devel - dbus-devel - nspr-devel - expat-devel - glib2-devel - libX11-devel - libcap-devel - libgcc - freetype-devel - libXtst-devel - libXcursor-devel - libXrandr-devel - alsa-lib-devel - libXcomposite-devel - sqlite-devel - at-spi2-core-devel - ruby - gperf - bluez-libs-devel - cups-devel - desktop-file-utils - fontconfig-devel - gst-plugins-base-devel - gstreamer-devel - gtk2-devel - harfbuzz-devel - icon-theme-hicolor - firebird-superserver - libjpeg-turbo-devel - mariadb-lib - libmng-devel - pulseaudio-libs-devel - libxcb-devel - libxkbcommon-devel - libxslt-devel - mesa-devel - libmtdev-devel - openal-devel - postgresql-server - pciutils-devel - python-devel - unixODBC-devel - xcb-proto - xcb-util-devel - xcb-util-image-devel - xcb-util-keysyms-devel - xcb-util-wm-devel - - - - - qt5-webengine - - /usr/lib - /usr/lib/qt5 - /usr/share/qt5/translations - /usr/share/qt5 - /usr/share/doc - /usr/lib/qt5/bin/ - /usr/bin - - - nss - dbus - nspr - expat - glib2 - libX11 - libcap - libgcc - freetype - mesa - libXi - libXext - libXtst - qt5-base - alsa-lib - harfbuzz - libXfixes - libXrandr - fontconfig - libXcursor - libXdamage - libXrender - libXcomposite - qt5-declarative - - - - - qt5-webengine-devel - - /usr/lib/pkgconfig - /usr/include/qt5 - - - qt5-base-devel - qt5-declarative-devel - - - - - - 2015-06-03 - 5.4.2 - Version bump - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - 2015-05-28 - 5.4.1 - First release - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - diff --git a/desktop/toolkit/qt5/qt5-webengine/translations.xml b/desktop/toolkit/qt5/qt5-webengine/translations.xml deleted file mode 100644 index 680b4ac782..0000000000 --- a/desktop/toolkit/qt5/qt5-webengine/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - qt5-webengine - Chromium tarayıcı projelerini kullanan web uygulamaları için destek sağlar - Chromium tarayıcı projelerini kullanan web uygulamaları için destek sağlar - - From a96569c420ed609d8b080a5a54f9707dc75e5b69 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:30:57 +0300 Subject: [PATCH 03/36] ninja moved into contrib repo --- programming/build/ninja/actions.py | 30 ---------------- programming/build/ninja/files/LFS.patch | 13 ------- programming/build/ninja/pspec.xml | 45 ------------------------ programming/build/ninja/translations.xml | 8 ----- 4 files changed, 96 deletions(-) delete mode 100755 programming/build/ninja/actions.py delete mode 100755 programming/build/ninja/files/LFS.patch delete mode 100755 programming/build/ninja/pspec.xml delete mode 100755 programming/build/ninja/translations.xml diff --git a/programming/build/ninja/actions.py b/programming/build/ninja/actions.py deleted file mode 100755 index 646f61dc3f..0000000000 --- a/programming/build/ninja/actions.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/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 pythonmodules -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get - - -def build(): - shelltools.system("python bootstrap.py") - shelltools.system("asciidoc doc/manual.asciidoc") - -def check(): - #needs new package gtest -> ignore it for now - shelltools.system("python ./configure.py --with-gtest=/usr/share/gtest") - shelltools.system("./ninja ninja_test") - shelltools.system("./ninja_test --gtest_filter=-SubprocessTest.SetWithLots") - -def install(): - pisitools.dobin("ninja", "/usr/bin") - - pisitools.insinto("/usr/share/bash-completion/completions", "misc/bash-completion", "ninja") - - pisitools.dodoc("HACKING.md", "COPYING", "RELEASING", "README", "doc/manual.asciidoc") - - pisitools.dohtml("doc/manual.html") \ No newline at end of file diff --git a/programming/build/ninja/files/LFS.patch b/programming/build/ninja/files/LFS.patch deleted file mode 100755 index c8a5025b7a..0000000000 --- a/programming/build/ninja/files/LFS.patch +++ /dev/null @@ -1,13 +0,0 @@ -Largefile patch -https://github.com/martine/ninja/issues/829 - ---- ninja-1.5.1/configure.py~ 2014-10-26 22:45:18.000000000 +0200 -+++ ninja-1.5.1/configure.py 2014-10-26 22:45:26.284641172 +0200 -@@ -142,6 +142,7 @@ - '-fno-exceptions', - '-fvisibility=hidden', '-pipe', - '-Wno-missing-field-initializers', -+ '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', - '-DNINJA_PYTHON="%s"' % options.with_python] - if options.debug: - cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC'] diff --git a/programming/build/ninja/pspec.xml b/programming/build/ninja/pspec.xml deleted file mode 100755 index ee577a9c0c..0000000000 --- a/programming/build/ninja/pspec.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - ninja - http://martine.github.com/ninja/ - - Stefan Gronewold(groni) - groni@pisilinux.org - - LGPLv2 - app:console - Ninja is a small build system with a focus on speed. - Ninja is a small build system with a focus on speed. - https://github.com/martine/ninja/archive/v1.6.0.tar.gz - - asciidoc - - - LFS.patch - - - - - ninja - - libgcc - - - /usr/bin - /usr/share - /usr/share/doc - - - - - - 2015-08-25 - 1.6.0 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - diff --git a/programming/build/ninja/translations.xml b/programming/build/ninja/translations.xml deleted file mode 100755 index 22df483738..0000000000 --- a/programming/build/ninja/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - ninja - Ninja, hız odaklı bir inşa sistemidir. - Ninja is a small build system with a focus on speed. - - From bca7ed74e7c91d7f7c90ee8c161283f8ce20b9e0 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:31:54 +0300 Subject: [PATCH 04/36] python-qt5:moved into main --- .../language/python/python-qt5/actions.py | 57 ++++++++ .../language/python/python-qt5/pspec.xml | 126 ++++++++++++++++++ .../python/python-qt5/translations.xml | 30 +++++ 3 files changed, 213 insertions(+) create mode 100644 programming/language/python/python-qt5/actions.py create mode 100644 programming/language/python/python-qt5/pspec.xml create mode 100644 programming/language/python/python-qt5/translations.xml diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py new file mode 100644 index 0000000000..7fafa794ed --- /dev/null +++ b/programming/language/python/python-qt5/actions.py @@ -0,0 +1,57 @@ +#!/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 pythonmodules +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +WorkDir="PyQt-gpl-%s" % get.srcVERSION() + +def setup(): + + shelltools.copytree("%s/PyQt-gpl-5.4.2" % get.workDIR(), "%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + pythonmodules.run("configure.py --confirm-license \ + --assume-shared \ + --no-timestamp \ + --qsci-api \ + --sip /usr/bin/sip3 \ + --qmake='/usr/lib/qt5/bin/qmake' \ + --destdir='/usr/lib/python3.4/site-packages/' \ + --sip-incdir='/usr/include/python3.4' \ + CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") + + shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + shelltools.system("python configure.py --confirm-license \ + --assume-shared \ + --no-timestamp \ + --qsci-api \ + --destdir='/usr/lib/python2.7/site-packages/' \ + --sip-incdir='/usr/include/python2.7' \ + --sip /usr/bin/sip \ + --qmake='/usr/lib/qt5/bin/qmake'") + shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'") + +def build(): + + autotools.make() + shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + autotools.make() + +def install(): + + autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) + autotools.rawInstall("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) + autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) + pisitools.rename("/usr/bin/pyuic5", "py3uic5") + + shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) + pisitools.rename("/usr/bin/pyuic5", "pyuic5") + + pisitools.dohtml("doc/html/*") + pisitools.dodoc("NEWS", "README","LICENSE*") diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml new file mode 100644 index 0000000000..c8816e6ba6 --- /dev/null +++ b/programming/language/python/python-qt5/pspec.xml @@ -0,0 +1,126 @@ + + + + + python-qt5 + http://www.riverbankcomputing.co.uk/software/pyqt + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + GPLv3 + library + A set of Python bindings for the Qt 5.x Toolkit + 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. + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz + + dbus-devel + libgcc + qt5-base-devel + qt5-declarative-devel + qt5-multimedia-devel + qt5-serialport-devel + qt5-svg-devel + qt5-webkit-devel + qt5-xmlpatterns-devel + qt5-enginio-devel + qt5-sensors-devel + qt5-location-devel + qt5-websockets-devel + qt5-webchannel-devel + qt5-x11extras-devel + qt5-connectivity-devel + python3-devel + python3-sip3 + sip3-devel + + + + + python-qt5-common + Common files shared between python-qt5 and python3-qt5 + + sip3 + python + + + /usr/bin/pylupdate5 + /usr/bin/pyrcc5 + /usr/share/qt5/qsci/api + /usr/share/sip/PyQt5 + + + + + python-qt5 + A set of Python 2.x bindings for the Qt 5.x Toolkit + + python-qt5-common + qt5-base + libgcc + qt5-svg + qt5-webkit + qt5-sensors + qt5-x11extras + qt5-serialport + qt5-declarative + qt5-xmlpatterns + + + /usr/bin/pyuic5 + /usr/lib/python2.7/site-packages + + + + + python3-qt5 + A set of Python 3.x bindings for the Qt 5.x Toolkit + + libgcc + python-qt5-common + python + qt5-base + qt5-declarative + qt5-serialport + qt5-svg + qt5-webkit + qt5-xmlpatterns + qt5-sensors + qt5-x11extras + + + /usr/bin/py3uic5 + /usr/lib/python3.4/site-packages + /usr/lib/qt5/plugins + + + + + python-qt5-docs + Documentation for python-qt5 bindings + + python-qt5 + + + /usr/share/doc/python-qt5 + + + + + + 2015-06-14 + 5.4.2 + First release + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2015-04-09 + 5.4.1 + First release + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + diff --git a/programming/language/python/python-qt5/translations.xml b/programming/language/python/python-qt5/translations.xml new file mode 100644 index 0000000000..a93a53a4ec --- /dev/null +++ b/programming/language/python/python-qt5/translations.xml @@ -0,0 +1,30 @@ + + + + python-qt5 + Qt5 4.x araçları için python bağlayıcıları + Qt5, C++ kütüphaneleri dizisi ve geliştirme araçları olup grafik kullanıcı arabirimleri için, ağ bağlantısı, iş parçacığı, Unicode, düzenli ifadeler, SQL veritabanları, SVG, OpenGL, XML ve kullanıcıve uygulama ayarları gibi platform bağımsız uygulamalara ayrılır. PyQt, Python modülü seti olarak bu sınıftan 440 kadar uygulamayı çalıştırır. + Qt5 est un ensemble de librairies C++ et d'outils de développement. On y trouve des abstractions indépendante de la plateforme utilisée pour les interfaces graphiques, le réseau, les threads, Unicode, les expressions régulières, les bases de données SQL, SVG, OpenGL, XML, la gestion des paramètres utilisateurs. PyQT implémente 440 de ces classes en tant que modules Python. + Qt5 es un conjunto de librerías C++ y herramientas de desarrollo que incluye abstracción independiente de la plataforma, para interfaces de usuarios gráficos, redes, hilos, Unicode, expresiones regulares, bases de datos SQL, SVG, OpenGL, XML, y configuraciones de usuario y de aplicaciones. PyQt implementa 440 de estas clases como conjunto de módulos Python. + + + + python-qt5-webkit + Webkit kitaplığı için Python bağlayıcıları + + + + python-qt5-phonon + Phonon çokluortam kitaplığı için Python bağlayıcıları + + + + python-qt5-docs + python-qt5 bağlayıcıları için belgelendirme + + + + python-qt5-devel + python-qt5 için geliştirme dosyaları + + From cd4bebd7a6da5c3dfe56ebfe3d8793ad4eda9c77 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:32:15 +0300 Subject: [PATCH 05/36] sip:moved into main --- programming/language/python/sip/actions.py | 29 +++++ .../python/sip/files/disable-rpaths.diff | 10 ++ .../python/sip/files/fix-linking.diff | 11 ++ .../language/python/sip/files/no-strip.patch | 26 +++++ programming/language/python/sip/pspec.xml | 102 ++++++++++++++++++ .../language/python/sip/translations.xml | 28 +++++ 6 files changed, 206 insertions(+) create mode 100644 programming/language/python/sip/actions.py create mode 100644 programming/language/python/sip/files/disable-rpaths.diff create mode 100644 programming/language/python/sip/files/fix-linking.diff create mode 100644 programming/language/python/sip/files/no-strip.patch create mode 100644 programming/language/python/sip/pspec.xml create mode 100644 programming/language/python/sip/translations.xml diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py new file mode 100644 index 0000000000..efb21b6cc4 --- /dev/null +++ b/programming/language/python/sip/actions.py @@ -0,0 +1,29 @@ +#!/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 pythonmodules +from pisi.actionsapi import get + +WorkDir = "%s-%s" % (get.srcNAME(), get.srcVERSION()) +py2dir = get.curPYTHON() + +def setup(): + pythonmodules.run('configure.py \ + -b /usr/bin \ + -d /usr/lib/%s/site-packages \ + -e /usr/include/%s \ + CFLAGS+="%s" CXXFLAGS+="%s"' % (py2dir, py2dir, get.CFLAGS(), get.CXXFLAGS())) + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + #pisitools.remove("/usr/bin/sip") + pisitools.dodoc("LICENSE*", "NEWS", "README") diff --git a/programming/language/python/sip/files/disable-rpaths.diff b/programming/language/python/sip/files/disable-rpaths.diff new file mode 100644 index 0000000000..7aab12987a --- /dev/null +++ b/programming/language/python/sip/files/disable-rpaths.diff @@ -0,0 +1,10 @@ +--- siputils.py ++++ siputils.py +@@ -737,6 +737,7 @@ class Makefile: + rpaths is the cannonical list of rpaths. + """ + flags = [] ++ return flags + prefix = self.optional_string("RPATH") + + if prefix: diff --git a/programming/language/python/sip/files/fix-linking.diff b/programming/language/python/sip/files/fix-linking.diff new file mode 100644 index 0000000000..e97281a507 --- /dev/null +++ b/programming/language/python/sip/files/fix-linking.diff @@ -0,0 +1,11 @@ +--- specs/linux-g++ 2009/08/31 11:59:37 1.1 ++++ specs/linux-g++ 2009/08/31 12:00:19 +@@ -53,7 +53,7 @@ + QMAKE_LFLAGS = + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +-QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = diff --git a/programming/language/python/sip/files/no-strip.patch b/programming/language/python/sip/files/no-strip.patch new file mode 100644 index 0000000000..033b54f968 --- /dev/null +++ b/programming/language/python/sip/files/no-strip.patch @@ -0,0 +1,26 @@ +Index: sip-4.8.2/specs/linux-g++ +=================================================================== +--- sip-4.8.2.orig/specs/linux-g++ ++++ sip-4.8.2/specs/linux-g++ +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +Index: sip-4.8.2/specs/linux-lsb +=================================================================== +--- sip-4.8.2.orig/specs/linux-lsb ++++ sip-4.8.2/specs/linux-lsb +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml new file mode 100644 index 0000000000..66f0e62763 --- /dev/null +++ b/programming/language/python/sip/pspec.xml @@ -0,0 +1,102 @@ + + + + + sip + http://www.riverbankcomputing.co.uk/sip + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + SIP is a tool for generating bindings for C++ classes so that they can be used by Python + SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules. + + mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz + + python-devel + + + no-strip.patch + disable-rpaths.diff + fix-linking.diff + + + + + sip + + /usr/bin + /usr/share/doc + + + + + python-sip + Python 2.x SIP bindings for C and C++ libraries + + sip + + + /usr/lib/python2* + + + + + sip-devel + Development files for sip + + sip + python-sip + + + /usr/include + + + + + + 2015-04-09 + 4.16.7 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-28 + 4.14.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-14 + 4.14.2 + ReBump + PisiLinux Community + admins@pisilinux.org + + + 2013-09-09 + 4.15.1 + V.Bump + PisiLinux Community + admins@pisilinux.org + + + 2013-01-18 + 4.14.2 + Fixed + PisiLinux Community + admins@pisilinux.org + + + 2012-12-15 + 4.14.2 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/programming/language/python/sip/translations.xml b/programming/language/python/sip/translations.xml new file mode 100644 index 0000000000..76845b4b69 --- /dev/null +++ b/programming/language/python/sip/translations.xml @@ -0,0 +1,28 @@ + + + + sip + C ve C++ kütüphaneleri için python bağlayıcıları oluşturan bir araç + Generator powiązań Pythona z bibliotekami klas C++ + SIP C ve C++ kütüphanelerini Python'da kullanabilmek için bağlayıcılar oluşturan bir araçtır. Herhangi bir C veya C++ kütüphanesini Python genişletme modülüne dönüştürür. + SIP est un outil de génération de bindings (liens) pour librairies C et C++ afin de les rendre utilisables depuis Python. Il prend n'importe quelle librairie C ou C++ et la convertit en module d'extension Python. + SIP es una herramienta para generar librerías de acceso a clases C++, para poder usarlos desde Python. Puede tomar cualquier librería C o C++ y convertirlo en módulos de extensión para Python. + Generuje powiązania Pythona z bibliotekami klas C++ ze zbioru plików ze specyfikacjami klas. Obsługiwany jest Python 2 i 3. + + + + sip-devel + sip için geliştirme dosyaları + Pliki nagłówkowe sip + + + + python-sip + Moduł python2 wymagany przez wygenerowane powiązania + + + + python3-sip + Moduł python3 wymagany przez wygenerowane powiązania + + From 3d1574f7a1394682bb9170ccb1e3e4e8143755f0 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:32:28 +0300 Subject: [PATCH 06/36] sip3:moved into main --- programming/language/python/sip3/actions.py | 42 ++++++++++ .../python/sip3/files/disable-rpaths.diff | 10 +++ .../python/sip3/files/fix-linking.diff | 11 +++ .../language/python/sip3/files/no-strip.patch | 26 +++++++ .../python/sip3/files/sip-outoftree.patch | 73 ++++++++++++++++++ programming/language/python/sip3/pspec.xml | 77 +++++++++++++++++++ .../language/python/sip3/translations.xml | 28 +++++++ 7 files changed, 267 insertions(+) create mode 100644 programming/language/python/sip3/actions.py create mode 100644 programming/language/python/sip3/files/disable-rpaths.diff create mode 100644 programming/language/python/sip3/files/fix-linking.diff create mode 100644 programming/language/python/sip3/files/no-strip.patch create mode 100644 programming/language/python/sip3/files/sip-outoftree.patch create mode 100644 programming/language/python/sip3/pspec.xml create mode 100644 programming/language/python/sip3/translations.xml diff --git a/programming/language/python/sip3/actions.py b/programming/language/python/sip3/actions.py new file mode 100644 index 0000000000..7036746626 --- /dev/null +++ b/programming/language/python/sip3/actions.py @@ -0,0 +1,42 @@ +#!/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 pythonmodules +from pisi.actionsapi import get +WorkDir = "sip-%s" % get.srcVERSION() +py3dir = "python3.4" + +def setup(): + shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") + + shelltools.cd("..") + shelltools.makedirs("build_python3") + shelltools.copytree("./%s" % WorkDir, "build_python3") + shelltools.cd(WorkDir) + + shelltools.cd("../build_python3/%s" % WorkDir) + pythonmodules.run('configure.py \ + -b /usr/bin \ + -d /usr/lib/%s/site-packages/ \ + -e /usr/include/%s/ \ + CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") + +def build(): + + shelltools.cd("../build_python3/%s" % WorkDir) + autotools.make() + +def install(): + + shelltools.cd("../build_python3/%s" % WorkDir) + autotools.rawInstall("DESTDIR=%s -C sipgen" % get.installDIR()) + + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.rename("/usr/bin/sip", "sip3") + diff --git a/programming/language/python/sip3/files/disable-rpaths.diff b/programming/language/python/sip3/files/disable-rpaths.diff new file mode 100644 index 0000000000..7aab12987a --- /dev/null +++ b/programming/language/python/sip3/files/disable-rpaths.diff @@ -0,0 +1,10 @@ +--- siputils.py ++++ siputils.py +@@ -737,6 +737,7 @@ class Makefile: + rpaths is the cannonical list of rpaths. + """ + flags = [] ++ return flags + prefix = self.optional_string("RPATH") + + if prefix: diff --git a/programming/language/python/sip3/files/fix-linking.diff b/programming/language/python/sip3/files/fix-linking.diff new file mode 100644 index 0000000000..e97281a507 --- /dev/null +++ b/programming/language/python/sip3/files/fix-linking.diff @@ -0,0 +1,11 @@ +--- specs/linux-g++ 2009/08/31 11:59:37 1.1 ++++ specs/linux-g++ 2009/08/31 12:00:19 +@@ -53,7 +53,7 @@ + QMAKE_LFLAGS = + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +-QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = diff --git a/programming/language/python/sip3/files/no-strip.patch b/programming/language/python/sip3/files/no-strip.patch new file mode 100644 index 0000000000..033b54f968 --- /dev/null +++ b/programming/language/python/sip3/files/no-strip.patch @@ -0,0 +1,26 @@ +Index: sip-4.8.2/specs/linux-g++ +=================================================================== +--- sip-4.8.2.orig/specs/linux-g++ ++++ sip-4.8.2/specs/linux-g++ +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +Index: sip-4.8.2/specs/linux-lsb +=================================================================== +--- sip-4.8.2.orig/specs/linux-lsb ++++ sip-4.8.2/specs/linux-lsb +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/programming/language/python/sip3/files/sip-outoftree.patch b/programming/language/python/sip3/files/sip-outoftree.patch new file mode 100644 index 0000000000..d394a9dcf6 --- /dev/null +++ b/programming/language/python/sip3/files/sip-outoftree.patch @@ -0,0 +1,73 @@ +--- sip-4.16.3/configure.py.orig 2014-09-11 19:12:51.000000000 +0200 ++++ sip-4.16.3/configure.py 2014-10-27 17:54:50.981640566 +0100 +@@ -47,6 +47,7 @@ + sip_sip_dir = '' + sysroot = '' + src_dir = os.path.dirname(os.path.abspath(__file__)) ++build_dir = os.getcwd() + sip_module_base = None + build_platform = None + +--- sip-4.16.3/siputils.py.orig 2014-09-07 17:30:09.000000000 +0200 ++++ sip-4.16.3/siputils.py 2014-10-27 22:19:01.287642057 +0100 +@@ -202,7 +202,7 @@ + def __init__(self, configuration, console=0, qt=0, opengl=0, python=0, + threaded=0, warnings=1, debug=0, dir=None, + makefile="Makefile", installs=None, universal=None, +- arch=None, deployment_target=None): ++ arch=None, deployment_target=None, src_dir=None): + """Initialise an instance of the target. All the macros are left + unchanged allowing scripts to manipulate them at will. + +@@ -264,8 +264,11 @@ + else: + self.dir = os.path.curdir + +- # Assume we are building in the source tree. +- self._src_dir = self.dir ++ if src_dir is not None: ++ self._src_dir = src_dir ++ else: ++ # Assume we are building in the source tree. ++ self._src_dir = self.dir + + if universal is None: + self._universal = configuration.universal +@@ -381,6 +381,8 @@ + defines.extend(self.optional_list("DEFINES")) + + incdir = _UniqueList(["."]) ++ if self.dir != self._src_dir: ++ incdir.append(self._src_dir) + incdir.extend(self.extra_include_dirs) + incdir.extend(self.optional_list("INCDIR")) + +@@ -1029,7 +1031,8 @@ + else: + if os.path.isabs(filename): + # We appear to be building out of the source tree. +- self._src_dir = os.path.dirname(filename) ++ if self._src_dir == self.dir: ++ self._src_dir = os.path.dirname(filename) + bfname = filename + else: + bfname = os.path.join(self.dir, filename) +@@ -1465,7 +1471,7 @@ + console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, + dir=None, makefile="Makefile", installs=None, strip=1, + export_all=0, universal=None, arch=None, +- deployment_target=None): ++ deployment_target=None, src_dir=None): + """Initialise an instance of a module Makefile. + + build_file is the file containing the target specific information. If +@@ -1479,7 +1485,7 @@ + increases the size of the module and slows down module load times but + may avoid problems with modules that use exceptions. The default is 0. + """ +- Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target) ++ Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target, src_dir) + + self._build = self.parse_build_file(build_file) + self._install_dir = install_dir + \ No newline at end of file diff --git a/programming/language/python/sip3/pspec.xml b/programming/language/python/sip3/pspec.xml new file mode 100644 index 0000000000..35b5aa5023 --- /dev/null +++ b/programming/language/python/sip3/pspec.xml @@ -0,0 +1,77 @@ + + + + + sip3 + http://www.riverbankcomputing.co.uk/sip + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + SIP is a tool for generating bindings for C++ classes so that they can be used by Python + SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules. + mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz + + python3-devek + + + no-strip.patch + disable-rpaths.diff + fix-linking.diff + sip-outoftree.patch + + + + + sip3 + + /usr/bin + /usr/local/bin + /usr/sbin + /usr/share/doc + + + + + python3-sip3 + Python 3.x SIP bindings for C and C++ libraries + + sip3 + python3 + + + /usr/lib/python3* + + + + + sip3-devel + Development files for sip + + sip3 + python3-sip3 + + + /usr/include + + + + + + 2015-06-14 + 4.16.7 + Version Bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2015-04-23 + 4.16.6 + First release + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + diff --git a/programming/language/python/sip3/translations.xml b/programming/language/python/sip3/translations.xml new file mode 100644 index 0000000000..ce9ed07862 --- /dev/null +++ b/programming/language/python/sip3/translations.xml @@ -0,0 +1,28 @@ + + + + sip3 + C ve C++ kütüphaneleri için python bağlayıcıları oluşturan bir araç + Generator powiązań Pythona z bibliotekami klas C++ + SIP3 C ve C++ kütüphanelerini Python'da kullanabilmek için bağlayıcılar oluşturan bir araçtır. Herhangi bir C veya C++ kütüphanesini Python genişletme modülüne dönüştürür. + SIP est un outil de génération de bindings (liens) pour librairies C et C++ afin de les rendre utilisables depuis Python. Il prend n'importe quelle librairie C ou C++ et la convertit en module d'extension Python. + SIP es una herramienta para generar librerías de acceso a clases C++, para poder usarlos desde Python. Puede tomar cualquier librería C o C++ y convertirlo en módulos de extensión para Python. + Generuje powiązania Pythona z bibliotekami klas C++ ze zbioru plików ze specyfikacjami klas. Obsługiwany jest Python 2 i 3. + + + + sip-devel + sip3 için geliştirme dosyaları + Pliki nagłówkowe sip + + + + python-sip + Moduł python2 wymagany przez wygenerowane powiązania + + + + python3-sip + Moduł python3 wymagany przez wygenerowane powiązania + + From c577dc2ffb0ea5edaeb15d68edfc40117a5f5851 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 16:32:58 +0300 Subject: [PATCH 07/36] pisido:moved into main --- util/admin/pisido/actions.py | 24 ++++++++ util/admin/pisido/pspec.xml | 94 ++++++++++++++++++++++++++++++ util/admin/pisido/translations.xml | 9 +++ 3 files changed, 127 insertions(+) create mode 100644 util/admin/pisido/actions.py create mode 100644 util/admin/pisido/pspec.xml create mode 100644 util/admin/pisido/translations.xml diff --git a/util/admin/pisido/actions.py b/util/admin/pisido/actions.py new file mode 100644 index 0000000000..035d8b3a6f --- /dev/null +++ b/util/admin/pisido/actions.py @@ -0,0 +1,24 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import pisitools +from pisi.actionsapi import qt5 + +def setup(): + qt5.configure() + +def build(): + qt5.make() + +def install(): + qt5.install() + + pisitools.dodoc("LICENSE", "LISANS", "OKUBUNU", "README") + + + +# By PiSiDo 2.2.1 + +# By PiSiDo 2.3.0 diff --git a/util/admin/pisido/pspec.xml b/util/admin/pisido/pspec.xml new file mode 100644 index 0000000000..12f8fcd7c8 --- /dev/null +++ b/util/admin/pisido/pspec.xml @@ -0,0 +1,94 @@ + + + pisido + http://www.pisilinux.org + + Harun Gültekin + hrngultekin@gmail.com + + GPLv3+ + util.admin + app:gui + A pisi packager from GUI + You can make pisi packages with a GUI. Also, you can import your existing build files.Warning:Alfa version. Ported Qt5. + + qscintilla2-devel + qtermwidget5-devel + + https://github.com/hrngultekin/PisiDo/raw/master/pisido-2.3.0.tar.gz + + + pisido + A pisi packager from GUI + + / + + + + + 2015-08-30 + 2.2.1 + Qt5 rebuild + Harun Gültekin + hrngultekin@gmail.com + + + 2015-08-26 + 2.2.1 + rebuild + Harun Gültekin + hrngultekin@gmail.com + + + 2015-08-01 + 2.2.0 + Rebuild + Harun Gültekin + hrngultekin@gmail.com + + + 2015-07-27 + 2.2.0 + Version bump + Harun Gültekin + hrngultekin@gmail.com + + + 2015-07-24 + 2.1.0 + Version bump + Harun Gültekin + hrngultekin@gmail.com + + + 2015-07-09 + 2.0.1 + added multipackage support + Harun Gültekin + hrngultekin@gmail.com + + + 2014-07-05 + 2.0b + Rebuild + Kamil Atlı + suvari@pisilinux.org + + + 2014-02-04 + 2.0b + Rebuild + Alihan Öztürk + alihan@pisilinux.org + + + 2013-03-10 + 2.0b + Inıtial import. + Serdar Soytetir + kaptan@pisilinux.org + + + + + diff --git a/util/admin/pisido/translations.xml b/util/admin/pisido/translations.xml new file mode 100644 index 0000000000..0146d7f3af --- /dev/null +++ b/util/admin/pisido/translations.xml @@ -0,0 +1,9 @@ + + + pisido + Grafik arayüzde çalışan pisi paketçisi. + Grafik arayüzde pisi paketleri yapabilirsiniz. Ayrıca var olan inşa dosyalarınızı içe aktarıp inşa edebilirsiniz.Çoklu paket yapısı eklenmiştir. Hala geliştirilme aşamasındasır. Alfa sürümdür. Qt5 ile hazırlanmıştır. + + + + From 4f682e8849021a4a376f0c7f7f7970793eb71ec9 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 19:23:55 +0300 Subject: [PATCH 08/36] qscintilla2:moved into main for pisi 2.0 --- desktop/toolkit/qscintilla2/actions.py | 71 +++++++++ .../QScintilla-gpl-2.4-fix-linkage.patch | 10 ++ .../files/qscintilla-2.6.2-qt4.patch | 17 +++ desktop/toolkit/qscintilla2/pspec.xml | 135 ++++++++++++++++++ desktop/toolkit/qscintilla2/translations.xml | 30 ++++ 5 files changed, 263 insertions(+) create mode 100644 desktop/toolkit/qscintilla2/actions.py create mode 100644 desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch create mode 100644 desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch create mode 100644 desktop/toolkit/qscintilla2/pspec.xml create mode 100644 desktop/toolkit/qscintilla2/translations.xml diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py new file mode 100644 index 0000000000..3e3dea6335 --- /dev/null +++ b/desktop/toolkit/qscintilla2/actions.py @@ -0,0 +1,71 @@ +#!/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 autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import pythonmodules +from pisi.actionsapi import get +from pisi.actionsapi import qt5 + +WorkDir = "QScintilla-gpl-%s" % get.srcVERSION() +NoStrip = ["/usr/share/doc"] + +def setup(): + shelltools.cd("Qt4Qt5") + qt5.configure() + + # Change C/XXFLAGS + pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) + pisitools.dosed("Makefile", "^CXXFLAGS.*\\$\\(DEFINES\\)", "CXXFLAGS = %s -fPIC $(DEFINES)" % get.CXXFLAGS()) + + # Get designer plugin's Makefile + shelltools.cd("../designer-Qt4Qt5/") + qt5.configure() + + # Change C/XXFLAGS of designer plugin's makefile + pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) + pisitools.dosed("Makefile", "^CXXFLAGS.*\\$\\(DEFINES\\)", "CXXFLAGS = %s -fPIC $(DEFINES)" % get.CXXFLAGS()) + +def build(): + shelltools.system("cp -rf Python Python3") + shelltools.cd("Qt4Qt5") + autotools.make("all staticlib CC=\"%s\" CXX=\"%s\" LINK=\"%s\"" % (get.CC(), get.CXX(), get.CXX())) + + shelltools.cd("../designer-Qt4Qt5/") + autotools.make("DESTDIR=\"%s/%s/designer\"" % (get.installDIR(), qt5.plugindir)) + + # Get Makefile of qscintilla-python via sip + shelltools.cd("../Python") + pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5") + autotools.make() + shelltools.cd("../Python3") + pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5", pyVer = "3") + pisitools.dosed("Makefile", "-lpython3.4", "-lpython3") + autotools.make() + +def install(): + shelltools.cd("Qt4Qt5") + qt5.install() + + shelltools.cd("../designer-Qt4Qt5/") + qt5.install() + + #build and install qscintilla-python + shelltools.cd("../Python3") + autotools.install("DESTDIR=%s" % get.installDIR()) + shelltools.cd("../Python") + autotools.install("DESTDIR=%s" % get.installDIR()) + + shelltools.cd("..") + pisitools.dohtml("doc/html-Qt4Qt5/") + pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*") + + pisitools.removeDir("/usr/share/qt4") + + pisitools.dodoc("LICENSE*", "NEWS", "README") + +# By PiSiDo 2.3.1 diff --git a/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch b/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch new file mode 100644 index 0000000000..050aba5c2a --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch @@ -0,0 +1,10 @@ +--- Python/configure.py~ 2009-06-05 11:00:42.000000000 +0200 ++++ Python/configure.py 2009-06-06 11:41:12.000000000 +0200 +@@ -294,6 +294,7 @@ + makefile.extra_include_dirs.append(opts.qsciincdir) + makefile.extra_lib_dirs.append(opts.qscilibdir) + makefile.extra_libs.append("qscintilla2") ++ makefile.extra_libs.append("python" + sys.version[0:3]) + + makefile.generate() + diff --git a/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch b/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch new file mode 100644 index 0000000000..43a7e6e6c8 --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch @@ -0,0 +1,17 @@ +--- a/designer-Qt4/designer.pro 2011-06-13 14:16:23.000000000 +0200 ++++ b/designer-Qt4/designer.pro 2012-10-28 18:05:40.000000000 +0100 +@@ -4,6 +4,8 @@ + TEMPLATE = lib + TARGET = qscintillaplugin + ++INCLUDEPATH = ../Qt4Qt5 ++ + CONFIG += designer release plugin + + HEADERS = qscintillaplugin.h +@@ -12,4 +14,4 @@ + target.path = $$[QT_INSTALL_PLUGINS]/designer + INSTALLS += target + +-LIBS += -lqscintilla2 ++LIBS += -L../Qt4Qt5 -lqscintilla2 diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml new file mode 100644 index 0000000000..6833d1ffad --- /dev/null +++ b/desktop/toolkit/qscintilla2/pspec.xml @@ -0,0 +1,135 @@ + + + qscintilla2 + http://www.riverbankcomputing.co.uk/qscintilla/ + + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + GPLv2 + GPLv3 + library + Qt4 port of Scintilla + QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class. + + python-qt5 + python3-devel + python3-sip3 + qt5-base-devel + qt5-designer-devel + sip-devel + + mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz + + QScintilla-gpl-2.4-fix-linkage.patch + qscintilla-2.6.2-qt4.patch + + + + qscintilla2 + A pisi packager from GUI + + qt5-base + + + /usr/lib + /usr/lib/qt5/plugins + /usr/share/doc + /usr/share/qt5/mkspecs + /usr/share/qt5/translations + + + + qscintilla2-python-common + Common python qscintilla bindings files shared between qscintilla2-python and qscintilla2-python3 + + qscintilla2 + + + /usr/share/qt5/qsci + /usr/share/sip + + + + qscintilla2-python + Python 2.x bindings for qscintilla2 + + qscintilla2 + qscintilla2-python-common + qt5-base + + + /usr/lib/python2* + + + + qscintilla2-python3 + Python 3.x bindings for qscintilla2 + + python3 + qscintilla2 + qscintilla2-python-common + qt-base + + + /usr/lib/python3* + + + + qscintilla2-doc + HTML documentation for qscintilla2 + + /usr/share/doc/qscintilla2/Scintilla + /usr/share/doc/qscintilla2/html + + + + qscintilla2-devel + Development files for qscintilla2 + + qscintilla2 + + + /usr/include + + + + + 2015-09-04 + 2.9 + version bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-27 + 2.6.2 + Rebuild for gcc + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-12-21 + 2.6.2 + Fix runtime deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-17 + 2.6.2 + Release bump + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-11 + 2.6.2 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + diff --git a/desktop/toolkit/qscintilla2/translations.xml b/desktop/toolkit/qscintilla2/translations.xml new file mode 100644 index 0000000000..76552aa517 --- /dev/null +++ b/desktop/toolkit/qscintilla2/translations.xml @@ -0,0 +1,30 @@ + + + qscintilla2 + QScintilla2, Neil Hodgson'un Scintilla C++ editör sınıfının bir Qt4 uyarlamasıdır. + Port do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona. + QScintilla2, Neil Hodgson'un Scintilla C++ editör sınıfının bir Qt4 uyarlamasıdır. + QScintilla jest portem do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona. + + + qscintilla2-python-common + + + qscintilla2-python + qscintilla2 için Python bağlayıcıları + + + qscintilla2-python3 + + + qscintilla2-doc + qscintilla2 için HTML belgeleri + + + qscintilla2-devel + qscintilla2 için geliştirme dosyaları + Pliki nagłówkowe dla QScintilla + + + + From db8ddb09105ba3970341194c3bd4fef8ad243f28 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 19:24:27 +0300 Subject: [PATCH 09/36] qtermwidgets5 moved into main for pisi 2.0 --- desktop/toolkit/qtermwidget5/actions.py | 31 ++++++++++ desktop/toolkit/qtermwidget5/pspec.xml | 59 +++++++++++++++++++ desktop/toolkit/qtermwidget5/translations.xml | 12 ++++ 3 files changed, 102 insertions(+) create mode 100644 desktop/toolkit/qtermwidget5/actions.py create mode 100644 desktop/toolkit/qtermwidget5/pspec.xml create mode 100644 desktop/toolkit/qtermwidget5/translations.xml diff --git a/desktop/toolkit/qtermwidget5/actions.py b/desktop/toolkit/qtermwidget5/actions.py new file mode 100644 index 0000000000..1435e5c1db --- /dev/null +++ b/desktop/toolkit/qtermwidget5/actions.py @@ -0,0 +1,31 @@ +# -*- 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 cmaketools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get +from pisi.actionsapi import shelltools + +def setup(): + shelltools.makedirs("build") + shelltools.cd("build") + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_DESIGNER_PLUGIN=0 \ + -DUSE_QT5=true", sourceDir="..") + +def build(): + shelltools.cd("build") + cmaketools.make() + +def install(): + shelltools.cd("build") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.domove("/usr/lib64/*", "usr/lib/") + pisitools.removeDir("/usr/lib64") + + shelltools.cd("..") + pisitools.dodoc("AUTHORS", "README", "COPYING") +# By PiSiDo 2.3.1 diff --git a/desktop/toolkit/qtermwidget5/pspec.xml b/desktop/toolkit/qtermwidget5/pspec.xml new file mode 100644 index 0000000000..e444bbcd62 --- /dev/null +++ b/desktop/toolkit/qtermwidget5/pspec.xml @@ -0,0 +1,59 @@ + + + qtermwidget5 + https://github.com/qterminal/qtermwidget + + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + GPLv2 + library + app:gui + Terminal widget for Qt5 + A simple terminal widget for using with Qt5 based applications + + cmake + libgcc + qt5-base-devel + + https://github.com/qterminal/qtermwidget/releases/download/0.6.0/qtermwidget-0.6.0.tar.xz + + + qtermwidget5 + Development files for qtermwidget5 + + libgcc + qt5-base + + + /usr/bin/consoleq + /usr/lib + /usr/share + /usr/share/doc + + + + qtermwidget5-devel + Development files for qtermwidget5 + + qt5-base-devel + qtermwidget5 + + + /usr/bin + /usr/include + /usr/lib/pkgconfig + + + + + 2015-05-13 + 0.6.0 + First release + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + + + diff --git a/desktop/toolkit/qtermwidget5/translations.xml b/desktop/toolkit/qtermwidget5/translations.xml new file mode 100644 index 0000000000..c62e6a62d1 --- /dev/null +++ b/desktop/toolkit/qtermwidget5/translations.xml @@ -0,0 +1,12 @@ + + + qtermwidget5 + Qt tabanlı uygulamalar için basit bir terminal modulü + + + qtermwidget5-devel + qtermwidget5 için geliştirme dosyaları + + + + From b92c130a24263c77bc426960def3e4300661aca3 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 19:24:51 +0300 Subject: [PATCH 10/36] pisido fixed dep --- util/admin/pisido/actions.py | 3 +++ util/admin/pisido/pspec.xml | 6 +++--- util/admin/pisido/translations.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/util/admin/pisido/actions.py b/util/admin/pisido/actions.py index 035d8b3a6f..68c244e576 100644 --- a/util/admin/pisido/actions.py +++ b/util/admin/pisido/actions.py @@ -6,6 +6,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import qt5 +WorkDir="PisiDo-2.3.1/pisido" def setup(): qt5.configure() @@ -22,3 +23,5 @@ def install(): # By PiSiDo 2.2.1 # By PiSiDo 2.3.0 + +# By PiSiDo 2.3.1 diff --git a/util/admin/pisido/pspec.xml b/util/admin/pisido/pspec.xml index 12f8fcd7c8..11c83cab5c 100644 --- a/util/admin/pisido/pspec.xml +++ b/util/admin/pisido/pspec.xml @@ -15,7 +15,7 @@ qscintilla2-devel qtermwidget5-devel - https://github.com/hrngultekin/PisiDo/raw/master/pisido-2.3.0.tar.gz + https://github.com/hrngultekin/PisiDo/archive/2.3.1.tar.gz pisido @@ -27,7 +27,7 @@ 2015-08-30 - 2.2.1 + 2.3.1 Qt5 rebuild Harun Gültekin hrngultekin@gmail.com @@ -91,4 +91,4 @@ - + diff --git a/util/admin/pisido/translations.xml b/util/admin/pisido/translations.xml index 0146d7f3af..00e73327df 100644 --- a/util/admin/pisido/translations.xml +++ b/util/admin/pisido/translations.xml @@ -6,4 +6,4 @@ - + From 0c3377d629ab547a2a550db86ea2a0d6144130ef Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 21:42:55 +0300 Subject: [PATCH 11/36] sip:removed from main repo --- programming/language/python/sip/actions.py | 29 ----- .../python/sip/files/disable-rpaths.diff | 10 -- .../python/sip/files/fix-linking.diff | 11 -- .../language/python/sip/files/no-strip.patch | 26 ----- programming/language/python/sip/pspec.xml | 102 ------------------ .../language/python/sip/translations.xml | 28 ----- 6 files changed, 206 deletions(-) delete mode 100644 programming/language/python/sip/actions.py delete mode 100644 programming/language/python/sip/files/disable-rpaths.diff delete mode 100644 programming/language/python/sip/files/fix-linking.diff delete mode 100644 programming/language/python/sip/files/no-strip.patch delete mode 100644 programming/language/python/sip/pspec.xml delete mode 100644 programming/language/python/sip/translations.xml diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py deleted file mode 100644 index efb21b6cc4..0000000000 --- a/programming/language/python/sip/actions.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 pythonmodules -from pisi.actionsapi import get - -WorkDir = "%s-%s" % (get.srcNAME(), get.srcVERSION()) -py2dir = get.curPYTHON() - -def setup(): - pythonmodules.run('configure.py \ - -b /usr/bin \ - -d /usr/lib/%s/site-packages \ - -e /usr/include/%s \ - CFLAGS+="%s" CXXFLAGS+="%s"' % (py2dir, py2dir, get.CFLAGS(), get.CXXFLAGS())) - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - #pisitools.remove("/usr/bin/sip") - pisitools.dodoc("LICENSE*", "NEWS", "README") diff --git a/programming/language/python/sip/files/disable-rpaths.diff b/programming/language/python/sip/files/disable-rpaths.diff deleted file mode 100644 index 7aab12987a..0000000000 --- a/programming/language/python/sip/files/disable-rpaths.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- siputils.py -+++ siputils.py -@@ -737,6 +737,7 @@ class Makefile: - rpaths is the cannonical list of rpaths. - """ - flags = [] -+ return flags - prefix = self.optional_string("RPATH") - - if prefix: diff --git a/programming/language/python/sip/files/fix-linking.diff b/programming/language/python/sip/files/fix-linking.diff deleted file mode 100644 index e97281a507..0000000000 --- a/programming/language/python/sip/files/fix-linking.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- specs/linux-g++ 2009/08/31 11:59:37 1.1 -+++ specs/linux-g++ 2009/08/31 12:00:19 -@@ -53,7 +53,7 @@ - QMAKE_LFLAGS = - QMAKE_LFLAGS_RELEASE = - QMAKE_LFLAGS_DEBUG = --QMAKE_LFLAGS_SHLIB = -shared -+QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = diff --git a/programming/language/python/sip/files/no-strip.patch b/programming/language/python/sip/files/no-strip.patch deleted file mode 100644 index 033b54f968..0000000000 --- a/programming/language/python/sip/files/no-strip.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: sip-4.8.2/specs/linux-g++ -=================================================================== ---- sip-4.8.2.orig/specs/linux-g++ -+++ sip-4.8.2/specs/linux-g++ -@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p -Index: sip-4.8.2/specs/linux-lsb -=================================================================== ---- sip-4.8.2.orig/specs/linux-lsb -+++ sip-4.8.2/specs/linux-lsb -@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml deleted file mode 100644 index 66f0e62763..0000000000 --- a/programming/language/python/sip/pspec.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - sip - http://www.riverbankcomputing.co.uk/sip - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - SIP is a tool for generating bindings for C++ classes so that they can be used by Python - SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules. - - mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz - - python-devel - - - no-strip.patch - disable-rpaths.diff - fix-linking.diff - - - - - sip - - /usr/bin - /usr/share/doc - - - - - python-sip - Python 2.x SIP bindings for C and C++ libraries - - sip - - - /usr/lib/python2* - - - - - sip-devel - Development files for sip - - sip - python-sip - - - /usr/include - - - - - - 2015-04-09 - 4.16.7 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-28 - 4.14.2 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-14 - 4.14.2 - ReBump - PisiLinux Community - admins@pisilinux.org - - - 2013-09-09 - 4.15.1 - V.Bump - PisiLinux Community - admins@pisilinux.org - - - 2013-01-18 - 4.14.2 - Fixed - PisiLinux Community - admins@pisilinux.org - - - 2012-12-15 - 4.14.2 - First release - Marcin Bojara - marcin@pisilinux.org - - - diff --git a/programming/language/python/sip/translations.xml b/programming/language/python/sip/translations.xml deleted file mode 100644 index 76845b4b69..0000000000 --- a/programming/language/python/sip/translations.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - sip - C ve C++ kütüphaneleri için python bağlayıcıları oluşturan bir araç - Generator powiązań Pythona z bibliotekami klas C++ - SIP C ve C++ kütüphanelerini Python'da kullanabilmek için bağlayıcılar oluşturan bir araçtır. Herhangi bir C veya C++ kütüphanesini Python genişletme modülüne dönüştürür. - SIP est un outil de génération de bindings (liens) pour librairies C et C++ afin de les rendre utilisables depuis Python. Il prend n'importe quelle librairie C ou C++ et la convertit en module d'extension Python. - SIP es una herramienta para generar librerías de acceso a clases C++, para poder usarlos desde Python. Puede tomar cualquier librería C o C++ y convertirlo en módulos de extensión para Python. - Generuje powiązania Pythona z bibliotekami klas C++ ze zbioru plików ze specyfikacjami klas. Obsługiwany jest Python 2 i 3. - - - - sip-devel - sip için geliştirme dosyaları - Pliki nagłówkowe sip - - - - python-sip - Moduł python2 wymagany przez wygenerowane powiązania - - - - python3-sip - Moduł python3 wymagany przez wygenerowane powiązania - - From 4f010c6fcf1a515c321d00712f84bdce1903f7f8 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 21:43:27 +0300 Subject: [PATCH 12/36] sip3:fixed dep --- programming/language/python/sip3/actions.py | 2 + programming/language/python/sip3/pspec.xml | 58 +++++++++++-------- .../language/python/sip3/translations.xml | 19 ++---- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/programming/language/python/sip3/actions.py b/programming/language/python/sip3/actions.py index 7036746626..a4f11cdc47 100644 --- a/programming/language/python/sip3/actions.py +++ b/programming/language/python/sip3/actions.py @@ -40,3 +40,5 @@ 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 35b5aa5023..5e9ece45a0 100644 --- a/programming/language/python/sip3/pspec.xml +++ b/programming/language/python/sip3/pspec.xml @@ -1,29 +1,24 @@ - - sip3 http://www.riverbankcomputing.co.uk/sip - PisiLinux Community - admins@pisilinux.org + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org GPLv2 app:console SIP is a tool for generating bindings for C++ classes so that they can be used by Python SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules. - mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz - python3-devek + python3-devel + mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz no-strip.patch - disable-rpaths.diff - fix-linking.diff - sip-outoftree.patch + sip-outoftree.patch - sip3 @@ -31,33 +26,48 @@ /usr/local/bin /usr/sbin /usr/share/doc + /usr/share/sip3 + + disable-rpaths.diff + fix-linking.diff + + Development files for qscintilla2 + + libgcc + - python3-sip3 - Python 3.x SIP bindings for C and C++ libraries - - sip3 - python3 - /usr/lib/python3* + + disable-rpaths.diff + fix-linking.diff + + Python 3.x SIP bindings for C and C++ libraries + + libgcc + python3 + sip3 + - sip3-devel - Development files for sip - - sip3 - python3-sip3 - /usr/include + + disable-rpaths.diff + fix-linking.diff + + Development files for sip + + python3-sip3 + sip3 + - 2015-06-14 @@ -75,3 +85,5 @@ + + diff --git a/programming/language/python/sip3/translations.xml b/programming/language/python/sip3/translations.xml index ce9ed07862..71b6b4097d 100644 --- a/programming/language/python/sip3/translations.xml +++ b/programming/language/python/sip3/translations.xml @@ -1,28 +1,17 @@ - sip3 C ve C++ kütüphaneleri için python bağlayıcıları oluşturan bir araç Generator powiązań Pythona z bibliotekami klas C++ SIP3 C ve C++ kütüphanelerini Python'da kullanabilmek için bağlayıcılar oluşturan bir araçtır. Herhangi bir C veya C++ kütüphanesini Python genişletme modülüne dönüştürür. - SIP est un outil de génération de bindings (liens) pour librairies C et C++ afin de les rendre utilisables depuis Python. Il prend n'importe quelle librairie C ou C++ et la convertit en module d'extension Python. - SIP es una herramienta para generar librerías de acceso a clases C++, para poder usarlos desde Python. Puede tomar cualquier librería C o C++ y convertirlo en módulos de extensión para Python. Generuje powiązania Pythona z bibliotekami klas C++ ze zbioru plików ze specyfikacjami klas. Obsługiwany jest Python 2 i 3. - - sip-devel - sip3 için geliştirme dosyaları - Pliki nagłówkowe sip + python3-sip3 - - python-sip - Moduł python2 wymagany przez wygenerowane powiązania - - - - python3-sip - Moduł python3 wymagany przez wygenerowane powiązania + sip3-devel + + From 512f0e30c0bffd86f33d753fdf5a28bca5b3630a Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 21:44:08 +0300 Subject: [PATCH 13/36] python-qt5:fixed dep --- .../language/python/python-qt5/actions.py | 29 +++---- .../language/python/python-qt5/pspec.xml | 83 +++++++------------ .../python/python-qt5/translations.xml | 23 +---- 3 files changed, 47 insertions(+), 88 deletions(-) diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py index 7fafa794ed..978ac51baf 100644 --- a/programming/language/python/python-qt5/actions.py +++ b/programming/language/python/python-qt5/actions.py @@ -25,22 +25,22 @@ def setup(): --sip-incdir='/usr/include/python3.4' \ CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") - shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - shelltools.system("python configure.py --confirm-license \ - --assume-shared \ - --no-timestamp \ - --qsci-api \ - --destdir='/usr/lib/python2.7/site-packages/' \ - --sip-incdir='/usr/include/python2.7' \ - --sip /usr/bin/sip \ - --qmake='/usr/lib/qt5/bin/qmake'") + #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + #shelltools.system("python configure.py --confirm-license \ + #--assume-shared \ + #--no-timestamp \ + #--qsci-api \ + #--destdir='/usr/lib/python2.7/site-packages/' \ + # --sip-incdir='/usr/include/python2.7' \ + #--sip /usr/bin/sip \ + # --qmake='/usr/lib/qt5/bin/qmake'") shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'") def build(): autotools.make() - shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - autotools.make() + #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + # autotools.make() def install(): @@ -49,9 +49,10 @@ def install(): autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) pisitools.rename("/usr/bin/pyuic5", "py3uic5") - shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) - pisitools.rename("/usr/bin/pyuic5", "pyuic5") + #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) + #autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) + #pisitools.rename("/usr/bin/pyuic5", "pyuic5") pisitools.dohtml("doc/html/*") pisitools.dodoc("NEWS", "README","LICENSE*") + diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index c8816e6ba6..c89ace8da3 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -1,48 +1,45 @@ - - - python-qt5 + python3-qt5 http://www.riverbankcomputing.co.uk/software/pyqt - PisiLinux Community - admins@pisilinux.org + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org GPLv2 GPLv3 library A set of Python bindings for the Qt 5.x Toolkit 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. - mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz dbus-devel libgcc - qt5-base-devel - qt5-declarative-devel - qt5-multimedia-devel - qt5-serialport-devel - qt5-svg-devel - qt5-webkit-devel - qt5-xmlpatterns-devel - qt5-enginio-devel - qt5-sensors-devel - qt5-location-devel - qt5-websockets-devel - qt5-webchannel-devel - qt5-x11extras-devel - qt5-connectivity-devel python3-devel python3-sip3 + qt5-base-devel + qt5-connectivity-devel + qt5-declarative-devel + qt5-enginio-devel + qt5-location-devel + qt5-multimedia-devel + qt5-sensors-devel + qt5-serialport-devel + qt5-svg-devel + qt5-webchannel-devel + qt5-webkit-devel + qt5-websockets-devel + qt5-x11extras-devel + qt5-xmlpatterns-devel sip3-devel + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz - - python-qt5-common + python3-qt5-common Common files shared between python-qt5 and python3-qt5 - sip3 - python + libgcc + qt5-base /usr/bin/pylupdate5 @@ -51,43 +48,21 @@ /usr/share/sip/PyQt5 - - - python-qt5 - A set of Python 2.x bindings for the Qt 5.x Toolkit - - python-qt5-common - qt5-base - libgcc - qt5-svg - qt5-webkit - qt5-sensors - qt5-x11extras - qt5-serialport - qt5-declarative - qt5-xmlpatterns - - - /usr/bin/pyuic5 - /usr/lib/python2.7/site-packages - - - python3-qt5 A set of Python 3.x bindings for the Qt 5.x Toolkit libgcc - python-qt5-common - python + python3 + python3-qt5-common qt5-base qt5-declarative + qt5-sensors qt5-serialport qt5-svg qt5-webkit + qt5-x11extras qt5-xmlpatterns - qt5-sensors - qt5-x11extras /usr/bin/py3uic5 @@ -95,18 +70,16 @@ /usr/lib/qt5/plugins - - python-qt5-docs + python3-qt5-docs Documentation for python-qt5 bindings - python-qt5 + python3-qt5 - /usr/share/doc/python-qt5 + /usr/share/doc - 2015-06-14 diff --git a/programming/language/python/python-qt5/translations.xml b/programming/language/python/python-qt5/translations.xml index a93a53a4ec..0717cc7f9f 100644 --- a/programming/language/python/python-qt5/translations.xml +++ b/programming/language/python/python-qt5/translations.xml @@ -1,30 +1,15 @@ - python-qt5 Qt5 4.x araçları için python bağlayıcıları Qt5, C++ kütüphaneleri dizisi ve geliştirme araçları olup grafik kullanıcı arabirimleri için, ağ bağlantısı, iş parçacığı, Unicode, düzenli ifadeler, SQL veritabanları, SVG, OpenGL, XML ve kullanıcıve uygulama ayarları gibi platform bağımsız uygulamalara ayrılır. PyQt, Python modülü seti olarak bu sınıftan 440 kadar uygulamayı çalıştırır. - Qt5 est un ensemble de librairies C++ et d'outils de développement. On y trouve des abstractions indépendante de la plateforme utilisée pour les interfaces graphiques, le réseau, les threads, Unicode, les expressions régulières, les bases de données SQL, SVG, OpenGL, XML, la gestion des paramètres utilisateurs. PyQT implémente 440 de ces classes en tant que modules Python. - Qt5 es un conjunto de librerías C++ y herramientas de desarrollo que incluye abstracción independiente de la plataforma, para interfaces de usuarios gráficos, redes, hilos, Unicode, expresiones regulares, bases de datos SQL, SVG, OpenGL, XML, y configuraciones de usuario y de aplicaciones. PyQt implementa 440 de estas clases como conjunto de módulos Python. - - python-qt5-webkit - Webkit kitaplığı için Python bağlayıcıları + python3-qt5 - - python-qt5-phonon - Phonon çokluortam kitaplığı için Python bağlayıcıları - - - - python-qt5-docs - python-qt5 bağlayıcıları için belgelendirme - - - - python-qt5-devel - python-qt5 için geliştirme dosyaları + python3-qt5-docs + + From 362d24bbd4893d4f6827fe4571f92bbbcc035d2d Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 21:59:29 +0300 Subject: [PATCH 14/36] sip3:fixed actions.py --- programming/language/python/sip3/actions.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/programming/language/python/sip3/actions.py b/programming/language/python/sip3/actions.py index a4f11cdc47..99b4188075 100644 --- a/programming/language/python/sip3/actions.py +++ b/programming/language/python/sip3/actions.py @@ -13,14 +13,6 @@ WorkDir = "sip-%s" % get.srcVERSION() py3dir = "python3.4" def setup(): - shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") - - shelltools.cd("..") - shelltools.makedirs("build_python3") - shelltools.copytree("./%s" % WorkDir, "build_python3") - shelltools.cd(WorkDir) - - shelltools.cd("../build_python3/%s" % WorkDir) pythonmodules.run('configure.py \ -b /usr/bin \ -d /usr/lib/%s/site-packages/ \ @@ -28,13 +20,9 @@ def setup(): CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") def build(): - - shelltools.cd("../build_python3/%s" % WorkDir) autotools.make() def install(): - - shelltools.cd("../build_python3/%s" % WorkDir) autotools.rawInstall("DESTDIR=%s -C sipgen" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR()) From 8fc70457b68aad1cfcdccb712fedca82d6e47c06 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:09:49 +0300 Subject: [PATCH 15/36] python-qt5:fixed actions.py --- .../language/python/python-qt5/actions.py | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py index 978ac51baf..8593bea852 100644 --- a/programming/language/python/python-qt5/actions.py +++ b/programming/language/python/python-qt5/actions.py @@ -13,8 +13,6 @@ from pisi.actionsapi import get WorkDir="PyQt-gpl-%s" % get.srcVERSION() def setup(): - - shelltools.copytree("%s/PyQt-gpl-5.4.2" % get.workDIR(), "%s/Py2Qt-gpl-5.4.2" % get.workDIR()) pythonmodules.run("configure.py --confirm-license \ --assume-shared \ --no-timestamp \ @@ -24,35 +22,16 @@ def setup(): --destdir='/usr/lib/python3.4/site-packages/' \ --sip-incdir='/usr/include/python3.4' \ CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") - - #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - #shelltools.system("python configure.py --confirm-license \ - #--assume-shared \ - #--no-timestamp \ - #--qsci-api \ - #--destdir='/usr/lib/python2.7/site-packages/' \ - # --sip-incdir='/usr/include/python2.7' \ - #--sip /usr/bin/sip \ - # --qmake='/usr/lib/qt5/bin/qmake'") + shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'") def build(): - autotools.make() - #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - # autotools.make() def install(): - autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) - pisitools.rename("/usr/bin/pyuic5", "py3uic5") - - #shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR()) - #autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) - #pisitools.rename("/usr/bin/pyuic5", "pyuic5") - pisitools.dohtml("doc/html/*") pisitools.dodoc("NEWS", "README","LICENSE*") From 4382292c2f2c90dd72ff9ddeda41d9aa3231c14d Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:29:36 +0300 Subject: [PATCH 16/36] python-qt5:fixed pspec.xml --- programming/language/python/python-qt5/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index c89ace8da3..aeadf235a7 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -65,7 +65,7 @@ qt5-xmlpatterns - /usr/bin/py3uic5 + /usr/bin/pyuic5 /usr/lib/python3.4/site-packages /usr/lib/qt5/plugins From 2395666c7c40c72f41243dd68ac158b9fbaf2a1a Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:56:51 +0300 Subject: [PATCH 17/36] polkit-qt:fixed header --- desktop/toolkit/qt5/polkit-qt/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/polkit-qt/pspec.xml b/desktop/toolkit/qt5/polkit-qt/pspec.xml index 7dc061e7c7..bc704d305c 100644 --- a/desktop/toolkit/qt5/polkit-qt/pspec.xml +++ b/desktop/toolkit/qt5/polkit-qt/pspec.xml @@ -43,7 +43,7 @@ /usr/lib/pkgconfig - /usr/include/polkit-qt5-1 + /usr/include/polkit-qt5-1 From 14f2062f4f8ad60e399be69700bfbbd00028fbd7 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:57:27 +0300 Subject: [PATCH 18/36] qt5-accountservice:fixed header --- desktop/toolkit/qt5/qt5-accountsservice/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml b/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml index 4707194f36..4f589bbfe5 100644 --- a/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml +++ b/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml @@ -39,7 +39,7 @@ qt5-qtaccountsservice-devel - /usr/include + /usr/include qt5-base From 9ca00cb0a541e54f582c21f5b00162b0264bf307 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:57:52 +0300 Subject: [PATCH 19/36] qt5-configuration:fixed header --- desktop/toolkit/qt5/qt5-configuration/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-configuration/pspec.xml b/desktop/toolkit/qt5/qt5-configuration/pspec.xml index 4d0b51db6e..0d78326658 100644 --- a/desktop/toolkit/qt5/qt5-configuration/pspec.xml +++ b/desktop/toolkit/qt5/qt5-configuration/pspec.xml @@ -43,7 +43,7 @@ qt5-configuration-devel /usr/lib/pkgconfig - /usr/include + /usr/include qt5-base From a4235d58a962bd5b7a467e774a880ab654f2b9ee Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:58:15 +0300 Subject: [PATCH 20/36] qt5-connectivity:fixed header --- desktop/toolkit/qt5/qt5-connectivity/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml index eaf4831008..9bb1cfbce9 100644 --- a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml +++ b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml @@ -40,7 +40,7 @@ qt5-connectivity-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From 1c740353cb3b1064c7e67ab54d313d48ac7595d7 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:58:42 +0300 Subject: [PATCH 21/36] qt5-declarative:fixed header --- desktop/toolkit/qt5/qt5-declarative/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-declarative/pspec.xml b/desktop/toolkit/qt5/qt5-declarative/pspec.xml index 4141073496..3421e1a5c6 100644 --- a/desktop/toolkit/qt5/qt5-declarative/pspec.xml +++ b/desktop/toolkit/qt5/qt5-declarative/pspec.xml @@ -42,7 +42,7 @@ qt5-declarative-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From bfb1a447d656d403dc59cd77a3cf33dcc1663340 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:59:07 +0300 Subject: [PATCH 22/36] qt5-enginio:fixed header --- desktop/toolkit/qt5/qt5-enginio/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-enginio/pspec.xml b/desktop/toolkit/qt5/qt5-enginio/pspec.xml index 07d5f8a2c7..64a445f633 100644 --- a/desktop/toolkit/qt5/qt5-enginio/pspec.xml +++ b/desktop/toolkit/qt5/qt5-enginio/pspec.xml @@ -40,7 +40,7 @@ qt5-enginio-devel /usr/lib/pkgconfig - /usr/include/qt5/ + /usr/include/qt5/ qt5-base-devel From d0c195e8956adc1c4436481e17f96c5efb32dfdb Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:59:31 +0300 Subject: [PATCH 23/36] qt5-location:fixed header --- desktop/toolkit/qt5/qt5-location/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-location/pspec.xml b/desktop/toolkit/qt5/qt5-location/pspec.xml index 289d1a07c3..53553ea1a0 100644 --- a/desktop/toolkit/qt5/qt5-location/pspec.xml +++ b/desktop/toolkit/qt5/qt5-location/pspec.xml @@ -41,7 +41,7 @@ qt5-location-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From 4e9eb64e1cbca67b4402a65ca7ac4077e778ab0a Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 22:59:50 +0300 Subject: [PATCH 24/36] qt5-multimedia:fixed header --- desktop/toolkit/qt5/qt5-multimedia/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml index 39338bf673..dd709bf079 100644 --- a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml +++ b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml @@ -48,7 +48,7 @@ qt5-multimedia-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From ebd98eb2e8c4bd41010faa569c668850ea9b5465 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:00:26 +0300 Subject: [PATCH 25/36] qt5-quick1:fixed header --- desktop/toolkit/qt5/qt5-quick1/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-quick1/pspec.xml b/desktop/toolkit/qt5/qt5-quick1/pspec.xml index 2339858ef9..85aa0ef568 100644 --- a/desktop/toolkit/qt5/qt5-quick1/pspec.xml +++ b/desktop/toolkit/qt5/qt5-quick1/pspec.xml @@ -48,7 +48,7 @@ Development file for qt5-quick1 /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 From 38798dd220586a2500b8b759165f4a007f45eec6 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:00:49 +0300 Subject: [PATCH 26/36] qt5-script:fixed header --- desktop/toolkit/qt5/qt5-script/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-script/pspec.xml b/desktop/toolkit/qt5/qt5-script/pspec.xml index d0c60d0c00..a8d4ba7f76 100644 --- a/desktop/toolkit/qt5/qt5-script/pspec.xml +++ b/desktop/toolkit/qt5/qt5-script/pspec.xml @@ -41,7 +41,7 @@ /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 From 4405a4357e1e175e0809e6e2584340a50cec10b3 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:01:14 +0300 Subject: [PATCH 27/36] qt5-sensors:fixed header --- desktop/toolkit/qt5/qt5-sensors/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-sensors/pspec.xml b/desktop/toolkit/qt5/qt5-sensors/pspec.xml index 9b849ea0b4..5b0778bb22 100644 --- a/desktop/toolkit/qt5/qt5-sensors/pspec.xml +++ b/desktop/toolkit/qt5/qt5-sensors/pspec.xml @@ -40,7 +40,7 @@ /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 From e7813e1140d52e99303299c203adf909232fa4a6 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:03:47 +0300 Subject: [PATCH 28/36] qt5-serialport:fixed header --- desktop/toolkit/qt5/qt5-serialport/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-serialport/pspec.xml b/desktop/toolkit/qt5/qt5-serialport/pspec.xml index edaf5a1b7d..eff0f20f70 100644 --- a/desktop/toolkit/qt5/qt5-serialport/pspec.xml +++ b/desktop/toolkit/qt5/qt5-serialport/pspec.xml @@ -40,7 +40,7 @@ /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 From 3c1086be2f27340d7ece405b672f306131982267 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:05:44 +0300 Subject: [PATCH 29/36] qt5-svg:fixed header --- desktop/toolkit/qt5/qt5-svg/pspec.xml | 23 ++++++++++---------- desktop/toolkit/qt5/qt5-svg/translations.xml | 2 -- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-svg/pspec.xml b/desktop/toolkit/qt5/qt5-svg/pspec.xml index bd36019349..63bb8ad9aa 100644 --- a/desktop/toolkit/qt5/qt5-svg/pspec.xml +++ b/desktop/toolkit/qt5/qt5-svg/pspec.xml @@ -1,5 +1,3 @@ - - qt5-svg @@ -8,23 +6,27 @@ Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org + LGPLv2.1-linking-exception Classes for displaying the contents of SVG files Classes for displaying the contents of SVG files - LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz + mesa-devel qt5-base-devel zlib-devel - mesa-devel + http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz + + QScintilla-gpl-2.4-fix-linkage.patch + qscintilla-2.6.2-qt4.patch + - qt5-svg + Development files for qscintilla2 - zlib libgcc qt5-base + zlib /usr/lib @@ -32,19 +34,18 @@ /usr/share/licenses/ - qt5-svg-devel + Development files for qscintilla2 qt5-base-devel - qt5-svg + qt5-svg + /usr/include/qt5/ /usr/lib/pkgconfig - /usr/include/qt5/ - 2015-06-03 diff --git a/desktop/toolkit/qt5/qt5-svg/translations.xml b/desktop/toolkit/qt5/qt5-svg/translations.xml index b9f7411238..7d679b325e 100644 --- a/desktop/toolkit/qt5/qt5-svg/translations.xml +++ b/desktop/toolkit/qt5/qt5-svg/translations.xml @@ -1,11 +1,9 @@ - qt5-svg SVG dosyalarının içeriğini görüntüleme için sınıflar SVG dosyalarının içeriğini görüntüleme için sınıflar - qt5-svg-devel qt5-svg için geliştirme dosyaları From 9a951728b7009248bf68fd0629a7e98368076d42 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:06:27 +0300 Subject: [PATCH 30/36] qt5-webchannel:fixed header --- desktop/toolkit/qt5/qt5-webchannel/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-webchannel/pspec.xml b/desktop/toolkit/qt5/qt5-webchannel/pspec.xml index 2e34f9fb5d..18b9f64d0a 100644 --- a/desktop/toolkit/qt5/qt5-webchannel/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webchannel/pspec.xml @@ -36,7 +36,7 @@ qt5-webchannel-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From f1bafefd3622043a526aca94cbd4509b5b3b8d70 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:06:49 +0300 Subject: [PATCH 31/36] qt5-webkit:fixed header --- desktop/toolkit/qt5/qt5-webkit/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index 0f82b33199..49b39905d5 100644 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -93,7 +93,7 @@ qt5-webkit-devel /usr/lib/pkgconfig - /usr/include/qt5/ + /usr/include/qt5/ qt5-webkit From cc9ec6838a791b8fe017d677ba47a0d5e0154db3 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:07:05 +0300 Subject: [PATCH 32/36] qt5-websocket:fixed header --- desktop/toolkit/qt5/qt5-websockets/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-websockets/pspec.xml b/desktop/toolkit/qt5/qt5-websockets/pspec.xml index ff3b42184a..1a8d4bf028 100644 --- a/desktop/toolkit/qt5/qt5-websockets/pspec.xml +++ b/desktop/toolkit/qt5/qt5-websockets/pspec.xml @@ -35,7 +35,7 @@ qt5-websockets-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From 8d2eb59ab72ba144500b3ad9a8e75cc8dc8bf0ed Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:07:26 +0300 Subject: [PATCH 33/36] qt5-x11extras:fixed header --- desktop/toolkit/qt5/qt5-x11extras/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml index 447aa1de82..1709c99c1a 100644 --- a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml +++ b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml @@ -34,7 +34,7 @@ qt5-x11extras-devel /usr/lib/pkgconfig - /usr/include/qt5/ + /usr/include/qt5/ qt5-x11extras From 3d49a52194482f6bd228e26a67e22a24a70c5a02 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 23:07:49 +0300 Subject: [PATCH 34/36] qt5-xmlpatterns:fixed header --- desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml b/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml index bf5a613e51..81648113e1 100644 --- a/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml +++ b/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml @@ -36,7 +36,7 @@ qt5-xmlpatterns-devel /usr/lib/pkgconfig - /usr/include/qt5 + /usr/include/qt5 qt5-base-devel From 7ef5571df69cf67c4655361d3d731422c1c845ea Mon Sep 17 00:00:00 2001 From: ertugerata Date: Sun, 6 Sep 2015 23:48:05 +0300 Subject: [PATCH 35/36] some fix for qscintilla --- .../qscintilla2/files/configure.py.patch | 48 ++++++++++++++++++ .../toolkit/qscintilla2/files/libname.patch | 50 +++++++++++++++++++ desktop/toolkit/qscintilla2/pspec.xml | 11 ++-- 3 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 desktop/toolkit/qscintilla2/files/configure.py.patch create mode 100644 desktop/toolkit/qscintilla2/files/libname.patch diff --git a/desktop/toolkit/qscintilla2/files/configure.py.patch b/desktop/toolkit/qscintilla2/files/configure.py.patch new file mode 100644 index 0000000000..c1069d251b --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/configure.py.patch @@ -0,0 +1,48 @@ +--- QScintilla-gpl-2.9/Python/configure.py.orig 2015-04-20 17:38:24.000000000 +0300 ++++ QScintilla-gpl-2.9/Python/configure.py 2015-04-26 21:54:18.000000000 +0300 +@@ -31,6 +31,7 @@ + import os + import optparse + import sys ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + + ############################################################################### +@@ -206,6 +207,8 @@ + "The QScintilla version number could not be determined by " + "reading %s." % sciglobal) + ++ return # Debian: do not check for the installed version, we're good this way. ++ + lib_dir = target_configuration.qsci_lib_dir + if lib_dir is None: + lib_dir = target_configuration.qt_lib_dir +@@ -260,7 +263,7 @@ + the target configuration. + """ + +- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip' ++ return os.path.join(src_dir, 'sip/qscimod5.sip') if target_configuration.pyqt_package == 'PyQt5' else os.path.join(src_dir, 'sip/qscimod4.sip') + + def get_sip_installs(self, target_configuration): + """ Return a tuple of the installation directory of the module's .sip +@@ -1411,6 +1414,7 @@ + includepath = qmake_config.get('INCLUDEPATH') + if includepath: + pro.write('INCLUDEPATH += %s\n' % includepath) ++ pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt/QtWidgets /usr/include/qt/QtPrintSupport') + + # Make sure the SIP include directory is searched before the Python include + # directory if they are different. +@@ -1420,7 +1424,10 @@ + + libs = qmake_config.get('LIBS') + if libs: +- pro.write('LIBS += %s\n' % libs) ++ if target_config.pyqt_package == 'PyQt5': ++ pro.write('LIBS += %s -lqt5scintilla2\n' % libs) ++ else: ++ pro.write('LIBS += %s -lqscintilla2\n' % libs) + + if not opts.static: + pro.write(''' diff --git a/desktop/toolkit/qscintilla2/files/libname.patch b/desktop/toolkit/qscintilla2/files/libname.patch new file mode 100644 index 0000000000..b9071dca6a --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/libname.patch @@ -0,0 +1,50 @@ +--- QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf 2014-08-11 18:04:44.371414609 +0400 +@@ -17,9 +17,18 @@ + win32: { + LIBS += -lqscintilla2d + } else { +- LIBS += -lqscintilla2 ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } else { ++ LIBS += -lqscintilla2 ++ } + } + } + } else { ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } ++ else { + LIBS += -lqscintilla2 ++ } + } +--- QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -41,6 +41,7 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets printsupport ++ TARGET = qt5scintilla2 + + greaterThan(QT_MINOR_VERSION, 1) { + macx:QT += macextras +--- QScintilla-gpl-2.8.3/Qt4Qt5/designer-Qt4Qt5/designer.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -8,11 +8,14 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += designer ++ TARGET = qt5scintillaplugin ++ LIBS += -lqt5scintilla2 + + # Work around QTBUG-39300. + CONFIG -= android_install + } else { + CONFIG += designer ++ LIBS += -lqscintilla2 + } + + macx { + \ No newline at end of file diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml index 6833d1ffad..2aa21f3bbb 100644 --- a/desktop/toolkit/qscintilla2/pspec.xml +++ b/desktop/toolkit/qscintilla2/pspec.xml @@ -9,25 +9,24 @@ GPLv2 GPLv3 library - Qt4 port of Scintilla + Qt port of Scintilla QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class. - python-qt5 + python3-qt5 python3-devel python3-sip3 qt5-base-devel qt5-designer-devel - sip-devel + sip3-devel mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz - QScintilla-gpl-2.4-fix-linkage.patch - qscintilla-2.6.2-qt4.patch + configure.py.patch + libname.patch qscintilla2 - A pisi packager from GUI qt5-base From 0052e678dfda007a31b65739eba3eb3658356dad Mon Sep 17 00:00:00 2001 From: ertugerata Date: Mon, 7 Sep 2015 09:27:26 +0300 Subject: [PATCH 36/36] update sddm --- desktop/kde/plasma/sddm/pspec.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/desktop/kde/plasma/sddm/pspec.xml b/desktop/kde/plasma/sddm/pspec.xml index 76a1699952..b28da26d4c 100644 --- a/desktop/kde/plasma/sddm/pspec.xml +++ b/desktop/kde/plasma/sddm/pspec.xml @@ -13,7 +13,7 @@ app:console QML based X11 display manager KDE Power Management module. Provides kded daemon DBus helper and KCM for configuring Power settings - https://github.com/sddm/sddm/archive/v0.11.0.tar.gz + https://github.com/sddm/sddm/archive/v0.12.0.tar.gz qt5-base-devel qt5-linguist @@ -26,9 +26,9 @@ cmake - sddm-0.11.0-dbus-config.patch + sddm-0.11.0-consolekit.patch @@ -61,6 +61,13 @@ + + 2015-09-07 + 0.12 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-03 0.11