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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=33

Browse Source
This commit is contained in:
OBS User unknown 2008-04-20 12:47:11 +00:00 committed by Git OBS Bridge
parent 875d264689
commit b896df2bf8
3 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
glib2-fix-bookmark-leak.diff Normal file
View File

@ -0,0 +1,33 @@
commit b3de48d192e0818be8d591af15f5ba7158890f2d
Author: federico <federico@5bbd4a9e-d125-0410-bf1d-f987e7eefc80>
Date: Wed Apr 9 20:20:19 2008 +0000
Don't leak apps_by_name in GBookmarkFile metadata items
2008-04-09 Federico Mena Quintero <federico@novell.com>
* glib/gbookmarkfile.c (bookmark_metadata_free): Don't leak
the apps_by_name hash table if the applications list is empty.
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
git-svn-id: svn+ssh://svn.gnome.org/svn/glib/trunk@6846 5bbd4a9e-d125-0410-bf1d-f987e7eefc80
Index: glib-2.16.3/glib/gbookmarkfile.c
===================================================================
--- glib-2.16.3.orig/glib/gbookmarkfile.c
+++ glib-2.16.3/glib/gbookmarkfile.c
@@ -325,10 +325,10 @@ bookmark_metadata_free (BookmarkMetadata
(GFunc) bookmark_app_info_free,
NULL);
g_list_free (metadata->applications);
-
- g_hash_table_destroy (metadata->apps_by_name);
}
-
+
+ g_hash_table_destroy (metadata->apps_by_name);
+
g_free (metadata->icon_href);
g_free (metadata->icon_mime);

11
glib2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Apr 14 23:54:54 CEST 2008 - maw@suse.de
- Add glib2-fix-bookmark-leak.diff.
-------------------------------------------------------------------
Mon Apr 14 19:16:16 CEST 2008 - sbrabec@suse.cz
- Use packageand form of branding supplement and removed self
conflict.
-------------------------------------------------------------------
Sat Apr 12 00:10:15 CEST 2008 - maw@suse.de

19
glib2.spec
View File

@ -18,7 +18,7 @@ License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 2.16.3
Release: 2
Release: 4
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@ -34,16 +34,18 @@ Source5: gtk-doc.m4
Patch0: glib2-mkinstalldirs.patch
# PATCH-FIX-OPENSUSE glib2-aclocal.patch
Patch1: glib2-aclocal.patch
# PATCH-FIX-NEEDS-REBASE glib2-cast.patch
# PATCH-FIX-NEEDS-REBASE glib2-cast.patch -- This patch doesn't necessarily need a rebase; it might be better off dropped entirely instead.
Patch2: glib2-cast.patch
# PATCH-FIX-UPSTREAM glib2-allocsize.patch bgo523019 meissner@suse.de -- marks malloc-style functions to detect memory problems at compile time
Patch3: glib2-allocsize.patch
# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo518160-gbookmark-optimizations.diff bnc373149 bgo518160 federico@novell.com - backport GBookmark optimizations (1)
# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo518160-gbookmark-optimizations.diff bnc373149 bgo518160 federico@novell.com -- backport GBookmark optimizations (1)
Patch4: glib2-bnc373149-bgo518160-gbookmark-optimizations.diff
# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo523877-gbookmark-optimizations.diff bnc373149 bgo523877 federico@novell.com - backport GBookmark optimizations (2)
# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo523877-gbookmark-optimizations.diff bnc373149 bgo523877 federico@novell.com -- backport GBookmark optimizations (2)
Patch5: glib2-bnc373149-bgo523877-gbookmark-optimizations.diff
# PATCH-FIX-UPSTREAM glib2-libtool.diff schwab@suse.de -- apparently configure.in is invoking libtool in a bad way
Patch6: glib2-libtool.diff
# PATCH-FIX-UPSTREAM glib2-fix-bookmark-leak.diff federico@novell.com -- Don't leak apps_by_name in GBookmarkFile metadata items
Patch7: glib2-fix-bookmark-leak.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
# For temporary %%pre script only.
@ -81,7 +83,7 @@ License: LGPL v2.1 or later
Summary: Definition of GNOME Default Applications
Group: Development/Libraries/C and C++
Provides: %{name}-branding = %{version}
Conflicts: %{name}-branding
Supplements: packageand(branding-upstream:%{name})
#BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
#BRAND: applications as preferred defaults.
# NOTE: gnome_defaults is not an upstream feature, but a SuSE
@ -117,6 +119,7 @@ Authors:
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
%package devel
#'
License: GPL v2 or later
Requires: %{name} = %{version} pcre-devel pkg-config glibc-devel
# Now require the subpackages too
@ -371,6 +374,7 @@ Authors:
%patch4 -p1
%patch5 -p1
%patch6
%patch7 -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
@ -501,6 +505,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gtk-doc/html
%changelog
* Tue Apr 15 2008 maw@suse.de
- Add glib2-fix-bookmark-leak.diff.
* Mon Apr 14 2008 sbrabec@suse.cz
- Use packageand form of branding supplement and removed self
conflict.
* Sat Apr 12 2008 maw@suse.de
- Tag glib2-libtool.diff, which was added in the previous
submission.