diff --git a/gtk2.changes b/gtk2.changes index 4aff585..6382d06 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 12 19:21:53 CET 2007 - schwab@suse.de + +- Fix invalid casts. + ------------------------------------------------------------------- Fri Sep 28 17:22:28 CEST 2007 - btimothy@suse.de diff --git a/gtk2.spec b/gtk2.spec index 64fb8be..cd58d3a 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -23,12 +23,12 @@ BuildRequires: DirectFB-devel BuildRequires: fdupes openssl-devel %endif Url: http://www.gtk.org/ -License: LGPL v2 or later +License: LGPL v2.1 or later Group: System/Libraries AutoReqProv: on PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.12.0 -Release: 6 +Release: 26 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2 Source1: SuSEconfig.gtk2 @@ -51,6 +51,7 @@ Patch32: gtk2-set-invisible-char-to-circle.patch Patch35: gtk2-flash-player-busyloop.patch # PATCH-FIX-UPSTREAM gtk2-swt-tooltips.patch bnc326059 bgo460194 Patch36: gtk2-swt-tooltips.patch +Patch37: mtime.patch # Patches taken from upstream or slated to go upstream. We can expect these to become obsolete # in future releases. # Please don't delete this comment even if this section is empty -- "# empty" should @@ -216,6 +217,7 @@ cp -a %{S:2} . %patch32 -p1 %patch35 %patch36 -p1 +%patch37 %patch50 -p1 gnome-patch-translation-update @@ -368,7 +370,10 @@ fi %files doc %defattr(-,root,root) %{_datadir}/gtk-doc/html/* + %changelog +* Wed Dec 12 2007 - schwab@suse.de +- Fix invalid casts. * Fri Sep 28 2007 - btimothy@suse.de - Added gtk2-swt-tooltips.patch (bugzilla.gnome.org #460194) to fix bugzilla.novell.com #326059, a crash when mousing over diff --git a/mtime.patch b/mtime.patch new file mode 100644 index 0000000..2c9f563 --- /dev/null +++ b/mtime.patch @@ -0,0 +1,42 @@ +--- gtk/gtkfilechooserdefault.c ++++ gtk/gtkfilechooserdefault.c +@@ -11010,7 +11010,7 @@ list_mtime_data_func (GtkTreeViewColumn + gpointer data) + { + GtkFileChooserDefault *impl; +- GtkFileTime time_mtime; ++ time_t time_mtime; + gchar *date_str = NULL; + gboolean sensitive = TRUE; + +@@ -11050,7 +11050,7 @@ list_mtime_data_func (GtkTreeViewColumn + -1); + + if (info) +- time_mtime = (GtkFileTime) gtk_recent_info_get_modified (info); ++ time_mtime = gtk_recent_info_get_modified (info); + else + time_mtime = 0; + +@@ -11091,10 +11091,10 @@ list_mtime_data_func (GtkTreeViewColumn + gchar buf[256]; + + #ifdef HAVE_LOCALTIME_R +- localtime_r ((time_t *) &time_mtime, &tm_mtime); ++ localtime_r (&time_mtime, &tm_mtime); + #else + { +- struct tm *ptm = localtime ((time_t *) &time_mtime); ++ struct tm *ptm = localtime (&time_mtime); + + if (!ptm) + { +@@ -11107,7 +11107,7 @@ list_mtime_data_func (GtkTreeViewColumn + return; + } + else +- memcpy ((void *) &tm_mtime, (void *) ptm, sizeof (struct tm)); ++ tm_mtime = *ptm; + } + #endif /* HAVE_LOCALTIME_R */ +