[arch-commits] CVS update of extra/lib/imlib (PKGBUILD debian-bug448360.patch)

Aaron Griffin aaron at archlinux.org
Sat Jan 12 00:11:50 UTC 2008


    Date: Friday, January 11, 2008 @ 19:11:50
  Author: aaron
    Path: /home/cvs-extra/extra/lib/imlib

   Added: debian-bug448360.patch (1.1)
Modified: PKGBUILD (1.18 -> 1.19)

upgpkg: imlib 1.9.15-4
    FS#9084 - fix a png rendering bug


------------------------+
 PKGBUILD               |   18 +++++----
 debian-bug448360.patch |   92 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 7 deletions(-)


Index: extra/lib/imlib/PKGBUILD
diff -u extra/lib/imlib/PKGBUILD:1.18 extra/lib/imlib/PKGBUILD:1.19
--- extra/lib/imlib/PKGBUILD:1.18	Mon May 15 16:47:36 2006
+++ extra/lib/imlib/PKGBUILD	Fri Jan 11 19:11:50 2008
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD,v 1.18 2006/05/15 20:47:36 uid1016 Exp $
+# $Id: PKGBUILD,v 1.19 2008/01/12 00:11:50 aaron Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=3
+pkgrel=4
 pkgdesc="General image handling library for X11 and Gtk"
 arch=(i686 x86_64)
 url="http://www.enlightenment.org/Libraries/Imlib.html"
-depends=(gtk libungif libpng libtiff)
+license=('GPL')
+depends=(gtk libungif libpng libtiff libsm)
 source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/$pkgname-$pkgver.tar.bz2
-	CAN-2004-1026.patch
-	aclocal-fixes.patch)
-md5sums=(7db987e6c52e4daf70d7d0f471238eae)
+        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch)
+options=(!libtool)
+md5sums=('7db987e6c52e4daf70d7d0f471238eae'
+         '5f9da697934b6bd3b497ac9160ce4f5c'
+         'b273d36aa60adbfaacaf6062234e4c1f'
+         '33b832f0dc6c9723cd0dfe9c8d0a6797')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np1 -i ${startdir}/src/debian-bug448360.patch || return 1
   patch -Np1 -i ${startdir}/src/CAN-2004-1026.patch || return 1
   patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --enable-shm
   make || return 1
   make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
 }
Index: extra/lib/imlib/debian-bug448360.patch
diff -u /dev/null extra/lib/imlib/debian-bug448360.patch:1.1
--- /dev/null	Fri Jan 11 19:11:50 2008
+++ extra/lib/imlib/debian-bug448360.patch	Fri Jan 11 19:11:50 2008
@@ -0,0 +1,92 @@
+diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c
+--- imlib-1.9.15.orig/gdk_imlib/misc.c	2002-03-04 18:06:32.000000000 +0100
++++ imlib-1.9.15/gdk_imlib/misc.c	2007-10-28 14:00:04.000000000 +0100
+@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams
+   visual = gdk_rgb_get_visual();
+   id->x.visual = GDK_VISUAL_XVISUAL(visual);	/* the visual type */
+   id->x.depth = visual->depth;	/* the depth of the screen in bpp */
++
++  id->x.shm = 0;
++  id->x.shmp = 0;
++  id->max_shm = 0;
+ #ifdef HAVE_SHM
+   if (XShmQueryExtension(id->x.disp))
+     {
+@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams
+ 	      id->x.last_xim = NULL;
+ 	      id->x.last_sxim = NULL;
+ 	      id->max_shm = 0x7fffffff;
+-	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
++	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
++		  (pm == True))
+ 		id->x.shmp = 1;
+ 	    }
+ 	}
+     }
+-  else
+ #endif
+-    {
+-      id->x.shm = 0;
+-      id->x.shmp = 0;
+-    }
++
+   id->cache.on_image = 0;
+   id->cache.size_image = 0;
+   id->cache.num_image = 0;
+@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams
+ 	}
+       if (p->flags & PARAMS_SHAREDPIXMAPS)
+ 	{
+-	  if (id->x.shm)
+-	    id->x.shmp = p->sharedpixmaps;
++	  if (!p->sharedpixmaps)
++	    id->x.shmp = 0;
+ 	}
+       if (p->flags & PARAMS_PALETTEOVERRIDE)
+ 	override = p->paletteoverride;
+diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c
+--- imlib-1.9.15.orig/Imlib/misc.c	2004-09-21 02:22:59.000000000 +0200
++++ imlib-1.9.15/Imlib/misc.c	2007-10-28 14:00:23.000000000 +0100
+@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I
+   id->x.root = DefaultRootWindow(disp);		/* the root window id */
+   id->x.visual = DefaultVisual(disp, id->x.screen);	/* the visual type */
+   id->x.depth = DefaultDepth(disp, id->x.screen);	/* the depth of the screen in bpp */
++
++  id->x.shm = 0;
++  id->x.shmp = 0;
++  id->max_shm = 0;
+ #ifdef HAVE_SHM
+   if (XShmQueryExtension(id->x.disp))
+     {
+@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I
+ 	      id->x.last_xim = NULL;
+ 	      id->x.last_sxim = NULL;
+ 	      id->max_shm = 0x7fffffff;
+-	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
++	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
++		   (pm == True)))
+ 		id->x.shmp = 1;
+ 	    }
+ 	}
+     }
+-  else
+ #endif
+-    {
+-      id->x.shm = 0;
+-      id->x.shmp = 0;
+-    }
++
+   id->cache.on_image = 0;
+   id->cache.size_image = 0;
+   id->cache.num_image = 0;
+@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I
+ 	}
+       if (p->flags & PARAMS_SHAREDPIXMAPS)
+ 	{
+-	  if (id->x.shm)
+-	    id->x.shmp = p->sharedpixmaps;
++	  if (!p->sharedpixmaps)
++	    id->x.shmp = 0;
+ 	}
+       if (p->flags & PARAMS_PALETTEOVERRIDE)
+ 	override = p->paletteoverride;




More information about the arch-commits mailing list