summaryrefslogtreecommitdiffstats
path: root/x11-wm/muffin/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/muffin/files')
-rw-r--r--x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c14
-rw-r--r--x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c26
-rw-r--r--x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h14
-rw-r--r--x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c16
-rw-r--r--x11-wm/muffin/files/patch-src_makefile.am11
5 files changed, 0 insertions, 81 deletions
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
deleted file mode 100644
index e99a9d229..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 12c6c27db..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index 81593c066..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index d605aece6..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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_makefile.am b/x11-wm/muffin/files/patch-src_makefile.am
deleted file mode 100644
index abfc0f984..000000000
--- a/x11-wm/muffin/files/patch-src_makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig.am 2013-02-24 10:55:25.339517972 +0100
-+++ src/Makefile.am 2013-02-24 10:56:23.792517007 +0100
-@@ -294,7 +294,7 @@
- inlinepixbufs.h: $(IMAGES)
- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-
- pkgconfig_DATA = libmuffin.pc muffin-plugins.pc
-