pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 180472 from home:dimstar:branches:GNOME:Factory

Browse Source 
Update to 2.37.2 - incl. new gtk-doc.m4

OBS-URL: https://build.opensuse.org/request/show/180472
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=228
This commit is contained in:
Dominique Leuenberger 2013-06-23 13:45:50 +00:00 committed by Git OBS Bridge
parent 4131f550b0
commit b2c619dc63
7 changed files with 66 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.37.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7304a453d6893448cb9f49fa585456b57275a07cd7a14e847454a6077001e7d2
size 6638012

3
glib-2.37.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79425f5907a150fab870287a574f9b8093106cc7a8956a024562c0c637e29a7a
size 6681148

32
glib2-bgo569829-gettext-gkeyfile.patch
View File

@ -1,8 +1,8 @@
Index: glib-2.31.0/glib/gkeyfile.c Index: glib-2.37.2/glib/gkeyfile.c
=================================================================== ===================================================================
--- glib-2.31.0.orig/glib/gkeyfile.c --- glib-2.37.2.orig/glib/gkeyfile.c
+++ glib-2.31.0/glib/gkeyfile.c +++ glib-2.37.2/glib/gkeyfile.c
@@ -446,6 +446,7 @@ struct _GKeyFile @@ -445,6 +445,7 @@ struct _GKeyFile
GKeyFileFlags flags; GKeyFileFlags flags;
gchar **locales; gchar **locales;
@ -10,7 +10,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
volatile gint ref_count; volatile gint ref_count;
}; };
@@ -577,6 +578,7 @@ g_key_file_init (GKeyFile *key_file) @@ -569,6 +570,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->list_separator = ';'; key_file->list_separator = ';';
key_file->flags = 0; key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@ -18,7 +18,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
} }
static void static void
@@ -596,6 +598,12 @@ g_key_file_clear (GKeyFile *key_file) @@ -588,6 +590,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL; key_file->parse_buffer = NULL;
} }
@ -31,7 +31,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
tmp = key_file->groups; tmp = key_file->groups;
while (tmp != NULL) while (tmp != NULL)
{ {
@@ -819,6 +827,11 @@ g_key_file_load_from_fd (GKeyFile @@ -803,6 +811,11 @@ g_key_file_load_from_fd (GKeyFile
return FALSE; return FALSE;
} }
@ -43,7 +43,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -925,6 +938,11 @@ g_key_file_load_from_data (GKeyFile @@ -908,6 +921,11 @@ g_key_file_load_from_data (GKeyFile
return FALSE; return FALSE;
} }
@ -55,7 +55,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -2105,6 +2123,8 @@ g_key_file_get_locale_string (GKeyFile @@ -2083,6 +2101,8 @@ g_key_file_get_locale_string (GKeyFile
GError *key_file_error; GError *key_file_error;
gchar **languages; gchar **languages;
gboolean free_languages = FALSE; gboolean free_languages = FALSE;
@ -64,7 +64,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
gint i; gint i;
g_return_val_if_fail (key_file != NULL, NULL); g_return_val_if_fail (key_file != NULL, NULL);
@@ -2126,6 +2146,23 @@ g_key_file_get_locale_string (GKeyFile @@ -2104,6 +2124,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE; free_languages = FALSE;
} }
@ -88,7 +88,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
for (i = 0; languages[i]; i++) for (i = 0; languages[i]; i++)
{ {
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2142,6 +2179,39 @@ g_key_file_get_locale_string (GKeyFile @@ -2120,6 +2157,39 @@ g_key_file_get_locale_string (GKeyFile
translated_value = NULL; translated_value = NULL;
} }
@ -128,14 +128,14 @@ Index: glib-2.31.0/glib/gkeyfile.c
/* Fallback to untranslated key /* Fallback to untranslated key
*/ */
if (!translated_value) if (!translated_value)
Index: glib-2.31.0/glib/gkeyfile.h Index: glib-2.37.2/glib/gkeyfile.h
=================================================================== ===================================================================
--- glib-2.31.0.orig/glib/gkeyfile.h --- glib-2.37.2.orig/glib/gkeyfile.h
+++ glib-2.31.0/glib/gkeyfile.h +++ glib-2.37.2/glib/gkeyfile.h
@@ -258,6 +258,7 @@ gboolean g_key_file_remove_group @@ -306,6 +306,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass" #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
#define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain" +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application" #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application"

34
glib2-fate300461-gettext-gkeyfile-suse.patch
View File

@ -1,8 +1,8 @@
Index: glib-2.31.0/glib/gkeyfile.c Index: glib-2.37.2/glib/gkeyfile.c
=================================================================== ===================================================================
--- glib-2.31.0.orig/glib/gkeyfile.c --- glib-2.37.2.orig/glib/gkeyfile.c
+++ glib-2.31.0/glib/gkeyfile.c +++ glib-2.37.2/glib/gkeyfile.c
@@ -447,6 +447,7 @@ struct _GKeyFile @@ -446,6 +446,7 @@ struct _GKeyFile
gchar **locales; gchar **locales;
gchar *gettext_domain; gchar *gettext_domain;
@ -10,7 +10,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
volatile gint ref_count; volatile gint ref_count;
}; };
@@ -579,6 +580,7 @@ g_key_file_init (GKeyFile *key_file) @@ -571,6 +572,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->flags = 0; key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
key_file->gettext_domain = NULL; key_file->gettext_domain = NULL;
@ -18,7 +18,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
} }
static void static void
@@ -604,6 +606,12 @@ g_key_file_clear (GKeyFile *key_file) @@ -596,6 +598,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->gettext_domain = NULL; key_file->gettext_domain = NULL;
} }
@ -31,7 +31,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
tmp = key_file->groups; tmp = key_file->groups;
while (tmp != NULL) while (tmp != NULL)
{ {
@@ -747,6 +755,39 @@ find_file_in_data_dirs (const gchar *f @@ -739,6 +747,39 @@ find_file_in_data_dirs (const gchar *f
return fd; return fd;
} }
@ -71,7 +71,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
static gboolean static gboolean
g_key_file_load_from_fd (GKeyFile *key_file, g_key_file_load_from_fd (GKeyFile *key_file,
gint fd, gint fd,
@@ -832,6 +873,9 @@ g_key_file_load_from_fd (GKeyFile @@ -816,6 +857,9 @@ g_key_file_load_from_fd (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL); NULL);
@ -81,7 +81,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -881,6 +925,8 @@ g_key_file_load_from_file (GKeyFile @@ -865,6 +909,8 @@ g_key_file_load_from_file (GKeyFile
return FALSE; return FALSE;
} }
@ -90,7 +90,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -943,6 +989,9 @@ g_key_file_load_from_data (GKeyFile @@ -926,6 +972,9 @@ g_key_file_load_from_data (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL); NULL);
@ -100,7 +100,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -1012,6 +1061,9 @@ g_key_file_load_from_dirs (GKeyFile @@ -995,6 +1044,9 @@ g_key_file_load_from_dirs (GKeyFile
} }
} }
@ -110,7 +110,7 @@ Index: glib-2.31.0/glib/gkeyfile.c
if (found_file && full_path) if (found_file && full_path)
*full_path = output_path; *full_path = output_path;
else else
@@ -2190,12 +2242,38 @@ g_key_file_get_locale_string (GKeyFile @@ -2168,12 +2220,38 @@ g_key_file_get_locale_string (GKeyFile
const gchar *translated; const gchar *translated;
gboolean has_gettext; gboolean has_gettext;
@ -153,14 +153,14 @@ Index: glib-2.31.0/glib/gkeyfile.c
g_free (orig_value); g_free (orig_value);
Index: glib-2.31.0/glib/gkeyfile.h Index: glib-2.37.2/glib/gkeyfile.h
=================================================================== ===================================================================
--- glib-2.31.0.orig/glib/gkeyfile.h --- glib-2.37.2.orig/glib/gkeyfile.h
+++ glib-2.31.0/glib/gkeyfile.h +++ glib-2.37.2/glib/gkeyfile.h
@@ -258,7 +258,7 @@ gboolean g_key_file_remove_group @@ -306,7 +306,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass" #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
#define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
-#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain" -#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain"

24
glib2.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jun 21 18:36:28 UTC 2013 - dimstar@opensuse.org
- Update gtk-doc.m4 from gtk-doc 1.19.
-------------------------------------------------------------------
Fri Jun 21 08:44:21 UTC 2013 - dimstar@opensuse.org
- Update to version 2.37.2:
+ The GLib test utilities have grown some file-related APIs
to support tests that can be used installed and uninstalled.
+ Installing properties after class initialization is deprecated,
and will trigger a warning.
+ GApplication:
- Support org.freedesktop.Application, including D-Bus
activation from desktop files.
- Set prgname to appid for services.
+ Bugs fixed: bgo#549783, bgo#692848, bgo#698018, bgo#698614,
bgo#699259, bgo#699959, bgo#700123, bgo#700725, bgo#701401,
bgo#701456, bgo#701474, bgo#701560, bgo#701680, bgo#701878.
+ Updated translations.
- Rebase glib2-bgo569829-gettext-gkeyfile.patch.
- Rebase glib2-fate300461-gettext-gkeyfile-suse.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 28 06:43:59 UTC 2013 - dimstar@opensuse.org Tue May 28 06:43:59 UTC 2013 - dimstar@opensuse.org

2
glib2.spec
View File

@ -20,7 +20,7 @@
Name: glib2 Name: glib2
%define _name glib %define _name glib
Version: 2.37.1 Version: 2.37.2
Release: 0 Release: 0
# FIXME: Remove libtool BuildRequires and autoreconf call # FIXME: Remove libtool BuildRequires and autoreconf call
# FIXME: find out if tapsets should really be in devel package or in main package # FIXME: find out if tapsets should really be in devel package or in main package

6
gtk-doc.m4
View File

@ -37,7 +37,7 @@ AC_DEFUN([GTK_DOC_CHECK],
dnl don't check for glib if we build glib dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then if test "x$PACKAGE_NAME" != "xglib"; then
dnl don't fail if someone does not have glib dnl don't fail if someone does not have glib
PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
fi fi
fi fi
@ -58,6 +58,10 @@ AC_DEFUN([GTK_DOC_CHECK],
enable_gtk_doc_pdf=no enable_gtk_doc_pdf=no
fi fi
if test -z "$AM_DEFAULT_VERBOSITY"; then
AM_DEFAULT_VERBOSITY=1
fi
AC_SUBST([AM_DEFAULT_VERBOSITY])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])