From 4c7286479fb4dce542f3c311dfbbe98f32be89e1 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 18:53:14 +0300 Subject: [PATCH 1/6] sgml-common rebuild --- office/docbook/sgml-common/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/office/docbook/sgml-common/pspec.xml b/office/docbook/sgml-common/pspec.xml index 12cd4c7a..cc965cde 100644 --- a/office/docbook/sgml-common/pspec.xml +++ b/office/docbook/sgml-common/pspec.xml @@ -34,6 +34,13 @@ + + 2019-10-03 + 0.6.3 + Release bump + idris Kalp + idriskalp@gmail.com + 2018-07-23 0.6.3 From bcf788e9b0ca41a14a4e6b8f74af0beef4f70243 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 18:54:41 +0300 Subject: [PATCH 2/6] xz rebuild --- system/base/xz/actions.py | 3 ++- system/base/xz/pspec.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/base/xz/actions.py b/system/base/xz/actions.py index fe8590e7..ec2c3585 100644 --- a/system/base/xz/actions.py +++ b/system/base/xz/actions.py @@ -16,9 +16,10 @@ def setup(): # Remove RPATH pisitools.dosed("libtool", "^hardcode_libdir_flag_spec=.*", "hardcode_libdir_flag_spec=\"\"") pisitools.dosed("libtool", "^runpath_var=LD_RUN_PATH", "runpath_var=DIE_RPATH_DIE") - shelltools.export("LDFLAGS", "-lpthread") + def build(): + shelltools.export("LDFLAGS", "-lpthread") autotools.make() def check(): diff --git a/system/base/xz/pspec.xml b/system/base/xz/pspec.xml index da898f05..4b770825 100644 --- a/system/base/xz/pspec.xml +++ b/system/base/xz/pspec.xml @@ -23,7 +23,7 @@ 0002-xz-Fix-an-integer-overflow-with-32-bit-off_t.patch 0001-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch - pthread.patch + From 8c28deef832aa551a9fb2f3a55ec1400da865f0f Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 18:55:11 +0300 Subject: [PATCH 3/6] libffi rebuild --- system/base/libffi/actions.py | 12 ++++++------ system/base/libffi/pspec.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/base/libffi/actions.py b/system/base/libffi/actions.py index 1ec65697..33acf9bd 100644 --- a/system/base/libffi/actions.py +++ b/system/base/libffi/actions.py @@ -23,12 +23,12 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - if get.buildTYPE() == "emul32": - # Remove duplicated header files - pisitools.removeDir("/usr/lib32/%s" % get.srcDIR()) - # Fix emul32 includedir - pisitools.dosym("/usr/lib/%s/include" % get.srcDIR(), - "/usr/lib32/%s/include" % get.srcDIR()) + #if get.buildTYPE() == "emul32": + ## Remove duplicated header files + #pisitools.removeDir("/usr/lib32/%s" % get.srcDIR()) + ## Fix emul32 includedir + #pisitools.dosym("/usr/lib/%s/include" % get.srcDIR(), + #"/usr/lib32/%s/include" % get.srcDIR()) pisitools.dodoc("ChangeLog*", "LICENSE", "README*") diff --git a/system/base/libffi/pspec.xml b/system/base/libffi/pspec.xml index f58e5c81..96055222 100644 --- a/system/base/libffi/pspec.xml +++ b/system/base/libffi/pspec.xml @@ -31,7 +31,7 @@ libffi - /usr/lib/libffi-* + /usr/include /usr/lib/pkgconfig /usr/lib32/pkgconfig /usr/share/info From 05c5b365bce2c88ec2078d013284161804219c1b Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 18:57:32 +0300 Subject: [PATCH 4/6] glib2 2.62.4 --- system/base/glib2/actions.py | 42 +++++++++++-------- .../files/noisy-glib-compile-schemas.diff | 24 +++++++++++ system/base/glib2/pspec.xml | 10 +++-- 3 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 system/base/glib2/files/noisy-glib-compile-schemas.diff diff --git a/system/base/glib2/actions.py b/system/base/glib2/actions.py index 6bb7e686..1f966dc4 100644 --- a/system/base/glib2/actions.py +++ b/system/base/glib2/actions.py @@ -11,41 +11,49 @@ from pisi.actionsapi import shelltools def setup(): - options = "--with-pcre=system \ - --disable-fam \ - --disable-libelf \ - --enable-gtk-doc=no \ - --disable-libmount \ - --disable-static \ - --enable-shared \ - --disable-man \ - --enable-systemtap" + options = "-Dselinux=disabled \ + -Dman=true \ + -Dgtk_doc=false" if get.buildTYPE() == "_emul32": options += " --libdir=/usr/lib32 \ --bindir=/_emul32/bin \ --sbindir=/_emul32/sbin \ - --disable-dtrace" + --prefix=/usr" shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CXX", "%s -m32" % get.CXX()) shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + else : + options += " --libdir=/usr/lib \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --datadir=/usr/share \ + --prefix=/usr" #autotools.autoreconf("-vif") - autotools.configure(options) + shelltools.makedirs("build") + shelltools.cd("build") + shelltools.system("meson .. %s" % options) - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): - autotools.make("-j1") + #autotools.make("-j1") + shelltools.cd("build") + shelltools.system("ninja") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.cd("build") + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.system("ninja install") if get.buildTYPE() == "_emul32": pisitools.domove("/_emul32/bin/gio-querymodules", "/usr/bin/32/") pisitools.removeDir("/_emul32") - pisitools.removeDir("/usr/share/gdb") - - pisitools.dodoc("AUTHORS", "ChangeLog", "README", "NEWS") + #pisitools.removeDir("/usr/share/gdb") + + if get.buildTYPE() != "_emul32": + shelltools.cd("..") + pisitools.dodoc("AUTHORS", "COPYING", "README*") diff --git a/system/base/glib2/files/noisy-glib-compile-schemas.diff b/system/base/glib2/files/noisy-glib-compile-schemas.diff new file mode 100644 index 00000000..f5f2d948 --- /dev/null +++ b/system/base/glib2/files/noisy-glib-compile-schemas.diff @@ -0,0 +1,24 @@ +diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c +index b8de0907248f6860..130f89b1728f7932 100644 +--- i/gio/glib-compile-schemas.c ++++ w/gio/glib-compile-schemas.c +@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml index 2b04656f..464ac823 100644 --- a/system/base/glib2/pspec.xml +++ b/system/base/glib2/pspec.xml @@ -12,15 +12,17 @@ library A library of handy utility functions glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system. - mirrors://gnome/glib/2.54/glib-2.54.3.tar.xz + mirrors://gnome/glib/2.62/glib-2.62.4.tar.xz - libpcre-devel + libpcre-devel zlib-devel libffi-devel + docbook-xsl + meson + ninja - deprecated-no-warn.patch - glib-2.54.3-skip_warnings-1.patch + noisy-glib-compile-schemas.diff From dec19410b6e6155baffbbb13d74a9b4207f93f62 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 18:58:06 +0300 Subject: [PATCH 5/6] docbook-xsl rebuild --- office/docbook/docbook-xsl/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/office/docbook/docbook-xsl/pspec.xml b/office/docbook/docbook-xsl/pspec.xml index a027f0d1..bd26a07e 100644 --- a/office/docbook/docbook-xsl/pspec.xml +++ b/office/docbook/docbook-xsl/pspec.xml @@ -41,6 +41,13 @@ + + 2019-10-03 + 1.79.1 + Release bump + idris Kalp + idriskalp@gmail.com + 2019-01-13 1.79.1 From 452f7ce5da0cee434965bdf98672cfb716788ae0 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 22 Dec 2019 19:40:08 +0300 Subject: [PATCH 6/6] glib2 2.62.4 --- system/base/glib2/actions.py | 20 ++++++++++++-------- system/base/glib2/files/multilib.diff | 12 ++++++++++++ system/base/glib2/pspec.xml | 20 ++++++++++++++++++-- 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 system/base/glib2/files/multilib.diff diff --git a/system/base/glib2/actions.py b/system/base/glib2/actions.py index 1f966dc4..68b719c2 100644 --- a/system/base/glib2/actions.py +++ b/system/base/glib2/actions.py @@ -9,6 +9,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get from pisi.actionsapi import shelltools +builddir = "build32" if get.buildTYPE() == 'emul32' else "build" def setup(): options = "-Dselinux=disabled \ @@ -17,13 +18,15 @@ def setup(): if get.buildTYPE() == "_emul32": - options += " --libdir=/usr/lib32 \ + options += " --libdir=/_emul32/lib32 \ --bindir=/_emul32/bin \ --sbindir=/_emul32/sbin \ - --prefix=/usr" + --prefix=/_emul32 \ + -Dlibmount=false" shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CXX", "%s -m32" % get.CXX()) shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + shelltools.system("patch -p1 < multilib.diff") else : options += " --libdir=/usr/lib \ --bindir=/usr/bin \ @@ -32,28 +35,29 @@ def setup(): --prefix=/usr" #autotools.autoreconf("-vif") - shelltools.makedirs("build") - shelltools.cd("build") + shelltools.makedirs("%s" %builddir) + shelltools.cd("%s" %builddir) shelltools.system("meson .. %s" % options) #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): #autotools.make("-j1") - shelltools.cd("build") + shelltools.cd("%s" %builddir) shelltools.system("ninja") def install(): - shelltools.cd("build") + shelltools.cd("%s" %builddir) #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - shelltools.system("ninja install") + shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) if get.buildTYPE() == "_emul32": pisitools.domove("/_emul32/bin/gio-querymodules", "/usr/bin/32/") + pisitools.domove("/_emul32/lib32", "/usr") pisitools.removeDir("/_emul32") - #pisitools.removeDir("/usr/share/gdb") if get.buildTYPE() != "_emul32": + pisitools.removeDir("/usr/share/gdb") shelltools.cd("..") pisitools.dodoc("AUTHORS", "COPYING", "README*") diff --git a/system/base/glib2/files/multilib.diff b/system/base/glib2/files/multilib.diff new file mode 100644 index 00000000..c3b4ed30 --- /dev/null +++ b/system/base/glib2/files/multilib.diff @@ -0,0 +1,12 @@ +diff --git i/gio/tests/meson.build w/gio/tests/meson.build +index 65f43e267..3bd66bf60 100644 +--- i/gio/tests/meson.build ++++ w/gio/tests/meson.build +@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + '-r', + '-b','binary', + '@INPUT@', ++ '--oformat', 'elf32-i386', + '-o','@OUTPUT@']) + + # Rename symbol to match the one in the C file diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml index 464ac823..3533cb5b 100644 --- a/system/base/glib2/pspec.xml +++ b/system/base/glib2/pspec.xml @@ -17,6 +17,7 @@ libpcre-devel zlib-devel libffi-devel + libutil-linux-devel docbook-xsl meson ninja @@ -24,6 +25,9 @@ noisy-glib-compile-schemas.diff + + multilib.diff + @@ -32,7 +36,9 @@ libpcre zlib - libffi + libffi + elfutils + libutil-linux /etc/profile.d @@ -62,7 +68,10 @@ Development files for glib2 glib2 - libpcre-devel + libpcre-devel + zlib-devel + libffi-devel + libutil-linux-devel /usr/bin/gtester @@ -128,6 +137,13 @@ + + 2019-12-22 + 2.62.4 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-04-05 2.54.3