From bdfa8d7b9a70b5747c59cf21db9553a706dc8140 Mon Sep 17 00:00:00 2001 From: Fredrik Rinnestam Date: Tue, 7 Apr 2015 22:35:46 +0200 Subject: [PATCH] glib: updated to 2.44.0 --- glib/.footprint | 40 +++++++++------ glib/.md5sum | 3 +- glib/Pkgfile | 6 +-- glib/no-schemas-segfault-fix-2.patch | 77 ---------------------------- 4 files changed, 26 insertions(+), 100 deletions(-) delete mode 100644 glib/no-schemas-segfault-fix-2.patch diff --git a/glib/.footprint b/glib/.footprint index e90104ad7..b21eb8642 100644 --- a/glib/.footprint +++ b/glib/.footprint @@ -93,6 +93,7 @@ drwxr-xr-x root/root usr/include/glib-2.0/gio/ -rw-r--r-- root/root usr/include/glib-2.0/gio/ginetsocketaddress.h -rw-r--r-- root/root usr/include/glib-2.0/gio/ginitable.h -rw-r--r-- root/root usr/include/glib-2.0/gio/ginputstream.h +-rw-r--r-- root/root usr/include/glib-2.0/gio/gio-autocleanups.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gio.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gioenums.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gioenumtypes.h @@ -101,6 +102,8 @@ drwxr-xr-x root/root usr/include/glib-2.0/gio/ -rw-r--r-- root/root usr/include/glib-2.0/gio/gioscheduler.h -rw-r--r-- root/root usr/include/glib-2.0/gio/giostream.h -rw-r--r-- root/root usr/include/glib-2.0/gio/giotypes.h +-rw-r--r-- root/root usr/include/glib-2.0/gio/glistmodel.h +-rw-r--r-- root/root usr/include/glib-2.0/gio/gliststore.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gloadableicon.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gmemoryinputstream.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gmemoryoutputstream.h @@ -135,6 +138,7 @@ drwxr-xr-x root/root usr/include/glib-2.0/gio/ -rw-r--r-- root/root usr/include/glib-2.0/gio/gsimpleaction.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gsimpleactiongroup.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gsimpleasyncresult.h +-rw-r--r-- root/root usr/include/glib-2.0/gio/gsimpleiostream.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gsimplepermission.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gsimpleproxyresolver.h -rw-r--r-- root/root usr/include/glib-2.0/gio/gsocket.h @@ -208,6 +212,7 @@ drwxr-xr-x root/root usr/include/glib-2.0/glib/deprecated/ -rw-r--r-- root/root usr/include/glib-2.0/glib/gi18n.h -rw-r--r-- root/root usr/include/glib-2.0/glib/giochannel.h -rw-r--r-- root/root usr/include/glib-2.0/glib/gkeyfile.h +-rw-r--r-- root/root usr/include/glib-2.0/glib/glib-autocleanups.h -rw-r--r-- root/root usr/include/glib-2.0/glib/glist.h -rw-r--r-- root/root usr/include/glib-2.0/glib/gmacros.h -rw-r--r-- root/root usr/include/glib-2.0/glib/gmain.h @@ -260,6 +265,7 @@ drwxr-xr-x root/root usr/include/glib-2.0/gobject/ -rw-r--r-- root/root usr/include/glib-2.0/gobject/genums.h -rw-r--r-- root/root usr/include/glib-2.0/gobject/glib-types.h -rw-r--r-- root/root usr/include/glib-2.0/gobject/gmarshal.h +-rw-r--r-- root/root usr/include/glib-2.0/gobject/gobject-autocleanups.h -rw-r--r-- root/root usr/include/glib-2.0/gobject/gobject.h -rw-r--r-- root/root usr/include/glib-2.0/gobject/gobjectnotifyqueue.c -rw-r--r-- root/root usr/include/glib-2.0/gobject/gparam.h @@ -280,25 +286,25 @@ drwxr-xr-x root/root usr/lib/glib-2.0/ drwxr-xr-x root/root usr/lib/glib-2.0/include/ -rw-r--r-- root/root usr/lib/glib-2.0/include/glibconfig.h -rwxr-xr-x root/root usr/lib/libgio-2.0.la -lrwxrwxrwx root/root usr/lib/libgio-2.0.so -> libgio-2.0.so.0.4200.2 -lrwxrwxrwx root/root usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.4200.2 --rwxr-xr-x root/root usr/lib/libgio-2.0.so.0.4200.2 +lrwxrwxrwx root/root usr/lib/libgio-2.0.so -> libgio-2.0.so.0.4400.0 +lrwxrwxrwx root/root usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.4400.0 +-rwxr-xr-x root/root usr/lib/libgio-2.0.so.0.4400.0 -rwxr-xr-x root/root usr/lib/libglib-2.0.la -lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.4200.2 -lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.4200.2 --rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.4200.2 +lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.4400.0 +lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.4400.0 +-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.4400.0 -rwxr-xr-x root/root usr/lib/libgmodule-2.0.la -lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.4200.2 -lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.4200.2 --rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.4200.2 +lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.4400.0 +lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.4400.0 +-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.4400.0 -rwxr-xr-x root/root usr/lib/libgobject-2.0.la -lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.4200.2 -lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.4200.2 --rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.4200.2 +lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.4400.0 +lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.4400.0 +-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.4400.0 -rwxr-xr-x root/root usr/lib/libgthread-2.0.la -lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.4200.2 -lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.4200.2 --rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.4200.2 +lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.4400.0 +lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.4400.0 +-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.4400.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gio-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gio-unix-2.0.pc @@ -331,8 +337,8 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gsettings.m4 drwxr-xr-x root/root usr/share/gdb/ drwxr-xr-x root/root usr/share/gdb/auto-load/ --rwxr-xr-x root/root usr/share/gdb/auto-load/libglib-2.0.so.0.4200.2-gdb.py --rwxr-xr-x root/root usr/share/gdb/auto-load/libgobject-2.0.so.0.4200.2-gdb.py +-rwxr-xr-x root/root usr/share/gdb/auto-load/libglib-2.0.so.0.4400.0-gdb.py +-rwxr-xr-x root/root usr/share/gdb/auto-load/libgobject-2.0.so.0.4400.0-gdb.py drwxr-xr-x root/root usr/share/glib-2.0/ drwxr-xr-x root/root usr/share/glib-2.0/codegen/ -rw-r--r-- root/root usr/share/glib-2.0/codegen/__init__.py diff --git a/glib/.md5sum b/glib/.md5sum index 0e750ef87..ba5668e00 100644 --- a/glib/.md5sum +++ b/glib/.md5sum @@ -1,2 +1 @@ -ae9ee104932657ed08ef4679556be07f glib-2.42.2.tar.xz -24872bc2df71836f349a0b9f246e20bf no-schemas-segfault-fix-2.patch +74cf7b4ea200b76e42a4c22c8daf0f93 glib-2.44.0.tar.xz diff --git a/glib/Pkgfile b/glib/Pkgfile index dc8d4bc6d..5205a88c5 100644 --- a/glib/Pkgfile +++ b/glib/Pkgfile @@ -4,14 +4,12 @@ # Depends on: libpcre libffi python name=glib -version=2.42.2 +version=2.44.0 release=1 -source=(http://download.gnome.org/sources/$name/2.42/$name-$version.tar.xz \ - no-schemas-segfault-fix-2.patch) +source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz) build () { cd $name-$version - patch -p1 -i $SRC/no-schemas-segfault-fix-2.patch ./configure --prefix=/usr \ --disable-man \ diff --git a/glib/no-schemas-segfault-fix-2.patch b/glib/no-schemas-segfault-fix-2.patch deleted file mode 100644 index d13eceb4c..000000000 --- a/glib/no-schemas-segfault-fix-2.patch +++ /dev/null @@ -1,77 +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-04 20:50:16.923420403 +0200 -@@ -200,6 +200,9 @@ - GSettingsSchemaSource * - g_settings_schema_source_ref (GSettingsSchemaSource *source) - { -+ if (source == NULL) -+ g_error ("g_settings_schema_source_ref() called with source == NULL!"); -+ - g_atomic_int_inc (&source->ref_count); - - return source; -@@ -216,6 +219,9 @@ - void - g_settings_schema_source_unref (GSettingsSchemaSource *source) - { -+ if (source == NULL) -+ g_error ("g_settings_schema_source_unref() called with source == NULL!"); -+ - if (g_atomic_int_dec_and_test (&source->ref_count)) - { - if (source == schema_sources) -diff -u -N -r a/gio/gsettings-tool.c b/gio/gsettings-tool.c ---- a/gio/gsettings-tool.c 2014-02-03 18:40:41.000000000 +0100 -+++ b/gio/gsettings-tool.c 2014-09-04 21:09:40.306794238 +0200 -@@ -674,6 +674,8 @@ - gchar *tmp; - #endif - -+ GSettingsSchemaSource * schema_source; -+ - setlocale (LC_ALL, ""); - textdomain (GETTEXT_PACKAGE); - -@@ -692,7 +694,25 @@ - if (argc < 2) - return gsettings_help (FALSE, NULL); - -- global_schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ()); -+ if (strcmp (argv[1], "help") == 0) -+ if (argc == 2) -+ return gsettings_help (TRUE, NULL); -+ else -+ return gsettings_help (TRUE, argv[2]); -+ -+ if (argc == 2 && strcmp (argv[1], "--version") == 0) -+ { -+ gsettings_print_version(); -+ return 0; -+ } -+ -+ schema_source = g_settings_schema_source_get_default (); -+ if (schema_source == NULL) -+ { -+ g_printerr (_("No global schema source found!\n")); -+ return 1; -+ } -+ global_schema_source = g_settings_schema_source_ref (schema_source); - - if (argc > 3 && g_str_equal (argv[1], "--schemadir")) - { -@@ -715,13 +735,7 @@ - argc -= 2; - } - -- if (strcmp (argv[1], "help") == 0) -- return gsettings_help (TRUE, argv[2]); -- -- else if (argc == 2 && strcmp (argv[1], "--version") == 0) -- function = gsettings_print_version; -- -- else if (argc == 2 && strcmp (argv[1], "list-schemas") == 0) -+ if (argc == 2 && strcmp (argv[1], "list-schemas") == 0) - function = gsettings_list_schemas; - - else if (argc == 2 && strcmp (argv[1], "list-relocatable-schemas") == 0)