commit 87e6004057f1c301f624e91767ae72bee7def9d8 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Thu Sep 4 21:50:02 2014 +0200 Revert "glib: added patch for gsettings segfault." This reverts commit 3cd9c2a344dca979c72a503d3ef33072add5e6a6. diff --git a/glib/.md5sum b/glib/.md5sum index 96e07d8..8d8b91e 100644 --- a/glib/.md5sum +++ b/glib/.md5sum @@ -1,2 +1 @@ 05fb7cb17eacbc718e90366a1eae60d9 glib-2.40.0.tar.xz -a37f52249a3a1c8ca9b246f17b19191d no-schemas-segfault-fix.patch diff --git a/glib/Pkgfile b/glib/Pkgfile index e3e521e..a9a47ed 100644 --- a/glib/Pkgfile +++ b/glib/Pkgfile @@ -5,13 +5,11 @@ name=glib version=2.40.0 -release=2 -source=(http://download.gnome.org/sources/$name/2.40/$name-$version.tar.xz \ - no-schemas-segfault-fix.patch) +release=1 +source=(http://download.gnome.org/sources/$name/2.40/$name-$version.tar.xz) 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 deleted file mode 100644 index cb16586..0000000 --- a/glib/no-schemas-segfault-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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); - }