summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2006-11-08 13:40:33 +0000
committerobache <obache@pkgsrc.org>2006-11-08 13:40:33 +0000
commitef6a65954cb330087cb531c3994771ae6a5e090d (patch)
tree19fed85e266f1a80dc91c9ac57db89927328085f
parent0a9f38d517b22c333a0073ef443bb3835bc2ebca (diff)
downloadpkgsrc-ef6a65954cb330087cb531c3994771ae6a5e090d.tar.gz
Fix two issues of graphics/p5-Gdk-Pixbuf suggested in PR 32775.
* should depend on graphics/gdk-pixbuf instead of www/gtkhtml. * compilation error about a not found gtk/gtktypeutils.h (this error didn't break build of the package). Bump PKGREVISION.
-rw-r--r--graphics/p5-Gdk-Pixbuf/Makefile6
-rw-r--r--x11/p5-gtk/distinfo3
-rw-r--r--x11/p5-gtk/patches/patch-ab19
3 files changed, 24 insertions, 4 deletions
diff --git a/graphics/p5-Gdk-Pixbuf/Makefile b/graphics/p5-Gdk-Pixbuf/Makefile
index cfed95ff0ea..56dda0345bd 100644
--- a/graphics/p5-Gdk-Pixbuf/Makefile
+++ b/graphics/p5-Gdk-Pixbuf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/11/08 13:40:33 obache Exp $
#
.include "../../x11/p5-gtk/Makefile.common"
PKGNAME= p5-Gdk-Pixbuf-${GTKPERL_VERSION}
-PKGREVISION= 11
+PKGREVISION= 12
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Perl5 Gtk::Gdk::Pixbuf
@@ -12,5 +12,5 @@ COMMENT= Perl5 Gtk::Gdk::Pixbuf
PERL5_PACKLIST= auto/Gtk/Gdk/Pixbuf/.packlist
SUBPACKAGE= GdkPixbuf
-.include "../../www/gtkhtml/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../x11/p5-gtk/Makefile.subpackage"
diff --git a/x11/p5-gtk/distinfo b/x11/p5-gtk/distinfo
index 289fc4de120..1618f84db1a 100644
--- a/x11/p5-gtk/distinfo
+++ b/x11/p5-gtk/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 17:36:18 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/11/08 13:40:33 obache Exp $
SHA1 (Gtk-Perl-0.7009.tar.gz) = a48680c4db2aef82247061265784383df320c221
RMD160 (Gtk-Perl-0.7009.tar.gz) = 98449575c3e3a605d324c878cc5dee504cb7d0b6
Size (Gtk-Perl-0.7009.tar.gz) = 447432 bytes
SHA1 (patch-aa) = c15288af428dde6c97996c5f8e2904107062dca8
+SHA1 (patch-ab) = 9aa6b2ef31267a4da557bf7c9bc1136de8097e0a
diff --git a/x11/p5-gtk/patches/patch-ab b/x11/p5-gtk/patches/patch-ab
new file mode 100644
index 00000000000..e645e278424
--- /dev/null
+++ b/x11/p5-gtk/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2006/11/08 13:40:33 obache Exp $
+
+--- ../GdkPixbuf/Makefile.PL.orig 2003-06-17 09:47:56.000000000 +0000
++++ ../GdkPixbuf/Makefile.PL
+@@ -9,8 +9,12 @@ $gpb = new ExtUtils::Depends('Gtk::Gdk::
+
+ mkdir('build', 0777);
+
+-$gpb->set_inc (`gdk-pixbuf-config --cflags`);
+-$gpb->set_libs (`gdk-pixbuf-config --libs`);
++$libs = `gdk-pixbuf-config --libs`;
++$inc = `gdk-pixbuf-config --cflags`;
++$libs =~ s/\s+/ /g;
++$inc =~ s/\s+/ /g;
++$gpb->set_inc ($inc);
++$gpb->set_libs ($libs);
+
+ $gpb->add_typemaps (cwd() . '/pkg.typemap', cwd().'/build/GdkPixbufTypemap');
+ $gpb->add_headers (qw( <gdk-pixbuf/gdk-pixbuf-loader.h> ));