diff options
| -rw-r--r-- | libre/glib2-static/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch | 49 | ||||
| -rw-r--r-- | libre/glib2-static/PKGBUILD | 29 |
2 files changed, 19 insertions, 59 deletions
diff --git a/libre/glib2-static/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch b/libre/glib2-static/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch deleted file mode 100644 index 44a56101d..000000000 --- a/libre/glib2-static/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4850cb55d3415b7d95c80c80ceb60f221f5dddf5 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Wed, 24 Feb 2016 18:58:25 +0100 -Subject: [PATCH] gsettings: Don't crash when no schemas are installed - -Still doesn't behave well ("gsettings help" causes an error), -but at least there's no segfault anymore. ---- - gio/gsettings-tool.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c -index 6a302ce..0026f55 100644 ---- a/gio/gsettings-tool.c -+++ b/gio/gsettings-tool.c -@@ -697,7 +697,7 @@ main (int argc, char **argv) - if (argc < 2) - return gsettings_help (FALSE, NULL); - -- global_schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ()); -+ global_schema_source = g_settings_schema_source_get_default (); - - if (argc > 3 && g_str_equal (argv[1], "--schemadir")) - { -@@ -705,7 +705,6 @@ main (int argc, char **argv) - GError *error = NULL; - - global_schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error); -- g_settings_schema_source_unref (parent); - - if (global_schema_source == NULL) - { -@@ -719,6 +718,13 @@ main (int argc, char **argv) - argv = argv + 2; - argc -= 2; - } -+ else if (global_schema_source == NULL) -+ { -+ g_printerr (_("No schemas installed\n")); -+ return 1; -+ } -+ else -+ g_settings_schema_source_ref (global_schema_source); - - need_settings = TRUE; - --- -2.7.1 - diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD index 5f0c284f2..2041c3800 100644 --- a/libre/glib2-static/PKGBUILD +++ b/libre/glib2-static/PKGBUILD @@ -3,31 +3,40 @@ pkgbase=glib2 pkgname=glib2-static -pkgver=2.48.0 -pkgrel=1.1 -pkgdesc="Common C routines used by GTK+ and other libs (static libraries only)" +pkgver=2.49.7+6+g3602f93 +pkgrel=1 +pkgdesc="Low level core library (static libraries only)" url="http://www.gtk.org/" arch=(i686 x86_64 armv7h) -makedepends=('python') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz +makedepends=('python' 'git') +_commit=3602f934855a484c5eec28f12a6535e14de1778d +source=("git://git.gnome.org/glib#commit=$_commit" revert-warn-glib-compile-schemas.patch) -sha256sums=('744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34' +sha256sums=('SKIP' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') +pkgver() { + cd glib + git describe --tags | sed 's/-/+/g' +} + prepare() { - cd glib-$pkgver + cd glib patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + NOCONFIGURE=1 ./autogen.sh } build() { - cd glib-$pkgver + cd glib ./configure --prefix=/usr --libdir=/usr/lib \ --disable-fam --enable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } check() { - cd glib-$pkgver + cd glib + # Takes an effing long time #make -k check || : } @@ -36,7 +45,7 @@ package() { options=('staticlibs') license=('LGPL') - cd glib-$pkgver + cd glib make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install # remove conflicting files |