Hello community, here is the log from the commit of package gnome-utils for openSUSE:Factory checked in at Wed Aug 3 17:12:51 CEST 2011.
-------- --- GNOME/gnome-utils/gnome-utils.changes 2011-06-16 15:39:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-utils/gnome-utils.changes 2011-07-28 09:17:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 28 09:08:15 CEST 2011 - vu...@opensuse.org + +- Add gnome-utils-no-deprecated.patch: do not use deprecated glib + API to fix build. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-utils-no-deprecated.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.TeJaY5/_old 2011-08-03 17:11:43.000000000 +0200 +++ /var/tmp/diff_new_pack.TeJaY5/_new 2011-08-03 17:11:43.000000000 +0200 @@ -19,12 +19,14 @@ Name: gnome-utils Version: 3.1.2 -Release: 1 +Release: 2 License: GPLv2+ Summary: Utilities for GNOME Url: http://www.gnome.org Group: System/GUI/GNOME Source: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/3.1/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gnome-utils-no-deprecated.patch bgo#655477 vu...@opensuse.org -- Do not use deprecated glib API, to fix build. Part is from git, part is submitted upstream. +Patch0: gnome-utils-no-deprecated.patch # PATCH-FIX-OPENSUSE gnome-utils-logview-run-as-root.patch Patch15: gnome-utils-logview-run-as-root.patch # PATCH-FIX-OPENSUSE gnome-utils-no-docpath-in-search-tool.patch vu...@novell.com -- Remove DocPath from the .desktop file (so that it doesnt appear in yelp toc) @@ -98,6 +100,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %patch15 -p0 %patch31 -p0 %patch32 -p0 ++++++ gnome-utils-no-deprecated.patch ++++++ commit ed1ef34044bcf73a2f834621dd3df0726c3d6a4e Author: Vincent Untz <vu...@gnome.org> Date: Thu Jul 28 09:00:53 2011 +0200 gsearchtool: Do not use deprecated g_format_size_for_display() https://bugzilla.gnome.org/show_bug.cgi?id=655477 diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c index 7c3df81..45235e8 100644 --- a/gsearchtool/gsearchtool.c +++ b/gsearchtool/gsearchtool.c @@ -858,7 +858,11 @@ add_file_to_search_results (const gchar * file, pixbuf = get_file_pixbuf (gsearch, file_info); description = get_file_type_description (file, file_info); +#if GLIB_CHECK_VERSION(2, 29, 14) + readable_size = g_format_size (g_file_info_get_size (file_info)); +#else readable_size = g_format_size_for_display (g_file_info_get_size (file_info)); +#endif g_file_info_get_modification_time (file_info, &time_val); readable_date = get_readable_date (gsearch->search_results_date_format_string, time_val.tv_sec); commit f8cb443db69cd71b7557536c39948a2af021b413 Author: Matthias Clasen <mcla...@redhat.com> Date: Sat Jul 23 22:53:58 2011 -0400 Fix the build with GLib >= 2.29.14 G_UNICODE_COMBINING_MARK has been deprecated in favor of the official Unicode name, G_UNICODE_SPACING_MARK. diff --git a/gnome-dictionary/libgdict/gdict-defbox.c b/gnome-dictionary/libgdict/gdict-defbox.c index 93223b1..0b41907 100644 --- a/gnome-dictionary/libgdict/gdict-defbox.c +++ b/gnome-dictionary/libgdict/gdict-defbox.c @@ -379,9 +379,16 @@ exact_prefix_cmp (const gchar *string, /* If string contains prefix, check that prefix is not followed * by a unicode mark symbol, e.g. that trailing 'a' in prefix * is not part of two-char a-with-hat symbol in string. */ + +#if GLIB_CHECK_VERSION(2, 29, 14) + return type != G_UNICODE_SPACING_MARK && + type != G_UNICODE_ENCLOSING_MARK && + type != G_UNICODE_NON_SPACING_MARK; +#else return type != G_UNICODE_COMBINING_MARK && type != G_UNICODE_ENCLOSING_MARK && type != G_UNICODE_NON_SPACING_MARK; +#endif } static const gchar * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
