[csw-devel] SF.net SVN: gar:[9829] csw/mgar/pkg/cpan/GD/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9829
          http://gar.svn.sourceforge.net/gar/?rev=9829&view=rev
Author:   dmichelsen
Date:     2010-05-07 13:40:54 +0000 (Fri, 07 May 2010)

Log Message:
-----------
cpan/GD: Update to 2.45 and link to libjpeg.so.7

Modified Paths:
--------------
    csw/mgar/pkg/cpan/GD/trunk/Makefile
    csw/mgar/pkg/cpan/GD/trunk/checksums
    csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t

Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-05-07 11:40:30 UTC (rev 9828)
+++ csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-05-07 13:40:54 UTC (rev 9829)
@@ -1,5 +1,5 @@
 GARNAME = GD
-GARVERSION = 2.44
+GARVERSION = 2.45
 CATEGORIES = cpan
 AUTHOR = LDS
 
@@ -10,15 +10,18 @@
   large number of graphics primitives, and emit the drawings as PNG files.
 endef
 
+# The file format for files written with libjpeg.so.7 has changed.
+# Disable binary identity test until this is fixed:
+#   https://rt.cpan.org/Ticket/Display.html?id=49053
+PATCHFILES = diff-GD.t
+
 PACKAGES = CSWpmgd
 CATALOGNAME = pm_gd
 
-RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
-RUNTIME_DEP_PKGS += CSWxpm CSWzlib CSWfconfig
-BUILD_DEP_PKGS = CSWgd
+LICENSE = LICENSE
 
-# if we build against libjpeg7, we need to patch one test
-# PATCHFILES = diff-GD.t
+DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
+DEP_PKGS += CSWxpm CSWzlib CSWfconfig
 
 CONFIGURE_ARGS  = lib_gd_path $(libdir)
 CONFIGURE_ARGS += lib_ft_path $(libdir)
@@ -30,6 +33,6 @@
 # Don't use hardcoded -Wformat=0
 BUILD_OVERRIDE_DIRS = CCFLAGS
 
+CHECKPKG_OVERRIDES_CSWpmgd += linked-against-discouraged-library|GD.so|libX11.so.4
+
 include gar/category.mk
-pre-build-modulated:
-	gsed -i'' 's,-ljpeg,/opt/csw/lib/libjpeg.so.62,' $(WORKSRC)/Makefile

Modified: csw/mgar/pkg/cpan/GD/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/checksums	2010-05-07 11:40:30 UTC (rev 9828)
+++ csw/mgar/pkg/cpan/GD/trunk/checksums	2010-05-07 13:40:54 UTC (rev 9829)
@@ -1 +1,2 @@
-9b9a4d78a5af0616a96264b0aa354859  GD-2.44.tar.gz
+430b15e74eb6287519c403c4772dc1e3  GD-2.45.tar.gz
+ef1e469ea526f7a58fe986fdc0b67a4f  diff-GD.t

Modified: csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t	2010-05-07 11:40:30 UTC (rev 9828)
+++ csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t	2010-05-07 13:40:54 UTC (rev 9829)
@@ -5,7 +5,7 @@
  
  if (GD::Image->can('newFromJpeg')) {
 -  compare(test10('frog.jpg'),10);
-+  print "ok ",10," # Skip, see CPAN bug 49053\n";
++  print "ok ",10," # Skip, see CPAN bug 49053 at https://rt.cpan.org/Ticket/Display.html?id=49053\n";
  } else {
    print "ok ",10," # Skip, no JPEG support\n";
  }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.