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

Accepting request 69048 from GNOME:Factory

Browse Source 
Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=109
This commit is contained in:
Sascha Peilicke 2011-05-02 10:11:35 +00:00 committed by Git OBS Bridge
commit 92b053ea17
5 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.28.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0605f538e5c022c237c97a34496979ba71d33c7b10b8d8edb84435498a651fb3
size 6824906

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578
size 6955725

45
glib2-fix-default-mime-handler.patch
View File

@ -1,45 +0,0 @@
commit 862c5a86d7ac24e1607749fe7c3ce772727c2691
Author: Vincent Untz <vuntz@gnome.org>
Date: Sun Feb 20 10:41:17 2011 +0100
appinfo: Do not override system default handler with less specific one
We were considering explicitly configured defaults for parent types
after we already got results for the specific type we're interested in.
This resulted in the explicit default for text/plain to override all
system defaults for subtypes of text/plain, for example. The explicit
default should not apply to subtypes that have a system default.
https://bugzilla.gnome.org/show_bug.cgi?id=642797
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 61ef54c..f81d3db 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -3059,14 +3059,18 @@ get_all_desktop_entries_for_mime_type (const char *base_mime_type,
{
dir = dir_list->data;
- /* Pick the explicit default application */
- entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type);
-
- if (entry != NULL)
+ /* Pick the explicit default application if we got no result earlier
+ * (ie, for more specific mime types) */
+ if (desktop_entries == NULL)
{
- /* Save the default entry if it's the first one we encounter */
- if (default_entry == NULL)
- default_entry = g_strdup (entry);
+ entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type);
+
+ if (entry != NULL)
+ {
+ /* Save the default entry if it's the first one we encounter */
+ if (default_entry == NULL)
+ default_entry = g_strdup (entry);
+ }
}
/* Then added associations from mimeapps.list */

50
glib2.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Tue Apr 19 08:43:37 UTC 2011 - fcrozat@novell.com
- Update to version 2.28.6:
+ Fix a possible crash when using g_settings_delay().
+ Various documentation clarifications.
+ Updated translation.
-------------------------------------------------------------------
Mon Apr 4 09:15:23 UTC 2011 - fcrozat@novell.com
- Update to version 2.28.5:
+ Fix some introspection annotations
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 21 17:46:26 UTC 2011 - fcrozat@novell.com
- Update to version 2.28.4:
+ Improve documentation of GSettings vendor override files
+ Updated translations.
- Changes from version 2.28.3:
+ Fix build with linux < 2.6.19
+ Bugs fixed:
- bgo#644465: undefined reference to `_usleep'
- bgo#644552: g_timeout_add_seconds(1, ...) may have a latency.
- bgo#644607: Correct internal definition of C_()
+ Updated translations.
- Changes from version 2.28.2:
+ Improved documentation:
- GApplication details are explained a lot more thoroughly
+ GVariant now supports NULL for empty arrays in varargs
+ Bugs fixed: bgo#613269, bgo#624943, bgo#637738, bgo#638185,
bgo#642797, bgo#642825, bgo#642944, bgo#643197, bgo#643468,
bgo#643478, bgo#643649, bgo#643780, bgo#643795.
+ Updated translations.
- Drop glib2-fix-default-mime-handler.patch: fixed upstream.
-------------------------------------------------------------------
Mon Feb 21 12:59:57 UTC 2011 - fcrozat@novell.com
- Update to version 2.28.1:
+ Format accepted by the GVariant parser has beend documented
+ The return value of g_datetime_compare() has been fixed to
match strcmp() semantics
+ Commandline utilities are now fully translated
+ Bugs fixed: bgo#635099, bgo#640489, bgo#642042, bgo#642052,
bgo#642490
+ Updated translations.
-------------------------------------------------------------------
Sun Feb 20 10:38:00 CET 2011 - vuntz@opensuse.org

9
glib2.spec
View File

@ -21,8 +21,8 @@
Name: glib2
%define _name glib
Version: 2.28.0
Release: 5
Version: 2.28.6
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
License: LGPLv2+
@ -50,8 +50,6 @@ 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
# PATCH-FIX-UPSTREAM glib2-fix-default-mime-handler.patch bgo#642797 vuntz@opensuse.org -- Fix default mime handler to not be the one of a user-configured less-specific mime type
Patch13: glib2-fix-default-mime-handler.patch
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -258,7 +256,6 @@ translation-update-upstream
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
cp -a %{S:1} %{S:2} %{S:3} .
cp -a %{S:4} gnome_defaults.conf
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
@ -283,7 +280,7 @@ autoreconf -fi -I m4macros
%endif
--with-runtime-libdir=../../%{_lib}
%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} V=1
%if 0%{?BUILD_FROM_VCS}
%{__make} ChangeLog
%endif