Merge pull request #372 from ayhanyalcinsoy/master

python3-qt5, sip3 and fixed header in qt5 specs
This commit is contained in:
Ertuğrul Erata
2015-09-06 23:16:52 +03:00
50 changed files with 933 additions and 423 deletions
-30
View File
@@ -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")
-13
View File
@@ -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']
-45
View File
@@ -1,45 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>ninja</Name>
<Homepage>http://martine.github.com/ninja/</Homepage>
<Packager>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Packager>
<License>LGPLv2</License>
<IsA>app:console</IsA>
<Summary>Ninja is a small build system with a focus on speed.</Summary>
<Description>Ninja is a small build system with a focus on speed.</Description>
<Archive sha1sum="a6ff055691f6d355234298c21cc18961b4ca2ed9" type="targz">https://github.com/martine/ninja/archive/v1.6.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>asciidoc</Dependency>
</BuildDependencies>
<Patches>
<Patch>LFS.patch</Patch>
</Patches>
</Source>
<Package>
<Name>ninja</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2015-08-25</Date>
<Version>1.6.0</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
</History>
</PISI>
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>ninja</Name>
<Summary xml:lang="tr">Ninja, hız odaklı bir inşa sistemidir.</Summary>
<Description xml:lang="tr">Ninja is a small build system with a focus on speed.</Description>
</Source>
</PISI>
@@ -0,0 +1,37 @@
#!/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():
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.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'")
def build():
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.dohtml("doc/html/*")
pisitools.dodoc("NEWS", "README","LICENSE*")
@@ -0,0 +1,99 @@
<PISI>
<Source>
<Name>python3-qt5</Name>
<Homepage>http://www.riverbankcomputing.co.uk/software/pyqt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>GPLv3</License>
<IsA>library</IsA>
<Summary>A set of Python bindings for the Qt 5.x Toolkit</Summary>
<Description>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.</Description>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency versionFrom="4.16.6">python3-sip3</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-connectivity-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>qt5-enginio-devel</Dependency>
<Dependency>qt5-location-devel</Dependency>
<Dependency>qt5-multimedia-devel</Dependency>
<Dependency>qt5-sensors-devel</Dependency>
<Dependency>qt5-serialport-devel</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>qt5-webchannel-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>qt5-websockets-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="4.16.6">sip3-devel</Dependency>
</BuildDependencies>
<Archive sha1sum="ceb5f6e088923beaa9885226a3e677fec089964e" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz</Archive>
</Source>
<Package>
<Name>python3-qt5-common</Name>
<Summary>Common files shared between python-qt5 and python3-qt5</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pylupdate5</Path>
<Path fileType="executable">/usr/bin/pyrcc5</Path>
<Path fileType="data">/usr/share/qt5/qsci/api</Path>
<Path fileType="data">/usr/share/sip/PyQt5</Path>
</Files>
</Package>
<Package>
<Name>python3-qt5</Name>
<Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>python3</Dependency>
<Dependency release="current">python3-qt5-common</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-sensors</Dependency>
<Dependency>qt5-serialport</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>qt5-xmlpatterns</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pyuic5</Path>
<Path fileType="library">/usr/lib/python3.4/site-packages</Path>
<Path fileType="library">/usr/lib/qt5/plugins</Path>
</Files>
</Package>
<Package>
<Name>python3-qt5-docs</Name>
<Summary>Documentation for python-qt5 bindings</Summary>
<RuntimeDependencies>
<Dependency release="current">python3-qt5</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2015-06-14</Date>
<Version>5.4.2</Version>
<Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-04-09</Date>
<Version>5.4.1</Version>
<Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,15 @@
<PISI>
<Source>
<Name>python-qt5</Name>
<Summary xml:lang="tr">Qt5 4.x araçları için python bağlayıcıları</Summary>
<Description xml:lang="tr">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.</Description>
</Source>
<Package>
<Name>python3-qt5</Name>
</Package>
<Package>
<Name>python3-qt5-docs</Name>
</Package>
</PISI>
<!-- By PiSiDo 2.3.1 -->
@@ -0,0 +1,32 @@
#!/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():
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():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s -C sipgen" % get.installDIR())
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.rename("/usr/bin/sip", "sip3")
# By PiSiDo 2.3.1
@@ -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:
@@ -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 =
@@ -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
@@ -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
@@ -0,0 +1,89 @@
<PISI>
<Source>
<Name>sip3</Name>
<Homepage>http://www.riverbankcomputing.co.uk/sip</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:console</IsA>
<Summary>SIP is a tool for generating bindings for C++ classes so that they can be used by Python</Summary>
<Description>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.</Description>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Archive sha1sum="ec467c1ca9f9ead16be869eccc2e7cae72750d56" type="targz">mirrors://sourceforge/pyqt/sip-4.16.7.tar.gz</Archive>
<Patches>
<Patch level="1">no-strip.patch</Patch>
<Patch level="1">sip-outoftree.patch</Patch>
</Patches>
</Source>
<Package>
<Name>sip3</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/local/bin</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/sip3</Path>
</Files>
<AdditionalFiles>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
</AdditionalFiles>
<Summary>Development files for qscintilla2</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>python3-sip3</Name>
<Files>
<Path fileType="library">/usr/lib/python3*</Path>
</Files>
<AdditionalFiles>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
</AdditionalFiles>
<Summary>Python 3.x SIP bindings for C and C++ libraries</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>python3</Dependency>
<Dependency release="current">sip3</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>sip3-devel</Name>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
<AdditionalFiles>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
</AdditionalFiles>
<Summary>Development files for sip</Summary>
<RuntimeDependencies>
<Dependency release="current">python3-sip3</Dependency>
<Dependency release="current">sip3</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="2">
<Date>2015-06-14</Date>
<Version>4.16.7</Version>
<Comment>Version Bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-04-23</Date>
<Version>4.16.6</Version>
<Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
<!-- By PiSiDo 2.3.1 -->
@@ -0,0 +1,17 @@
<PISI>
<Source>
<Name>sip3</Name>
<Summary xml:lang="tr">C ve C++ kütüphaneleri için python bağlayıcıları oluşturan bir araç</Summary>
<Summary xml:lang="pl">Generator powiązań Pythona z bibliotekami klas C++</Summary>
<Description xml:lang="tr">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.</Description>
<Description xml:lang="pl">Generuje powiązania Pythona z bibliotekami klas C++ ze zbioru plików ze specyfikacjami klas. Obsługiwany jest Python 2 i 3.</Description>
</Source>
<Package>
<Name>python3-sip3</Name>
</Package>
<Package>
<Name>sip3-devel</Name>
</Package>
</PISI>
<!-- By PiSiDo 2.3.1 -->