File marco-gtk-3.20.patch of Package marco

Overview Repositories Revisions Requests Users Attributes Meta

File marco-gtk-3.20.patch of Package marco (Revision 3ab50794faaf9d7947a3fa3f714f825e)

Currently displaying revision 3ab50794faaf9d7947a3fa3f714f825e , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,7 @@ fi
 changequote([,])dnl
 
 GIO_MIN_VERSION=2.25.10
-GTK_MIN_VERSION=3.22.0
+GTK_MIN_VERSION=3.20.0
 
 MARCO_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 libcanberra-gtk3"
 
@@ -154,7 +154,7 @@ AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_F
 
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.50.0)
+PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.48.0)
 PKG_CHECK_MODULES(MARCO_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
 PKG_CHECK_MODULES(MARCO_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
 
--- a/src/ui/fixedtip.c
+++ b/src/ui/fixedtip.c
@@ -67,7 +67,11 @@ meta_fixed_tip_show (int root_x, int roo
 {
   gint w;
   gint h;
+#if GTK_CHECK_VERSION (3, 22, 0)
   GdkMonitor *mon_num;
+#else
+  int mon_num;
+#endif
   GdkRectangle monitor;
   gint screen_right_edge;
 
@@ -106,8 +110,13 @@ meta_fixed_tip_show (int root_x, int roo
 			G_CALLBACK (gtk_widget_destroyed), &tip);
     }
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   mon_num = gdk_display_get_monitor_at_point (gdk_screen_get_display (screen), root_x, root_y);
   gdk_monitor_get_geometry (mon_num, &monitor);
+#else
+  mon_num = gdk_screen_get_monitor_at_point (screen, root_x, root_y);
+  gdk_screen_get_monitor_geometry (screen, mon_num, &monitor);
+#endif
   screen_right_edge = monitor.x + monitor.width;
 
   gtk_label_set_markup (GTK_LABEL (label), markup_text);

Places

File marco-gtk-3.20.patch of Package marco (Revision 3ab50794faaf9d7947a3fa3f714f825e)

Places