From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 2 Jun 2011 14:26:02 +0000 (+0100)
Subject: Imported Debian patch 1.0.0-5
X-Git-Tag: debian/1.0.0-5^0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/e16/commitdiff_plain/640c82b00b04cc19f175b4556333cf23c228b68d?ds=sidebyside

Imported Debian patch 1.0.0-5
---

diff --git a/debian/changelog b/debian/changelog
index 600584a..f62cfa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+e16 (1.0.0-5) unstable; urgency=low
+
+  * Private version for mdw.
+  * Fix build failure due to not linking with libaudiofile explicitly
+    (Closes: #554311)
+  * Fix repainting of translucent windows with nontrivial shapes.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Thu, 02 Jun 2011 15:26:02 +0100
+
 e16 (1.0.0-4) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/patch/002_as_needed.patch b/debian/patch/002_as_needed.patch
new file mode 100644
index 0000000..8ddc74b
--- /dev/null
+++ b/debian/patch/002_as_needed.patch
@@ -0,0 +1,18 @@
+configure.ac: Fetch link flags for libaudiofile explicitly for ESD.
+
+This was done for PulseAudio, but not for ESD, for some reason.  It
+causes a build failure with the new Debian -Wl,--as-needed rules.
+Index: build/configure.ac
+===================================================================
+--- build.orig/configure.ac	2011-06-02 15:12:39.000000000 +0100
++++ build/configure.ac	2011-06-02 15:12:42.000000000 +0100
+@@ -114,7 +114,9 @@
+   AC_DEFINE(HAVE_SOUND, 1, [Sound support])
+   AC_DEFINE(HAVE_SOUND_ESD, 1, [EsounD sound support])
+   AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
++  PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
+   enable_sound=esound
++  ESD_LIBS="$ESD_LIBS $AUDIOFILE_LIBS"
+ fi
+ AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes")
+ 
diff --git a/debian/patch/003_compmgr_shape.patch b/debian/patch/003_compmgr_shape.patch
new file mode 100644
index 0000000..494a806
--- /dev/null
+++ b/debian/patch/003_compmgr_shape.patch
@@ -0,0 +1,16 @@
+src/ecompmgr.c: Repaint translucent windows with shapes correctly.
+
+The existing code applied an alpha mask, but didn't clip it to the
+window's shape properly.
+Index: build/src/ecompmgr.c
+===================================================================
+--- build.orig/src/ecompmgr.c	2011-06-02 15:16:16.000000000 +0100
++++ build/src/ecompmgr.c	2011-06-02 15:16:27.000000000 +0100
+@@ -2121,6 +2121,7 @@
+ 	     clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y);
+ 	     if (EDebug(EDBUG_TYPE_COMPMGR2))
+ 		ECompMgrWinDumpInfo("ECompMgrRepaintObj trans", eo, clip, 0);
++	     ERegionIntersect(clip, cw->shape);
+ 	     XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip);
+ 	     if (cw->opacity != OPAQUE && !cw->pict_alpha)
+ 		cw->pict_alpha =
diff --git a/debian/patch/series b/debian/patch/series
index deba5fa..916e910 100644
--- a/debian/patch/series
+++ b/debian/patch/series
@@ -1,2 +1,4 @@
 000_build_hackery.patch
 001_menus.patch
+002_as_needed.patch
+003_compmgr_shape.patch