Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 104 insertions, 3 deletions

diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 628285c67..4baaee60c 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	muffin
 PORTVERSION=	2.0.5
+PORTREVISION=	2
 CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -21,13 +22,13 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop
 RUN_DEPENDS=	zenity3>=3.0.0:${PORTSDIR}/x11/zenity3
 
+USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gnomedocutils gnomehier gnomeprefix gtk30 \
+		intlhack introspection:build
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_PYTHON=	yes
 USE_CSTD=	gnu89
-USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool autoconf automake
-USE_GNOME=	gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
-		intlhack introspection:build
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c b/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c
new file mode 100644
index 000000000..e99a9d229
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c
@@ -0,0 +1,14 @@
+--- src/compositor/meta-shaped-texture.c.orig	2014-03-31 10:15:32.429567385 +0000
++++ src/compositor/meta-shaped-texture.c	2014-03-31 10:15:38.680567395 +0000
+@@ -295,10 +295,8 @@
+       if (meta_texture_rectangle_check (paint_tex))
+         priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
+                                                          COGL_PIXEL_FORMAT_A_8,
+-                                                         COGL_PIXEL_FORMAT_A_8,
+                                                          stride,
+-                                                         mask_data,
+-                                                         NULL /* error */);
++                                                         mask_data);
+       else
+         priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                          COGL_TEXTURE_NONE,
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c
new file mode 100644
index 000000000..12c6c27db
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c
@@ -0,0 +1,26 @@
+--- src/compositor/meta-texture-rectangle.c.orig	2013-11-23 13:42:35.000000000 +0000
++++ src/compositor/meta-texture-rectangle.c	2014-03-31 08:00:34.766125773 +0000
+@@ -35,10 +35,8 @@
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error)
++                            const guint8 *data)
+ {
+   ClutterBackend *backend =
+     clutter_get_default_backend ();
+@@ -46,10 +44,7 @@
+     clutter_backend_get_cogl_context (backend);
+   CoglTextureRectangle *tex_rect;
+ 
+-  tex_rect = cogl_texture_rectangle_new_with_size (context,
+-                                                   width, height,
+-                                                   internal_format,
+-                                                   error);
++  tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
+   if (tex_rect == NULL)
+     return NULL;
+ 
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h
new file mode 100644
index 000000000..81593c066
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h
@@ -0,0 +1,14 @@
+--- src/compositor/meta-texture-rectangle.h.orig	2013-11-23 13:42:35.000000000 +0000
++++ src/compositor/meta-texture-rectangle.h	2014-03-31 08:00:34.766125773 +0000
+@@ -34,10 +34,8 @@
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error);
++                            const guint8 *data);
+ 
+ gboolean
+ meta_texture_rectangle_check (CoglTexture *texture);
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c
new file mode 100644
index 000000000..d605aece6
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c
@@ -0,0 +1,16 @@
+--- src/compositor/meta-texture-tower.c.orig	2013-11-23 13:42:35.000000000 +0000
++++ src/compositor/meta-texture-tower.c	2014-03-31 08:00:34.767127023 +0000
+@@ -365,13 +365,9 @@
+         meta_texture_rectangle_new (width, height,
+                                     /* data format */
+                                     TEXTURE_FORMAT,
+-                                    /* internal cogl format */
+-                                    TEXTURE_FORMAT,
+                                     /* rowstride */
+                                     width * 4,
+                                     /* data */
+-                                    NULL,
+-                                    /* error */
+                                     NULL);
+     }
+   else
diff --git a/x11-wm/muffin/files/patch-src_core_workspace.c b/x11-wm/muffin/files/patch-src_core_workspace.c
new file mode 100644
index 000000000..df0f30927
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_core_workspace.c
@@ -0,0 +1,11 @@
+--- src/core/workspace.c.orig	2014-03-31 10:09:40.196592078 +0000
++++ src/core/workspace.c	2014-03-31 10:10:09.573592076 +0000
+@@ -194,7 +194,7 @@
+   return workspace;
+ }
+ 
+-/** Foreach function for workspace_free_struts() */
++/* Foreach function for workspace_free_struts() */
+ static void
+ free_this (gpointer candidate, gpointer dummy)
+ {
diff --git a/x11-wm/muffin/files/patch-src_meta_prefs.h b/x11-wm/muffin/files/patch-src_meta_prefs.h
new file mode 100644
index 000000000..60eca494a
--- /dev/null
+++ b/x11-wm/muffin/files/patch-src_meta_prefs.h
@@ -0,0 +1,19 @@
+--- src/meta/prefs.h.orig	2014-03-31 10:09:49.951591487 +0000
++++ src/meta/prefs.h	2014-03-31 10:10:29.806588931 +0000
+@@ -310,13 +310,13 @@
+    */
+   GSList *bindings;
+ 
+-  /** for keybindings that can have shift or not like Alt+Tab */
++  /* for keybindings that can have shift or not like Alt+Tab */
+   gboolean      add_shift:1;
+ 
+-  /** for keybindings that apply only to a window */
++  /* for keybindings that apply only to a window */
+   gboolean      per_window:1;
+ 
+-  /** for keybindings not added with meta_display_add_keybinding() */
++  /* for keybindings not added with meta_display_add_keybinding() */
+   gboolean      builtin:1;
+ } MetaKeyPref;
+