r2756 - in /unstable/evolution/debian: changelog patches/01-gtk-version.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Jun 11 19:16:11 2015
New Revision: 2756

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2756
Log:
* debian/patches/01-gtk-version.patch:
  + Patch from upstream git, fix build with gtk+ << 3.16.

Added:
    unstable/evolution/debian/patches/01-gtk-version.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2756&op=diff
==============================================================================
--- unstable/evolution/debian/changelog	(original)
+++ unstable/evolution/debian/changelog	Thu Jun 11 19:16:11 2015
@@ -3,6 +3,8 @@
   * New upstream release.
   * debian/control:
     + Bump build and runtime dependencies for e-d-s.
+  * debian/patches/01-gtk-version.patch:
+    + Patch from upstream git, fix build with gtk+ << 3.16.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 11 Jun 2015 20:37:43 +0200
 

Added: unstable/evolution/debian/patches/01-gtk-version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/01-gtk-version.patch?rev=2756&op=file
==============================================================================
--- unstable/evolution/debian/patches/01-gtk-version.patch	(added)
+++ unstable/evolution/debian/patches/01-gtk-version.patch	Thu Jun 11 19:16:11 2015
@@ -0,0 +1,46 @@
+From a60e1f2b76830a6251b66f8bd3bf4ef18f548f81 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 9 Jun 2015 23:27:49 +0200
+Subject: Soft-depend on gtk+ 3.12 and 3.16
+
+Recently added symbols were available only in gtk+ 3.12 and 3.16,
+but the dependency bump is not required yet, thus make it depend
+on the new functions conditionally.
+
+diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
+index a0294d5..7f37e9e 100644
+--- a/calendar/gui/e-day-view.c
++++ b/calendar/gui/e-day-view.c
+@@ -3125,8 +3125,13 @@ e_day_view_remove_event_cb (EDayView *day_view,
+ 		if (day_view->drag_event_num == event_num) {
+ 			day_view->drag_event_num = -1;
+ 			day_view->drag_event_day = -1;
+-			if (day_view->priv->drag_context)
++			if (day_view->priv->drag_context) {
++				#if GTK_CHECK_VERSION(3,16,0)
+ 				gtk_drag_cancel (day_view->priv->drag_context);
++				#else
++				gdk_drag_abort (day_view->priv->drag_context, gtk_get_current_event_time ());
++				#endif
++			}
+ 		} else {
+ 			day_view->drag_event_num--;
+ 		}
+diff --git a/modules/calendar/e-cal-base-shell-sidebar.c b/modules/calendar/e-cal-base-shell-sidebar.c
+index 8f2f920..79735e5 100644
+--- a/modules/calendar/e-cal-base-shell-sidebar.c
++++ b/modules/calendar/e-cal-base-shell-sidebar.c
+@@ -710,8 +710,10 @@ cal_base_shell_sidebar_constructed (GObject *object)
+ 
+ 		widget = e_calendar_new ();
+ 		gtk_widget_set_margin_top (widget, 6);
++		#if GTK_CHECK_VERSION(3,12,0)
+ 		gtk_widget_set_margin_start (widget, 6);
+ 		gtk_widget_set_margin_end (widget, 6);
++		#endif
+ 		calitem = E_CALENDAR (widget)->calitem;
+ 		e_calendar_item_set_days_start_week_sel (calitem, 9);
+ 		e_calendar_item_set_max_days_sel (calitem, 42);
+-- 
+cgit v0.10.2
+

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=2756&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series	(original)
+++ unstable/evolution/debian/patches/series	Thu Jun 11 19:16:11 2015
@@ -1,2 +1,3 @@
+01-gtk-version.patch
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch