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

Accepting request 99021 from GNOME:Factory

Browse Source 
Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=121
This commit is contained in:
Stephan Kulow 2012-01-06 10:44:02 +00:00 committed by Git OBS Bridge
commit 37b8b22731
7 changed files with 206 additions and 55 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.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26f082d3dfa017c73049a7f09333dd2114abd32849fd601394e35f4f8b34e49a
size 6040856

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"

150
glib2.changes
View File

@ -1,3 +1,153 @@
-------------------------------------------------------------------
Thu Dec 22 10:31:32 UTC 2011 - vuntz@opensuse.org
- Own %{_datadir}/aclocal to fix build without automake/autoconf.
-------------------------------------------------------------------
Tue Dec 20 09:09:19 UTC 2011 - vuntz@opensuse.org
- Update to version 2.31.6:
+ GApplication no longer has APIs for setting menus. Those have
been moved to GtkApplication.
+ The GActionGroup import/export functionality has been decoupled
from GApplication by the introduction of a new interface for
the purpose of handling platform data: GRemoteActionGroup. This
allows Gtk to properly deal with platform data (and gdk
threads) on window actions.
+ Lots of documentation improvements.
+ Bug fixes and a huge number of memory leak fixes.
+ The test suite now passes on ARM and some of the GDBus testcase
hangs we've been seeing have been resolved (although others
could remain).
+ g_bytes_get_data() API changed: now includes 'size' out
parameter
+ New g_queue_free_full() API similar to g_[s]list_free_full().
+ Desktop files: use standard "Keywords" now, not
"X-GNOME-Keywords".
+ gsettings commandline tool now has --schemadir option for
schemas not installed in the usual place (ie: as part of
plugins).
+ Bugs fixed: bgo#643736, bgo#657433, bgo#664699, bgo#665737,
bgo#665879, bgo#666113, bgo#666115, bgo#666145, bgo#666173,
bgo#666296, bgo#666415.
+ Updated translations.
-------------------------------------------------------------------
Tue Dec 13 12:33:58 UTC 2011 - dimstar@opensuse.org
- Update to version 2.31.4:
+ Experimental: Menu support has been added to GApplication.
+ GDBusConnection previously directly dispatched destroy notifies
when unregistering objects if the current main context was the
same context the object was exported on. It now unconditionally
dispatches these through an idle on the context.
+ Clean up requires in .pc files.
+ Introduce GBytes, a data type for immutable, fixed-size byte
sequences. This makes the pre-existing GBuffer API available
outside GLib
+ GDBusInterfaceSkeleton can now be exported on multiple
connections.
+ Bugs fixed: bgo#600161, bgo#640077, bgo#641720, bgo#648516,
bgo#651997, bgo#652560, bgo#662208, bgo#662718, bgo#663291,
bgo#664406, bgo#664455, bgo#664558, bgo#664559, bgo#664617,
bgo#664635, bgo#664809, bgo#665067, bgo#665184, bgo#665298,
bgo#665391, bgo#665607, bgo#665634, bgo#665685, bgo#665733.
- Add xz BuildRequires because we can't build a package for a
xz-compressed tarball without explicitly specifying that... See
bnc#697467 for more details.
- Update gtk-doc.m4 source from gtk-doc.
-------------------------------------------------------------------
Wed Nov 30 09:50:42 UTC 2011 - coolo@suse.com
- Add automake BuildRequires to avoid implicit dependency.
-------------------------------------------------------------------
Tue Nov 22 08:28:17 UTC 2011 - dimstar@opensuse.org
- Update to version 2.31.2:
+ Monotonic time is now properly supported on Windows
+ glib-mkenums: fix @ENUMPREFIX@ with /*< underscore_name=... >*/
+ EXPERIMENTAL: introduce new GSettingsSchema and
GSettingsSchemaSource APIs for the convenience of plugin system
authors and those who wish to introspect the contents of
schemas.
+ Improve the performance of GObject property notifies.
+ GDBus:
- fix a race when unowning a name immediately after owning it
- thread safety improvements on GDBusConnection
- fixes for exit-on-close functionality
+ GIO:
- GInetAddressMask: new type for internet address range
matching
- various GIO file and stream fixes
- improvements to attribute and fileinfo handling
+ Deprecations:
- add G_SIGNAL_DEPRECATED
- don't use G_DISABLE_DEPRECATED masking for functions anymore
+ docs
- tmpl/ is finally dead for glib
-------------------------------------------------------------------
Thu Oct 27 08:29:41 UTC 2011 - dimstar@opensuse.org
- Update to version 2.31.0:
+ Major changes to threading and synchronisation (see NEWS for
details).
+ New support for attribute-based deprecations to issue compiler
warnings instead of breaking the build and/or giving warnings
about implicit declarations
+ GApplication:
- add ::shutdown signal as logical dual to ::startup
- don't use a GMainLoop: iterate the GMainContext directly
+ 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
+ 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.
+ New macro G_ATOMIC_LOCK_FREE is defined if the atomic
operations are implemented without use of a mutex.
+ New macros G_SOURCE_CONTINUE and G_SOURCE_REMOVE for returning
from GSourceFunc.
+ GMappedFile can now be created from an fd.
+ GKeyFile is now refcounted and boxed.
+ SOCKS proxy and resolver improvements.
+ Mount monitoring is now based on /proc/mounts instead of mtab.
+ Use CLOCK_MONOTONIC unconditionally if the libc has support at
compile time (ie: stop checking for kernel support at runtime).
+ Use xlocale functions where available.
+ Fix the spelling of G_IO_FLAG_IS_WRITABLE (was WRITEABLE).
+ GCache has been deprecated.
+ Move headers for some deprecated functionality to a separate
deprecated/ directory
+ 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
+ Error message strings grammar/i18n fixes.
+ Several portability fixes for Windows, OpenBSD, Solaris.
+ pkg-config files:
- drop -uninstalled variants
- remove gobject dependency on gthread
+ 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

29
glib2.spec
View File

@ -15,21 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define with_systemtap 0
Name: glib2
%define _name glib
Version: 2.30.1
Release: 1
Version: 2.31.6
Release: 0
# 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
License: LGPLv2+
Summary: General-Purpose Utility Library
Url: http://www.gtk.org/
License: LGPL-2.1+
Group: System/Libraries
Source: http://download.gnome.org/sources/glib/2.30/%{_name}-%{version}.tar.bz2
Url: http://www.gtk.org/
Source: http://download.gnome.org/sources/glib/2.31/%{_name}-%{version}.tar.xz
Source1: glib2.sh
Source2: glib2.csh
Source3: SuSEconfig.glib2
@ -48,6 +47,7 @@ Patch10: glib2-bgo569829-gettext-gkeyfile.patch
Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch
# PATCH-FIX-UPSTREAM glib2-force-fam-for-remote-fs.patch bgo#592211 hpj@novell.com -- Try monitoring files on NFS mounts via FAM before falling back to inotify.
Patch12: glib2-force-fam-for-remote-fs.patch
BuildRequires: automake
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -64,6 +64,8 @@ BuildRequires: python
BuildRequires: systemtap-sdt-devel
%endif
BuildRequires: translation-update-upstream
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
BuildRequires: zlib-devel
BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libpcre)
@ -84,7 +86,6 @@ data types, macros, type conversions, string utilities, file utilities,
a main loop abstraction, and so on.
%package tools
License: LGPLv2+
Summary: General-Purpose Utility Library -- Tools
Group: Development/Libraries/C and C++
@ -94,7 +95,6 @@ data types, macros, type conversions, string utilities, file utilities,
a main loop abstraction, and so on.
%package -n gio-branding-upstream
License: LGPLv2+
Summary: Upstream definitions of default settings and applications
Group: System/Libraries
Requires: libgio-2_0-0 = %{version}
@ -121,7 +121,6 @@ GSettings and applications used by the MIME system.
%package devel
#'
License: LGPLv2+
Requires: %{name} = %{version} pkg-config glibc-devel
# Now require the subpackages too
Requires: glib2-tools = %{version}
@ -150,7 +149,6 @@ a main loop abstraction, and so on.
This package contains the development files for GLib.
%package devel-static
License: LGPLv2+
Requires: %{name}-devel = %{version}
Summary: General-Purpose Utility Library -- Static Libraries
Group: Development/Libraries/C and C++
@ -163,7 +161,6 @@ a main loop abstraction, and so on.
This package contains static versions of the GLib libraries.
%package -n libglib-2_0-0
License: LGPLv2+
Summary: General-Purpose Utility Library
Group: System/Libraries
Recommends: %{name}-lang
@ -181,7 +178,6 @@ data types, macros, type conversions, string utilities, file utilities,
a main loop abstraction, and so on.
%package -n libgmodule-2_0-0
License: LGPLv2+
Summary: General-Purpose Utility Library -- Library for Modules
Group: System/Libraries
@ -194,7 +190,6 @@ The libgmodule library provides a portable way to dynamically load
object files (commonly known as 'plug-ins').
%package -n libgio-2_0-0
License: LGPLv2+
Summary: General-Purpose Utility Library -- Library for VFS
Group: System/Libraries
Requires: gio-branding = %{version}
@ -215,7 +210,6 @@ a main loop abstraction, and so on.
GIO provides a modern, easy-to-use VFS API.
%package -n libgio-fam
License: LGPLv2+
Summary: General-Purpose Utility Library -- GIO Module to use FAM
Group: System/Libraries
# we need gio-querymodules in %post/%postun
@ -231,7 +225,6 @@ a main loop abstraction, and so on.
This packages provides a GIO module to use FAM for file monitoring.
%package -n libgthread-2_0-0
License: LGPLv2+
Summary: General-Purpose Utility Library -- Library for Threads
Group: System/Libraries
@ -244,7 +237,6 @@ The libgthread library provides a portable way to write multi-threaded
software.
%package -n libgobject-2_0-0
License: LGPLv2+
Summary: General-Purpose Utility Library -- Object-Oriented Framework for C
Group: System/Libraries
@ -455,7 +447,10 @@ rm -rf %{buildroot}
%doc %{_mandir}/man?/gobject-query.*
%doc %{_mandir}/man?/gtester.*
%doc %{_mandir}/man?/gtester-report.*
%{_datadir}/aclocal/*.m4
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/glib-2.0.m4
%{_datadir}/aclocal/glib-gettext.m4
%{_datadir}/aclocal/gsettings.m4
%dir %{_datadir}/glib-2.0/
%{_datadir}/glib-2.0/gdb/
%{_datadir}/glib-2.0/gettext/

6
gtk-doc.m4
View File

@ -6,6 +6,7 @@ dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then
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,,)
fi
fi
AC_MSG_CHECKING([whether to build gtk-doc documentation])