Your message dated Thu, 27 Mar 2014 21:22:49 +0000
with message-id <[email protected]>
and subject line Bug#742790: fixed in muffin 1.7.3-2
has caused the Debian Bug report #742790,
regarding muffin: FTBFS with new cogl
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
742790: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742790
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: muffin
Version: 1.7.3-1
Severity: serious
Tags: patch
Hi,
muffin FTBFS with the new cogl. The attached debdiff fixes this issue.
I plan to NMU this RSN if no action is taken, as this is going to block
the cogl transition soon.
Regards,
Emilio
diff -Nru muffin-1.7.3/debian/changelog muffin-1.7.3/debian/changelog
--- muffin-1.7.3/debian/changelog 2013-04-21 13:02:14.000000000 +0200
+++ muffin-1.7.3/debian/changelog 2014-03-27 15:12:13.000000000 +0100
@@ -1,3 +1,13 @@
+muffin (1.7.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/0001-Update-for-Cogl-API-breaks.patch:
+ + Fix build with new cogl.
+ * debian/control:
+ + Build depend on libcogl-dev >= 1.18, needed for the above change.
+
+ -- Emilio Pozuelo Monfort <[email protected]> Thu, 27 Mar 2014 15:11:52 +0100
+
muffin (1.7.3-1) unstable; urgency=low
* New upstream: muffin_1.7.3
diff -Nru muffin-1.7.3/debian/control muffin-1.7.3/debian/control
--- muffin-1.7.3/debian/control 2013-04-20 17:35:01.000000000 +0200
+++ muffin-1.7.3/debian/control 2014-03-27 15:11:45.000000000 +0100
@@ -11,6 +11,7 @@
gobject-introspection (>= 0.9.12-5~),
libgirepository1.0-dev (>= 0.9.12),
libjson-glib-dev (>= 0.13.2-1~),
+ libcogl-dev (>= 1.18),
libclutter-1.0-dev (>= 1.7.5),
libpango1.0-dev (>= 1.2.0),
libgconf2-dev (>= 2.6.1-2),
diff -Nru muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch
--- muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch 1970-01-01 01:00:00.000000000 +0100
+++ muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch 2014-03-08 19:20:44.000000000 +0100
@@ -0,0 +1,84 @@
+From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <[email protected]>
+Date: Mon, 13 Jan 2014 13:03:19 -0500
+Subject: [PATCH] Update for Cogl API breaks
+
+---
+ configure.ac | 2 +-
+ src/compositor/meta-texture-rectangle.c | 9 ++-------
+ src/compositor/meta-texture-rectangle.h | 4 +---
+ src/compositor/meta-texture-tower.c | 4 ----
+ src/compositor/meta-window-actor.c | 5 +----
+ src/core/meta-cursor-tracker.c | 1 -
+ 6 files changed, 5 insertions(+), 20 deletions(-)
+
+--- a/src/compositor/meta-texture-rectangle.c
++++ b/src/compositor/meta-texture-rectangle.c
+@@ -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;
+
+--- a/src/compositor/meta-texture-rectangle.h
++++ b/src/compositor/meta-texture-rectangle.h
+@@ -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);
+--- a/src/compositor/meta-texture-tower.c
++++ b/src/compositor/meta-texture-tower.c
+@@ -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
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -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 -Nru muffin-1.7.3/debian/patches/series muffin-1.7.3/debian/patches/series
--- muffin-1.7.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ muffin-1.7.3/debian/patches/series 2014-03-08 19:17:46.000000000 +0100
@@ -0,0 +1 @@
+0001-Update-for-Cogl-API-breaks.patch
--- End Message ---
--- Begin Message ---
Source: muffin
Source-Version: 1.7.3-2
We believe that the bug you reported is fixed in the latest version of
muffin, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Laszlo Boszormenyi (GCS) <[email protected]> (supplier of updated muffin package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 27 Mar 2014 21:21:10 +0100
Source: muffin
Binary: muffin libmuffin0 muffin-common libmuffin-dev gir1.2-muffin-3.0
muffin-dbg
Architecture: source amd64 all
Version: 1.7.3-2
Distribution: unstable
Urgency: medium
Maintainer: Nicolas Bourdaud <[email protected]>
Changed-By: Laszlo Boszormenyi (GCS) <[email protected]>
Description:
gir1.2-muffin-3.0 - GObject introspection data for Muffin
libmuffin-dev - lightweight window and compositing manager (development files)
libmuffin0 - lightweight window and compositing manager (shared library)
muffin - lightweight window and compositing manager
muffin-common - lightweight window and compositing manager (data files)
muffin-dbg - lightweight window and compositing manager (debugging symbols)
Closes: 742790
Changes:
muffin (1.7.3-2) unstable; urgency=medium
.
* Update Standards-Version to 3.9.5 .
.
[ Emilio Pozuelo Monfort <[email protected]> ]
* debian/patches/0001-Update-for-Cogl-API-breaks.patch:
+ Fix build with new cogl (closes: #742790).
* debian/control:
+ Build depend on libcogl-dev >= 1.18, needed for the above change.
Checksums-Sha1:
748e674b8000cfc18c5c28e8d7cce32e6c8bf274 2750 muffin_1.7.3-2.dsc
0be6781b8ea95754903d75d416cf249ba64a55a0 8764 muffin_1.7.3-2.debian.tar.xz
94a00d67b5924712c9ae119b68d9ddf199ab73bd 22994 muffin_1.7.3-2_amd64.deb
4e5eac620eb70246a0823af06ff70350ba09f84b 264790 libmuffin0_1.7.3-2_amd64.deb
89d1d3055811db5368fdce712605be42a8059d29 734886 muffin-common_1.7.3-2_all.deb
72db3052c3de6a20f992072994f58179abc4bbc6 46496 libmuffin-dev_1.7.3-2_amd64.deb
bc774208904b0c6d845e0d2219bb5ed2a6204265 15632
gir1.2-muffin-3.0_1.7.3-2_amd64.deb
ef21fb052ffb32c1f6da42b0e8ea80f169347cec 1081350 muffin-dbg_1.7.3-2_amd64.deb
Checksums-Sha256:
41312df19001ca31a3a062d937845d9d4bc4cc33382fa77d7079a61deda9d65b 2750
muffin_1.7.3-2.dsc
1c6eaa3d8002cb3701c0c7928f2f80d62e67d5094677f56edc42f7c498f37255 8764
muffin_1.7.3-2.debian.tar.xz
a9a9ccdfb576e4e59399415047f631bdb32dcf9e3ee506625ddfc34aa4c26e3a 22994
muffin_1.7.3-2_amd64.deb
5baea86438243723ae68b0e6837e97c3db8d418cd468a116deb27e6633055c81 264790
libmuffin0_1.7.3-2_amd64.deb
8d40c0522fb690202066933c24d0205c4bc8f891cdedf38c601f889adb4a3213 734886
muffin-common_1.7.3-2_all.deb
c9915f99b3fd56e0291c58b6ef0753d19b2fe8633bf70ea7e21c08adabbbfce2 46496
libmuffin-dev_1.7.3-2_amd64.deb
17357ad56c0cb11fdd0180610114f82ec5586458a577b0a86b737c92450d66e8 15632
gir1.2-muffin-3.0_1.7.3-2_amd64.deb
9c1ae70cdac35668311bb4d1307c2bc9e15dbb04b1454935e54635493f64c5f8 1081350
muffin-dbg_1.7.3-2_amd64.deb
Files:
db4aafca4ec175254281b5a3044d454c 2750 x11 optional muffin_1.7.3-2.dsc
519b0282c35b763b9cae3ea44ba9828b 8764 x11 optional muffin_1.7.3-2.debian.tar.xz
92f0bb321d9caa9975c5222cc5afc7bd 22994 x11 optional muffin_1.7.3-2_amd64.deb
7f71411915e430fa4a66f9fb28acca0e 264790 libs optional
libmuffin0_1.7.3-2_amd64.deb
893f3145fda29905e3beb8cc314a5967 734886 misc optional
muffin-common_1.7.3-2_all.deb
bfd074ac2e8546fd7f4017d018f5192c 46496 libdevel optional
libmuffin-dev_1.7.3-2_amd64.deb
2ac17b5addc66d8e51f30615d9cc44ff 15632 introspection optional
gir1.2-muffin-3.0_1.7.3-2_amd64.deb
0ff72590ac65672af338e5cf0bd4d23c 1081350 debug extra
muffin-dbg_1.7.3-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJTNI7oAAoJENzjEOeGTMi/s00QAJEfRHxCoIXUuyy3Jo4oPjxc
nfRpdudfhVI2QfHS6pzNLpMuRuPRpRZsteJxGoynDHNK4ZlxhUvUxrljBE+AnoUN
nNcM9n4r1tezouwW8pP0F2gFoWTD+BTVzpQvAdBY6lf2vUWS57AQdbGO5WLE2cRp
k4AAIZnofMnCLoRUCqsPBoq1vb3YY8W7pIEP9cDwL0e8kRqEw29tz2WwQI+hLi/c
b2x9BNmLuzRVRpnyqPl2LF0lDC/NqBqzeFHSSSLlswB7w742zjNLK9T4dGoK7pwX
o3oA71kk8tQGTTAW25y6uW1pecBpasZxxSu+qdioMIrTti+kW4DhyeSyX0SGX0K/
Yk6bza2SjqZAEwQtvE2GxeKHJcYYOp/t8cYorV8Ke/mUU8/yZXJa6HkC3iLyfkbe
Lxp8/jm7UatS1OQi42D3cirjHsaSrIvbxT8Ub0xFxnM9vwREioOVyegyRMtJZwZe
iuOQAtAoQAkGv3vcjJAPtugmjayprwWOA6kXKTgEi5HB8K0jiRefpuJtEe0f7R7J
sZCQRBoB4Fy2AYqHCRWDiqTafs6xycOuq3YWIl2687LCGC2XCD83lhKzShBUzUfC
78j3a7GE5UF0AZFukWi2nae6ug18IT1dCTatuRkNGpdHm1tF3uorYC4Hml8ykDBO
KaHqd/QJ8HbStF+Oa+8Q
=7Wjy
-----END PGP SIGNATURE-----
--- End Message ---
