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