pkg/28108: update

[fbriere%peperes.info@localhost]

>Number:         28108
>Category:       pkg
>Synopsis:       update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 08 20:11:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Francois Briere
>Release:        NetBSD 2.0_RC4
>Organization:
peperes.info
>Environment:
System: NetBSD cthulhu.peperes.info 2.0_RC4 NetBSD 2.0_RC4 (misanthropia) #0: 
Sun Nov 7 09:43:46 EST 2004 
root%cthulhu.peperes.info@localhost:/usr/src/sys/arch/i386/compile/misanthropia 
i386
Architecture: i386
Machine: i386
>Description:
update to 0.1.2
>How-To-Repeat:
a patch to update to 0.1.2
>Fix:
patch -p# < /path/to/patch

--- patch-graphics_libpixman.diff begins here ---
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libpixman/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile    3 Oct 2004 00:14:55 -0000       1.7
+++ Makefile    8 Nov 2004 17:28:38 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.7 2004/10/03 00:14:55 tv Exp $
 #
 
-DISTNAME=      libpixman-0.1.1
-PKGREVISION=   2
+DISTNAME=      libpixman-0.1.2
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/snapshots/
 
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libpixman/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- buildlink3.mk       3 Oct 2004 00:14:55 -0000       1.5
+++ buildlink3.mk       8 Nov 2004 17:28:39 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libpixman+=  libpixman>=0.1.1
-BUILDLINK_RECOMMENDED.libpixman+=      libpixman>=0.1.1nb2
+BUILDLINK_RECOMMENDED.libpixman+=      libpixman>=0.1.2
 BUILDLINK_PKGSRCDIR.libpixman?=        ../../graphics/libpixman
 .endif # LIBPIXMAN_BUILDLINK3_MK
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libpixman/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    3 Jul 2004 23:00:36 -0000       1.3
+++ distinfo    8 Nov 2004 17:28:39 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.3 2004/07/03 23:00:36 recht Exp $
 
-SHA1 (libpixman-0.1.1.tar.gz) = fcd5b1a30ad621f170392add673f880d3707ba82
-Size (libpixman-0.1.1.tar.gz) = 361389 bytes
-SHA1 (patch-aa) = 24f13081e3fe3f4e2128d509e98db67fbe7361ae
+SHA1 (libpixman-0.1.2.tar.gz) = 131940aee04f8ed757b834d9dd9584d0ecc76348
+Size (libpixman-0.1.2.tar.gz) = 367637 bytes
+SHA1 (patch-aa) = 0172ca11ef392df251b84213295b1727e7274366
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libpixman/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa    3 Jul 2004 23:00:37 -0000       1.1
+++ patches/patch-aa    8 Nov 2004 17:28:39 -0000
@@ -1,36 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2004/07/03 23:00:37 recht Exp $
-
---- src/icimage.c.orig 2004-04-15 23:10:42.000000000 +0200
-+++ src/icimage.c
-@@ -248,10 +248,14 @@ pixman_image_destroyClip (pixman_image_t
+$NetBSD$
+--- src/icimage.c.orig 2004-11-08 11:43:58.000000000 -0500
++++ src/icimage.c      2004-11-08 11:44:04.000000000 -0500
+@@ -263,10 +263,16 @@
      case CT_NONE:
        return;
      case CT_PIXMAP:
 -      pixman_image_destroy (image->clientClip);
++
 +      if (image->clientClip) {
-+          pixman_image_destroy (image->clientClip);
-+        }
++              pixman_image_destroy (image->clientClip);
++      }
++
        break;
      default:
 -      pixman_region_destroy (image->clientClip);
 +      if (image->clientClip) {
-+          pixman_region_destroy (image->clientClip);
-+        }
++              pixman_image_destroy (image->clientClip);
++      }
        break;
      }
      image->clientClip = NULL;
-@@ -263,8 +267,12 @@ pixman_image_set_clip_region (pixman_ima
-                     pixman_region16_t *region)
- {
-     pixman_image_destroyClip (image);
--    image->clientClip = region;
--    image->clientClipType = CT_REGION;
-+    if (region != NULL) {
-+        // image->clientClip = region;
-+        pixman_region_copy (image->clientClip, region);
-+        image->clientClipType = CT_REGION;
-+    }
-+
-     image->stateChanges |= CPClipMask;
-     return 0;
- }
--- patch-graphics_libpixman.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: