From 686e6360d6323f4daa25cf8685ede9690cc57fea Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 25 Jan 2016 22:20:44 +0200 Subject: [PATCH 1/4] ant: gerekmeyen dosyalar silindi. --- programming/build/ant/actions.py | 50 ++++++------------- programming/build/ant/files/20ant | 1 - .../ant/files/apache-ant-no-test-jar.patch | 11 ---- programming/build/ant/files/bin_ant | 4 +- programming/build/ant/pspec.xml | 22 ++++---- 5 files changed, 28 insertions(+), 60 deletions(-) delete mode 100644 programming/build/ant/files/20ant delete mode 100644 programming/build/ant/files/apache-ant-no-test-jar.patch diff --git a/programming/build/ant/actions.py b/programming/build/ant/actions.py index 65e5825054..226ecd8ab3 100644 --- a/programming/build/ant/actions.py +++ b/programming/build/ant/actions.py @@ -8,9 +8,6 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import get -import os -import glob - shelltools.export("JAVA_HOME","/usr/lib/jvm/java-7-openjdk") WorkDir = "apache-ant-%s" % get.srcVERSION() @@ -19,39 +16,20 @@ javadir = "/usr/share/java" def build(): shelltools.export("ANT_OPTS", "-Duser.home=%s" % WorkDir) - shelltools.system("./bootstrap.sh") + shelltools.system("./build.sh dist") def install(): - for d in (anthome, os.path.join(anthome, "lib"), os.path.join(anthome, "etc"), os.path.join(anthome, "bin"), javadir, os.path.join(javadir, "ant")): - pisitools.dodir(d) + pisitools.insinto("/etc/ant/", "%s/etc/*" % WorkDir) + pisitools.remove("/etc/ant/ant-bootstrap.jar") + pisitools.insinto("/usr/share/java/ant/", "%s/lib/*" % WorkDir) + pisitools.insinto("/usr/share/java/", "lib/optional/junit-4.11.jar", "junit.jar") + pisitools.insinto("/usr/share/java/", "lib/optional/hamcrest-core-1.3.jar", "hamcrest.jar") + pisitools.insinto("/usr/share/ant/lib/", "%s/lib/*" % WorkDir) + pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.9.6/bin/*") + - shelltools.cd("build/lib") - - for f in ("ant.jar", "ant-launcher.jar", "ant-bootstrap.jar"): - pisitools.insinto(javadir, f, f.replace(".jar", "-%s.jar" % get.srcVERSION())) - pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f)) - pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, f)) - - #Install optional JAR files to /usr/share/java/ant - for f in ("ant-jmf.jar", "ant-junit.jar", "ant-swing.jar"): - pisitools.insinto(os.path.join(javadir, "ant"), f, f.replace(".jar", "-%s.jar" % get.srcVERSION())) - pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f)) - pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, "ant", f)) - - - shelltools.cd("../../src/script") - for f in glob.glob("*.bat"): - shelltools.unlink(f) - - for f in glob.glob("*.cmd"): - shelltools.unlink(f) - - pisitools.dobin("*") - pisitools.domove("/usr/bin/antRun*", os.path.join(anthome, "bin")) - shelltools.cd("../../") - - #Install XSLs - pisitools.insinto(os.path.join(anthome, "etc"), "src/etc/*.xsl") - - pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE") - #pisitools.dohtml("docs/*") + for binsym in ["ant", "antRun", "antRun.pl", "complete-ant-cmd.pl", "runant.pl", "runant.py"]: + pisitools.dosym("/usr/share/ant/bin/%s" % binsym , "/usr/bin/%s" % binsym) + + pisitools.insinto("/usr/share/doc/ant/", "%s/manual/*" % WorkDir) #for and-docs + pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE") \ No newline at end of file diff --git a/programming/build/ant/files/20ant b/programming/build/ant/files/20ant deleted file mode 100644 index b4bcea575e..0000000000 --- a/programming/build/ant/files/20ant +++ /dev/null @@ -1 +0,0 @@ -ANT_HOME="/usr/share/ant" diff --git a/programming/build/ant/files/apache-ant-no-test-jar.patch b/programming/build/ant/files/apache-ant-no-test-jar.patch deleted file mode 100644 index d4bdfed1bb..0000000000 --- a/programming/build/ant/files/apache-ant-no-test-jar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-ant-1.8.0.orig/build.xml 2010-04-13 14:09:27.501531982 +0200 -+++ apache-ant-1.8.0/build.xml 2010-04-13 14:57:08.321408006 +0200 -@@ -832,7 +832,7 @@ - =================================================================== - --> - - - \ No newline at end of file diff --git a/programming/build/ant/files/bin_ant b/programming/build/ant/files/bin_ant index a88165d71a..fdd47160fb 100644 --- a/programming/build/ant/files/bin_ant +++ b/programming/build/ant/files/bin_ant @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/apache-ant/ant.conf +. /etc/ant/ant.conf export LOCALCLASSPATH=${OPT_JAR_LIST} -/usr/share/apache-ant/bin/ant "$@" \ No newline at end of file +/usr/share/ant/bin/ant "$@" \ No newline at end of file diff --git a/programming/build/ant/pspec.xml b/programming/build/ant/pspec.xml index 789a35b71a..4bfe490598 100644 --- a/programming/build/ant/pspec.xml +++ b/programming/build/ant/pspec.xml @@ -16,24 +16,19 @@ jdk7-openjdk - - apache-ant-no-test-jar.patch - ant - - - /etc + /usr/share/ /usr/bin - /usr/share/ - 20ant - ant.conf + ant.conf + ant.sh + ant.csh @@ -46,6 +41,13 @@ + + 2016-01-25 + 1.9.6 + Fixed. + Osman Erkan + osman.erkan@pisilinux.org + 2015-08-22 1.9.6 @@ -82,4 +84,4 @@ admins@pisilinux.org - + \ No newline at end of file From d9cdd46dcc436d25ed1de7867c89e11c7844f14c Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 25 Jan 2016 22:29:06 +0200 Subject: [PATCH 2/4] pango: version bump for libreoffice --- desktop/toolkit/gtk/pango/actions.py | 5 ++--- desktop/toolkit/gtk/pango/pspec.xml | 18 +++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/desktop/toolkit/gtk/pango/actions.py b/desktop/toolkit/gtk/pango/actions.py index 1e260a5e73..55fa89f07e 100644 --- a/desktop/toolkit/gtk/pango/actions.py +++ b/desktop/toolkit/gtk/pango/actions.py @@ -19,7 +19,6 @@ def setup(): autotools.configure("--disable-static \ --sysconfdir=/etc \ --disable-gtk-doc \ - --with-included-modules=basic-fc \ --%sable-introspection" % ("dis" if get.buildTYPE()=="emul32" else "en")) pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") @@ -31,8 +30,8 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) if get.buildTYPE()=="emul32": - shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32") - pisitools.dobin("pango/.libs/pango-querymodules-32") + #shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32") + #pisitools.dobin("pango/.libs/pango-querymodules-32") return pisitools.dodir("/etc/pango") diff --git a/desktop/toolkit/gtk/pango/pspec.xml b/desktop/toolkit/gtk/pango/pspec.xml index 7c666707ad..44ac8326f0 100644 --- a/desktop/toolkit/gtk/pango/pspec.xml +++ b/desktop/toolkit/gtk/pango/pspec.xml @@ -13,10 +13,8 @@ library Text rendering and layout library Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. - mirrors://gnome/pango/1.36/pango-1.36.8.tar.xz + mirrors://gnome/pango/1.38/pango-1.38.1.tar.xz - gtk-doc - glib2-devel libX11-devel freetype-devel cairo-devel @@ -24,11 +22,10 @@ harfbuzz-devel fontconfig-devel libXrender-devel + gtk-doc gobject-introspection-devel + glib2-devel - - pango-1.32.1-lib64.patch - @@ -123,7 +120,14 @@ - + + + 2016-01-25 + 1.38.1 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + 2015-03-18 1.36.8 From d64dc66acf3eddce01a684c1a8edc3f5280aaa6d Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 25 Jan 2016 22:29:56 +0200 Subject: [PATCH 3/4] gtk3: version bump for libreoffice --- desktop/toolkit/gtk/gtk3/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 0ad0c92885..5fa4c45d11 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -11,7 +11,7 @@ LGPLv2.1 The GIMP Toolkit version 3 GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. - mirrors://gnome/gtk+/3.16/gtk+-3.16.4.tar.xz + mirrors://gnome/gtk+/3.18/gtk+-3.18.6.tar.xz atk-devel cups-devel @@ -203,7 +203,14 @@ - + + + 2016-01-25 + 3.18.6 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + 2015-07-07 3.16.4 From e8ce396d67680cfc6d12156b588a9c1c057b5334 Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 25 Jan 2016 22:30:59 +0200 Subject: [PATCH 4/4] libreoffice: version bump --- office/libreoffice/libreoffice/actions.py | 7 ++++--- office/libreoffice/libreoffice/pspec.xml | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index 1dc4528ad5..931a590c38 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -33,9 +33,8 @@ def setup(): --with-help \ --with-myspell-dicts \ --with-alloc=system \ - --without-java \ + --with-java \ --without-system-dicts \ - --disable-gconf \ --disable-postgresql-sdbc \ --enable-release-build=yes \ --enable-python=system \ @@ -49,14 +48,16 @@ def setup(): --with-system-lcms2 \ --with-system-libpng \ --with-system-libxml \ - --with-system-mesa-headers \ --with-system-nss \ --with-system-openssl \ --with-system-poppler \ --with-system-zlib \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ --disable-odk \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ + --with-jdk-home=/usr/lib/jvm/java-7-openjdk \ --with-parallelism=%s' % (get.makeJOBS().replace("-j",""))) def build(): diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index d436584ec7..a5b125ad36 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -14,14 +14,14 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-5.0.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-help-5.0.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-dictionaries-5.0.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-translations-5.0.1.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-5.1.0.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-help-5.1.0.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-dictionaries-5.1.0.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-translations-5.1.0.2.tar.xz + ant gperf nss-devel - gtk2-devel cups-devel curl-devel glew-devel @@ -29,6 +29,7 @@ lcms2-devel boost-devel libSM-devel + jdk7-openjdk libX11-devel libICE-devel libxslt-devel @@ -47,6 +48,7 @@ libXcomposite-devel libjpeg-turbo-devel gst-plugins-base-next-devel + gtk3-devel @@ -113,6 +115,8 @@ /usr/share/applications/ /usr/share/application-registry /usr/lib/libreoffice/program/ + /usr/share/gir-1.0/LOKDocView-0.1.gir + /usr/lib/girepository-1.0/LOKDocView-0.1.typelib libreoffice-splash.png @@ -3279,6 +3283,13 @@ + + 2016-01-31 + 5.1.0.2 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + 2015-009-01 5.0.1.2