2010-04-06 Christian Kelly <[email protected]>
authorchrisk
Tue, 06 Apr 2010 14:08:13 +0000
changeset 17801 539b5f1aecbc
parent 17800 6d53d7229943
child 17802 850625cce130
2010-04-06 Christian Kelly <[email protected]> * base-specs/glibmm.spec, patches/glibmm-01-build.diff: Bump to 2.24.0.
ChangeLog
base-specs/glibmm.spec
patches/glibmm-01-build.diff
--- a/ChangeLog	Tue Apr 06 13:53:54 2010 +0000
+++ b/ChangeLog	Tue Apr 06 14:08:13 2010 +0000
@@ -1,3 +1,7 @@
+2010-04-06  Christian Kelly  <[email protected]>
+
+	* base-specs/glibmm.spec, patches/glibmm-01-build.diff: Bump to 2.24.0.
+
 2010-04-06  Christian Kelly  <[email protected]>
 
 	* SUNWgnome-panel: Fix %files.
--- a/base-specs/glibmm.spec	Tue Apr 06 13:53:54 2010 +0000
+++ b/base-specs/glibmm.spec	Tue Apr 06 14:08:13 2010 +0000
@@ -14,13 +14,13 @@
 Name:                    glibmm
 License:        	 LGPL
 Group:                   System/Libraries
-Version:                 2.23.3
+Version:                 2.24.0
 Release:                 1
 Distribution:            Java Desktop System
 Vendor:                  Sun Microsystems, Inc.
 Summary:                 glibmm - C++ Wrapper for the Glib2 Library
 URL:                     http://www.gtkmm.org/
-Source:                  http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.23/%{name}-%{version}.tar.bz2
+Source:                  http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.24/%{name}-%{version}.tar.bz2
 # date:2008-02-14 owner:gheet type:feature
 Patch1:                  glibmm-01-build.diff
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -66,6 +66,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Apr  6 2010 - [email protected]
+- Bump to 2.24.0.
 * Sat Mar 13 2010 - [email protected]
 - Bump to 2.23.3.
 * Mon Feb 15 2010 - [email protected]
--- a/patches/glibmm-01-build.diff	Tue Apr 06 13:53:54 2010 +0000
+++ b/patches/glibmm-01-build.diff	Tue Apr 06 14:08:13 2010 +0000
@@ -37,3 +37,22 @@
  
  bool Drive::is_media_removable() const
  {
+diff -ruN gio.orig/giomm/appinfo.cc gio/giomm/appinfo.cc
+--- gio.orig/giomm/appinfo.cc	2010-04-06 15:01:37.726524557 +0100
++++ gio/giomm/appinfo.cc	2010-04-06 15:01:57.272777485 +0100
+@@ -206,6 +206,7 @@
+ {
+   return Glib::RefPtr<AppLaunchContext>( new AppLaunchContext() );
+ }
++/*
+ std::string AppLaunchContext::get_display(const Glib::RefPtr<AppInfo>& info, const Glib::ListHandle< Glib::RefPtr<Gio::File> >& files)
+ {
+   return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_display(gobj(), Glib::unwrap(info), files.data()));
+@@ -215,6 +216,7 @@
+ {
+   return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_startup_notify_id(gobj(), Glib::unwrap(info), files.data()));
+ }
++*/
+ 
+ void AppLaunchContext::launch_failed(const std::string& startup_notify_id)
+ {