diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2014-09-02 21:30:15 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2014-09-02 21:31:29 +0200 |
| commit | 3cd9c2a344dca979c72a503d3ef33072add5e6a6 (patch) | |
| tree | 567690c0274e9e06e951c03d4f6e3c385b717fbc /glib | |
| parent | 604bd3c66f3a969c5c1d9c601ae2f9300cdc2fae (diff) | |
| download | opt-3cd9c2a344dca979c72a503d3ef33072add5e6a6.tar.gz opt-3cd9c2a344dca979c72a503d3ef33072add5e6a6.tar.xz | |
glib: added patch for gsettings segfault.
Thanks to Torsten Henschel for the bugreport and
Kristian Lehmann for the patch.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/.md5sum | 1 | ||||
| -rw-r--r-- | glib/Pkgfile | 6 | ||||
| -rw-r--r-- | glib/no-schemas-segfault-fix.patch | 13 |
3 files changed, 18 insertions, 2 deletions
diff --git a/glib/.md5sum b/glib/.md5sum index 8d8b91eea..96e07d891 100644 --- a/glib/.md5sum +++ b/glib/.md5sum @@ -1 +1,2 @@ 05fb7cb17eacbc718e90366a1eae60d9 glib-2.40.0.tar.xz +a37f52249a3a1c8ca9b246f17b19191d no-schemas-segfault-fix.patch diff --git a/glib/Pkgfile b/glib/Pkgfile index a9a47ed9b..e3e521e48 100644 --- a/glib/Pkgfile +++ b/glib/Pkgfile @@ -5,11 +5,13 @@ name=glib version=2.40.0 -release=1 -source=(http://download.gnome.org/sources/$name/2.40/$name-$version.tar.xz) +release=2 +source=(http://download.gnome.org/sources/$name/2.40/$name-$version.tar.xz \ + no-schemas-segfault-fix.patch) build () { cd $name-$version + patch -p1 -i $SRC/no-schemas-segfault-fix.patch ./configure --prefix=/usr \ --disable-man \ diff --git a/glib/no-schemas-segfault-fix.patch b/glib/no-schemas-segfault-fix.patch new file mode 100644 index 000000000..cb16586dc --- /dev/null +++ b/glib/no-schemas-segfault-fix.patch @@ -0,0 +1,13 @@ +diff -u -N -r a/gio/gsettingsschema.c b/gio/gsettingsschema.c +--- a/gio/gsettingsschema.c 2014-02-12 21:08:36.000000000 +0100 ++++ b/gio/gsettingsschema.c 2014-09-01 21:40:30.200058426 +0200 +@@ -343,6 +343,9 @@ + + if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) + try_prepend_dir (path); ++ ++ if (schema_sources == NULL) ++ g_error ("No schemas found. Please make sure they are compiled!"); + + g_once_init_leave (&initialised, TRUE); + } |