Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-release-src > by-pkgid > 83ed4e9dde660c2223d839a29c3ae001 > files > 1

cairo-dock-3.4.0-1.mga5.src.rpm

--- cairo-dock-3.2.1/CMakeLists.txt~	2013-08-18 00:17:38.702037366 +0800
+++ cairo-dock-3.2.1/CMakeLists.txt	2013-08-18 00:18:05.982832578 +0800
@@ -126,7 +126,7 @@
 
 STRING (REGEX REPLACE "\\..*" "" GTK_MAJOR "${GTK_VERSION}")
 
-add_definitions (-DGTK_DISABLE_DEPRECATED="1")
+# add_definitions (-DGTK_DISABLE_DEPRECATED="1")
 # add_definitions (-DG_DISABLE_DEPRECATED="1")
 
 # We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
--- cairo-dock-3.2.1/Help/src/applet-tips-dialog.c.orig	2013-03-23 23:55:12.000000000 +0800
+++ cairo-dock-3.2.1/Help/src/applet-tips-dialog.c	2013-09-24 14:39:00.610670214 +0800
@@ -318,7 +318,12 @@
 	attr.pActionFunc = (CairoDockActionOnAnswerFunc)_tips_dialog_action;
 	attr.pUserData = pTips;
 	attr.pFreeDataFunc = (GFreeFunc)_on_free_tips_dialog;
+	/// GTK_STOCK is now deprecated, here is a temporary fix to avoid compilation errors
+#if GTK_CHECK_VERSION(3, 9, 8)
+	const gchar *cButtons[] = {"cancel", "gtk-go-forward-rtl", "gtk-go-forward-ltr", NULL};
+#else
 	const gchar *cButtons[] = {"cancel", GTK_STOCK_GO_FORWARD"-rtl", GTK_STOCK_GO_FORWARD"-ltr", NULL};
+#endif
 	attr.cButtonsImage = cButtons;
 	attr.bUseMarkup = TRUE;
 	
--- cairo-dock-3.2.1/src/gldit/cairo-dock-flying-container.c.orig	2013-03-23 23:55:12.000000000 +0800
+++ cairo-dock-3.2.1/src/gldit/cairo-dock-flying-container.c	2013-09-24 14:39:39.941785957 +0800
@@ -63,7 +63,12 @@
 	const gchar *cImage = NULL;
 	if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pIcon))
 	{
+		/// GTK_STOCK is now deprecated, here is a temporary fix to avoid compilation errors
+#if GTK_CHECK_VERSION(3, 9, 8)
+		cImage = "gtk-jump-to-rtl";
+#else
 		cImage = GTK_STOCK_JUMP_TO"-rtl";  // GTK_STOCK_JUMP_TO only doesn't exist.
+#endif
 	}
 	else
 	{