rpms/gtkmm24/devel gtkmm24-2.21.1-gtkcalendar.patch, NONE, 1.1 gtkmm.spec, 1.64, 1.65

Mon Jul 5 18:26:51 UTC 2010

Author: hguemar

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24944

Modified Files:
	gtkmm.spec 
Added Files:
	gtkmm24-2.21.1-gtkcalendar.patch 
Log Message:
some spec fixes

gtkmm24-2.21.1-gtkcalendar.patch:
 gtkmm/calendar.cc    |   12 ++++++------
 gtkmm/calendar.h     |    6 +++---
 src/calendar.hg      |    6 +++---
 src/gtk_methods.defs |    6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE gtkmm24-2.21.1-gtkcalendar.patch ---
diff -up gtkmm-2.21.1/gtk/gtkmm/calendar.cc.gtkcalendar gtkmm-2.21.1/gtk/gtkmm/calendar.cc
--- gtkmm-2.21.1/gtk/gtkmm/calendar.cc.gtkcalendar	2010-06-23 10:13:11.000000000 +0300
+++ gtkmm-2.21.1/gtk/gtkmm/calendar.cc	2010-07-05 20:33:39.000000000 +0300
@@ -541,9 +541,9 @@ Calendar::Calendar()
 
 }
 
-int Calendar::select_month(guint month, guint year)
+void Calendar::select_month(guint month, guint year)
 {
-  return gtk_calendar_select_month(gobj(), month, year);
+gtk_calendar_select_month(gobj(), month, year); 
 }
 
 void Calendar::select_day(guint day)
@@ -551,14 +551,14 @@ void Calendar::select_day(guint day)
 gtk_calendar_select_day(gobj(), day); 
 }
 
-int Calendar::mark_day(guint day)
+void Calendar::mark_day(guint day)
 {
-  return gtk_calendar_mark_day(gobj(), day);
+gtk_calendar_mark_day(gobj(), day); 
 }
 
-int Calendar::unmark_day(guint day)
+void Calendar::unmark_day(guint day)
 {
-  return gtk_calendar_unmark_day(gobj(), day);
+gtk_calendar_unmark_day(gobj(), day); 
 }
 
 void Calendar::clear_marks()
diff -up gtkmm-2.21.1/gtk/gtkmm/calendar.h.gtkcalendar gtkmm-2.21.1/gtk/gtkmm/calendar.h
--- gtkmm-2.21.1/gtk/gtkmm/calendar.h.gtkcalendar	2010-06-23 10:13:11.000000000 +0300
+++ gtkmm-2.21.1/gtk/gtkmm/calendar.h	2010-07-05 20:33:39.000000000 +0300
@@ -208,7 +208,7 @@ public:
    * @param year The year the month is in.
    * @return <tt>true</tt>, always.
    */
-  int select_month(guint month, guint year);
+  void select_month(guint month, guint year);
   
   /** Selects a day from the current month.
    * @param day The day number between 1 and 31, or 0 to unselect 
@@ -220,13 +220,13 @@ public:
    * @param day The day number to mark between 1 and 31.
    * @return <tt>true</tt>, always.
    */
-  int mark_day(guint day);
+  void mark_day(guint day);
   
   /** Removes the visual marker from a particular day.
    * @param day The day number to unmark between 1 and 31.
    * @return <tt>true</tt>, always.
    */
-  int unmark_day(guint day);
+  void unmark_day(guint day);
   
   /** Remove all visual markers.
    */
diff -up gtkmm-2.21.1/gtk/src/calendar.hg.gtkcalendar gtkmm-2.21.1/gtk/src/calendar.hg
--- gtkmm-2.21.1/gtk/src/calendar.hg.gtkcalendar	2010-06-23 09:51:55.000000000 +0300
+++ gtkmm-2.21.1/gtk/src/calendar.hg	2010-07-05 20:33:39.000000000 +0300
@@ -59,10 +59,10 @@ class Calendar : public Widget
 public:
   _CTOR_DEFAULT
 
-  _WRAP_METHOD(int select_month(guint month, guint year), gtk_calendar_select_month)
+  _WRAP_METHOD(void select_month(guint month, guint year), gtk_calendar_select_month)
   _WRAP_METHOD(void select_day(guint day), gtk_calendar_select_day)
-  _WRAP_METHOD(int mark_day(guint day), gtk_calendar_mark_day)
-  _WRAP_METHOD(int unmark_day(guint day), gtk_calendar_unmark_day)
+  _WRAP_METHOD(void mark_day(guint day), gtk_calendar_mark_day)
+  _WRAP_METHOD(void unmark_day(guint day), gtk_calendar_unmark_day)
   _WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
 
   _WRAP_METHOD(void display_options(CalendarDisplayOptions flags),
diff -up gtkmm-2.21.1/gtk/src/gtk_methods.defs.gtkcalendar gtkmm-2.21.1/gtk/src/gtk_methods.defs
--- gtkmm-2.21.1/gtk/src/gtk_methods.defs.gtkcalendar	2010-06-23 09:51:55.000000000 +0300
+++ gtkmm-2.21.1/gtk/src/gtk_methods.defs	2010-07-05 20:33:39.000000000 +0300
@@ -5710,7 +5710,7 @@
 (define-method select_month
   (of-object "GtkCalendar")
   (c-name "gtk_calendar_select_month")
-  (return-type "gboolean")
+  (return-type "none")
   (parameters
     '("guint" "month")
     '("guint" "year")
@@ -5729,7 +5729,7 @@
 (define-method mark_day
   (of-object "GtkCalendar")
   (c-name "gtk_calendar_mark_day")
-  (return-type "gboolean")
+  (return-type "none")
   (parameters
     '("guint" "day")
   )
@@ -5738,7 +5738,7 @@
 (define-method unmark_day
   (of-object "GtkCalendar")
   (c-name "gtk_calendar_unmark_day")
-  (return-type "gboolean")
+  (return-type "none")
   (parameters
     '("guint" "day")
   )


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gtkmm.spec	5 Jul 2010 11:12:44 -0000	1.64
+++ gtkmm.spec	5 Jul 2010 18:26:50 -0000	1.65
@@ -8,10 +8,12 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.20/gtkmm-%{version}.tar.bz2
+# Temporary patch to get gtkmm building with gtk2-2.21.3
+Patch0:         gtkmm24-2.21.1-gtkcalendar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.24
-BuildRequires:  atk-devel >= 1.14
+BuildRequires:  atkmm-devel >= 2.21.2
 BuildRequires:  pango-devel
 BuildRequires:  gtk2-devel >= 2.20.0
 BuildRequires:  cairomm-devel >= 1.2.2
@@ -32,7 +34,7 @@ Requires:       %{name} = %{version}-%{r
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       glibmm24-devel
-Requires:       atk-devel
+Requires:       atkmm-devel
 Requires:       pangomm-devel
 Requires:       cairomm-devel
 Requires:       scrollkeeper
@@ -55,6 +57,7 @@ This package contains the full API docum
 
 %prep
 %setup -q -n gtkmm-%{version}
+%patch0 -p1 -b .gtkcalendar
 
 
 %build
@@ -105,7 +108,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %doc PORTING docs-to-include/*
 %{_includedir}/gtkmm-2.4
-%{_includedir}/atkmm-1.6
 %{_includedir}/gdkmm-2.4
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
@@ -123,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jul 05 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 2.21.1-1
 * Update to upstream 2.21.1
 - close RHBZ #610195 (first step for parallel installable Gtkmm stacks)
+- build patch from Kalev
 
 * Thu Apr 29 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 2.20.2-1
 - Update to upstream 2.20.2

