Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #679 from ayhanyalcinsoy/master

Browse Source 
pisido and qscintilla2:ready, kdepim need help
This commit is contained in:
yusuf
2015-10-26 02:09:55 +02:00
parent 5abaf595fa cff7025f8b
commit ae21dc43f3
12 changed files with 80019 additions and 79743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/application/kdepim/actions.py
+6 -1
View File
@@ -10,7 +10,12 @@ from pisi.actionsapi import kde5
#WorkDir = "kdepim-15.08.2/kaddressbook"
def setup():
kde5.configure()
kde5.configure("-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-DLIBEXEC_INSTALL_DIR=lib")
def build():
kde5.make()
desktop/kde/application/kdepim/pspec.xml
+5 -3
View File
@@ -25,6 +25,7 @@
<Dependency>qt5-phonon-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>prison-qt5-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>kinit-devel</Dependency>
<Dependency>kross-devel</Dependency>
@@ -85,14 +86,15 @@
<Dependency>kidentitymanagement-devel</Dependency>
<Dependency>gpgme-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qt5-linguist</Dependency>
<Dependency>kemoticons-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>knewstuff-devel</Dependency>
<Dependency>knotifyconfig-devel</Dependency>
<Dependency>libkgapi-devel</Dependency>
<Dependency>prison-qt5-devel</Dependency>
<Dependency>libkgapi-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>kdepim-runtime</Dependency>
</BuildDependencies>
</Source>
desktop/toolkit/qscintilla2/actions.py
+11 -8
View File
@@ -40,11 +40,14 @@ def build():
# Get Makefile of qscintilla-python via sip
shelltools.cd("../Python")
pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5")
pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/Py2Qt5 --qsci-sipdir=/usr/share/sip/Py2Qt5 --sip-incdir=/usr/lib/python2.7/site-packages --qmake /usr/bin/qmake-qt5")
pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport")
pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets")
autotools.make()
shelltools.cd("../Python3")
pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5", pyVer = "3")
pisitools.dosed("Makefile", "-lpython3.4", "-lpython3")
pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --qmake /usr/bin/qmake-qt5", pyVer = "3")
pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport")
pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets")
autotools.make()
def install():
@@ -56,16 +59,16 @@ def install():
#build and install qscintilla-python
shelltools.cd("../Python3")
autotools.install("DESTDIR=%s" % get.installDIR())
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/usr/lib/python3.4/site-packages/PyQt5", "Qsci.so")
shelltools.cd("../Python")
autotools.install("DESTDIR=%s" % get.installDIR())
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so")
shelltools.cd("..")
pisitools.dohtml("doc/html-Qt4Qt5/")
pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*")
pisitools.removeDir("/usr/share/qt4")
#pisitools.removeDir("/usr/share/qt4")
pisitools.dodoc("LICENSE*", "NEWS", "README")
# By PiSiDo 2.3.1
desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch
-10
View File
@@ -1,10 +0,0 @@
--- 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()
desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch
-17
View File
@@ -1,17 +0,0 @@
--- 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
desktop/toolkit/qscintilla2/pspec.xml
+16 -8
View File
@@ -11,15 +11,21 @@
<IsA>library</IsA>
<Summary>Qt port of Scintilla</Summary>
<Description>QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class.</Description>
<Archive type="targz" sha1sum="63f367af50fd73a8815e4ff4596932c7dad12e41">mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9.1/QScintilla-gpl-2.9.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-qt5</Dependency>
<Dependency>python-qt5-devel</Dependency>
<Dependency>python3-qt5-devel</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>python3-sip</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>python-sip</Dependency>
<Dependency versionFrom="5.5.1">qt5-base-devel</Dependency>
<Dependency>qt5-designer-devel</Dependency>
<Dependency>sip-devel</Dependency>
</BuildDependencies>
<Archive type="targz" sha1sum="de807f026ac47d4e9472836c73ab8b8039716c37">mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz</Archive>
<Dependency>chrpath</Dependency>
<Dependency>qt5-script-devel</Dependency>
<Dependency>qt5-xmlpatterns-devel</Dependency>
<Dependency>mesa-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>configure.py.patch</Patch>
<Patch>libname.patch</Patch>
@@ -29,6 +35,7 @@
<Name>qscintilla2</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -69,6 +76,7 @@
<Dependency version="current">qscintilla2</Dependency>
<Dependency version="current">qscintilla2-python-common</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python3*</Path>
@@ -89,13 +97,13 @@
<Dependency release="current">qscintilla2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="header">/usr/include/qt5/Qsci</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2015-09-04</Date>
<Version>2.9</Version>
<Date>2015-10-24</Date>
<Version>2.9.1</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
pisi-index.xml
+79961 -79679
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
530834766775697bf0a1dbbc93b7a0751c82e53e
30570bfeb9ca483b46bd85b27a67c23f97eef40d
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
70de3a18a8080be0513196ed91872d25d8646ff1
a9d90b03e84694a01627c5adf360c1e83b2d553d
util/admin/pisido/actions.py
+2 -10
View File
@@ -6,22 +6,14 @@
from pisi.actionsapi import pisitools
from pisi.actionsapi import qt5
WorkDir="PisiDo-2.3.1/pisido"
def setup():
def setup():
qt5.configure()
def build():
pisitools.dosed("pisido.pro", "-lqscintilla2", "-lqt5scintilla2")
qt5.make()
def install():
qt5.install()
pisitools.dodoc("LICENSE", "LISANS", "OKUBUNU", "README")
# By PiSiDo 2.2.1
# By PiSiDo 2.3.0
# By PiSiDo 2.3.1
util/admin/pisido/pspec.xml
+16 -5
View File
@@ -11,20 +11,33 @@
<IsA>app:gui</IsA>
<Summary>A pisi packager from GUI</Summary>
<Description>You can make pisi packages with a GUI. Also, you can import your existing build files.Warning:Alfa version. Ported Qt5.</Description>
<Archive type="targz" sha1sum="5a2c01f9ae2e9c0a838cf16b841af5e64040a0f9">https://github.com/hrngultekin/pisido/archive/pisido-v2.3.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>qscintilla2-devel</Dependency>
<Dependency>qtermwidget5-devel</Dependency>
</BuildDependencies>
<Archive type="targz" sha1sum="7e30688168a1c228f01e9ee90cb8b24ac90edbc3">https://github.com/hrngultekin/PisiDo/archive/2.3.1.tar.gz</Archive>
</BuildDependencies>
</Source>
<Package>
<Name>pisido</Name>
<Summary>A pisi packager from GUI</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>qscintilla2</Dependency>
<Dependency>qtermwidget5</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="all">/</Path>
</Files>
</Package>
<History>
<Update release="10">
<Date>2015-10-26</Date>
<Version>2.3.3</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2015-08-30</Date>
<Version>2.3.1</Version>
@@ -89,6 +102,4 @@
<Email>kaptan@pisilinux.org</Email>
</Update>
</History>
</PISI>
<!-- By PiSiDo 2.3.1 -->
</PISI>