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

Accepting request 91061 from home:dimstar:GNOME:Next

Browse Source 
Pushing current Gnome 3.3 work to G:F... some work might be lumpy...

OBS-URL: https://build.opensuse.org/request/show/91061
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=168
This commit is contained in:
Vincent Untz 2011-11-15 09:01:46 +00:00 committed by Git OBS Bridge
parent 02ae6b814f
commit 747725c741
6 changed files with 98 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.30.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e560319450f31d85b6cdb2b530c3324a510ca04817e360943d0774327d21804
size 7770390

3
glib-2.31.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:071886b70b19d75e09ad0222d4b0abb388f2b840ec1c973218209bc781a52087
size 7787409

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

@ -1,16 +1,16 @@
Index: glib-2.19.5/glib/gkeyfile.c
Index: glib-2.31.0/glib/gkeyfile.c
===================================================================
--- glib-2.19.5.orig/glib/gkeyfile.c
+++ glib-2.19.5/glib/gkeyfile.c
@@ -83,6 +83,7 @@ struct _GKeyFile
--- glib-2.31.0.orig/glib/gkeyfile.c
+++ glib-2.31.0/glib/gkeyfile.c
@@ -446,6 +446,7 @@ struct _GKeyFile
GKeyFileFlags flags;
gchar **locales;
+ gchar *gettext_domain;
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
@@ -209,6 +210,7 @@ g_key_file_init (GKeyFile *key_file)
volatile gint ref_count;
};
@@ -577,6 +578,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@ -18,7 +18,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
}
static void
@@ -228,6 +230,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -596,6 +598,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -448,6 +456,11 @@ g_key_file_load_from_fd (GKeyFile
@@ -819,6 +827,11 @@ g_key_file_load_from_fd (GKeyFile
return FALSE;
}
@ -43,7 +43,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
return TRUE;
}
@@ -554,6 +567,11 @@ g_key_file_load_from_data (GKeyFile
@@ -925,6 +938,11 @@ g_key_file_load_from_data (GKeyFile
return FALSE;
}
@ -55,7 +55,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
return TRUE;
}
@@ -1662,6 +1680,8 @@ g_key_file_get_locale_string (GKeyFile
@@ -2105,6 +2123,8 @@ g_key_file_get_locale_string (GKeyFile
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@ -64,7 +64,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
@@ -1692,6 +1712,23 @@ g_key_file_get_locale_string (GKeyFile
@@ -2126,6 +2146,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE;
}
@ -88,7 +88,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -1708,6 +1745,39 @@ g_key_file_get_locale_string (GKeyFile
@@ -2142,6 +2179,39 @@ g_key_file_get_locale_string (GKeyFile
translated_value = NULL;
}
@ -128,11 +128,11 @@ Index: glib-2.19.5/glib/gkeyfile.c
/* Fallback to untranslated key
*/
if (!translated_value)
Index: glib-2.19.5/glib/gkeyfile.h
Index: glib-2.31.0/glib/gkeyfile.h
===================================================================
--- glib-2.19.5.orig/glib/gkeyfile.h
+++ glib-2.19.5/glib/gkeyfile.h
@@ -240,6 +240,7 @@ gboolean g_key_file_remove_group
--- glib-2.31.0.orig/glib/gkeyfile.h
+++ glib-2.31.0/glib/gkeyfile.h
@@ -258,6 +258,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_URL "URL"

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

@ -1,16 +1,16 @@
Index: glib-2.19.5/glib/gkeyfile.c
Index: glib-2.31.0/glib/gkeyfile.c
===================================================================
--- glib-2.19.5.orig/glib/gkeyfile.c
+++ glib-2.19.5/glib/gkeyfile.c
@@ -84,6 +84,7 @@ struct _GKeyFile
--- glib-2.31.0.orig/glib/gkeyfile.c
+++ glib-2.31.0/glib/gkeyfile.c
@@ -447,6 +447,7 @@ struct _GKeyFile
gchar **locales;
gchar *gettext_domain;
+ gchar *file_basename;
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
@@ -211,6 +212,7 @@ g_key_file_init (GKeyFile *key_file)
volatile gint ref_count;
};
@@ -579,6 +580,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
key_file->gettext_domain = NULL;
@ -18,7 +18,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
}
static void
@@ -236,6 +238,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -604,6 +606,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->gettext_domain = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -375,6 +383,39 @@ find_file_in_data_dirs (const gchar *f
@@ -747,6 +755,39 @@ find_file_in_data_dirs (const gchar *f
return fd;
}
@ -71,7 +71,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
static gboolean
g_key_file_load_from_fd (GKeyFile *key_file,
gint fd,
@@ -461,6 +502,9 @@ g_key_file_load_from_fd (GKeyFile
@@ -832,6 +873,9 @@ g_key_file_load_from_fd (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -81,7 +81,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
return TRUE;
}
@@ -510,6 +554,8 @@ g_key_file_load_from_file (GKeyFile
@@ -881,6 +925,8 @@ g_key_file_load_from_file (GKeyFile
return FALSE;
}
@ -90,7 +90,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
return TRUE;
}
@@ -572,6 +618,9 @@ g_key_file_load_from_data (GKeyFile
@@ -943,6 +989,9 @@ g_key_file_load_from_data (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -100,7 +100,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
return TRUE;
}
@@ -641,6 +690,9 @@ g_key_file_load_from_dirs (GKeyFile
@@ -1012,6 +1061,9 @@ g_key_file_load_from_dirs (GKeyFile
}
}
@ -110,7 +110,7 @@ Index: glib-2.19.5/glib/gkeyfile.c
if (found_file && full_path)
*full_path = output_path;
else
@@ -1756,12 +1808,38 @@ g_key_file_get_locale_string (GKeyFile
@@ -2190,12 +2242,38 @@ g_key_file_get_locale_string (GKeyFile
const gchar *translated;
gboolean has_gettext;
@ -153,11 +153,11 @@ Index: glib-2.19.5/glib/gkeyfile.c
g_free (orig_value);
Index: glib-2.19.5/glib/gkeyfile.h
Index: glib-2.31.0/glib/gkeyfile.h
===================================================================
--- glib-2.19.5.orig/glib/gkeyfile.h
+++ glib-2.19.5/glib/gkeyfile.h
@@ -240,7 +240,7 @@ gboolean g_key_file_remove_group
--- glib-2.31.0.orig/glib/gkeyfile.h
+++ glib-2.31.0/glib/gkeyfile.h
@@ -258,7 +258,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_URL "URL"

58
glib2.changes
View File

@ -1,3 +1,61 @@
-------------------------------------------------------------------
Thu Oct 27 08:29:41 UTC 2011 - dimstar@opensuse.org
- Update to version 2.31.0:
+ Major changes to threading and synchronisation
+ Move headers for some deprecated functionality to a separate
deprecated/ directory
+ New support for attribute-based deprecations to issue compiler
warnings instead of breaking the build and/or giving warnings
about implicit declarations
+ GCache has been deprecated
+ It is no longer possible to include individual headers.
+ The misguided experiment of allowing the program to stumble
along with missing GSettings schemas is now over.
+ Clarify that fork() is not valid while using GMainContext
+ GApplication:
- add ::shutdown signal as logical dual to ::startup
- don't use a GMainLoop: iterate the GMainContext directly
+ Several portability fixes for Windows, OpenBSD, Solaris
+ Add new GValue API to specifically deal in signed chars
+ some new API to mitigate the problems associated with calling
setenv() in a multi-threaded program
+ se CLOCK_MONOTONIC unconditionally if the libc has support at
compile time (ie: stop checking for kernel support at runtime)
+ pkg-config files:
- drop -uninstalled variants
- remove gobject dependency on gthread
+ New macro G_ATOMIC_LOCK_FREE is defined if the atomic
operations are implemented without use of a mutex
+ SOCKS proxy and resolver improvements
+ Fix the spelling of G_IO_FLAG_IS_WRITABLE (was WRITEABLE)
+ GDBus:
- many code generation updates and improvements
- some race condition fixes, including testcase hangs
+ GVariant:
- new g_variant_new_from_fixed_array() API
- substantial docs improvements/clarifications
+ GKeyFile is now refcounted and boxed
+ mount monitoring is now based on /proc/mounts instead of mtab
+ new macros G_SOURCE_CONTINUE and G_SOURCE_REMOVE for returning
from GSourceFunc
+ use xlocale functions where available
+ GMappedFile can now be created from an fd
+ many docs updates
+ Bugs fixed: bgo#70598, bgo#320888, bgo#398418, bgo#527214,
bgo#580505, bgo#583511, bgo#590808, bgo#592715, bgo#631413,
bgo#632049, bgo#640212, bgo#640293, bgo#640975, bgo#643934,
bgo#651268, bgo#653987, bgo#654412, bgo#654563, bgo#655366,
bgo#656621, bgo#656679, bgo#657992, bgo#658188, bgo#658206,
bgo#658207, bgo#658558, bgo#658683, bgo#658692, bgo#658715,
bgo#658769, bgo#658806, bgo#658976, bgo#659070, bgo#659082,
bgo#659212, bgo#659324, bgo#659423, bgo#659427, bgo#659646,
bgo#659690, bgo#659699, bgo#659754, bgo#659838, bgo#659866,
bgo#659870, bgo#659889, bgo#659916, bgo#659920, bgo#659923,
bgo#660013, bgo#660096, bgo#660130.
- Rebase glib2-bgo569829-gettext-gkeyfile.patch.
- Rebase glib2-fate300461-gettext-gkeyfile-suse.patch.
-------------------------------------------------------------------
Sat Oct 15 06:16:33 UTC 2011 - vuntz@opensuse.org

4
glib2.spec
View File

@ -21,7 +21,7 @@
Name: glib2
%define _name glib
Version: 2.30.1
Version: 2.31.0
Release: 1
# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
# FIXME: find out if tapsets should really be in devel package or in main package
@ -29,7 +29,7 @@ License: LGPLv2+
Summary: General-Purpose Utility Library
Url: http://www.gtk.org/
Group: System/Libraries
Source: http://download.gnome.org/sources/glib/2.30/%{_name}-%{version}.tar.bz2
Source: http://download.gnome.org/sources/glib/2.31/%{_name}-%{version}.tar.bz2
Source1: glib2.sh
Source2: glib2.csh
Source3: SuSEconfig.glib2