OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Oct-2007 14:55:13
Branch: HEAD Handle: 2007101313551200
Modified files:
openpkg-src/perl-gtk perl-gtk.patch perl-gtk.spec
Log:
modifying package: perl-gtk-5.8.8 20061231 -> 20071013
Summary:
Revision Changes Path
1.10 +27 -4 openpkg-src/perl-gtk/perl-gtk.patch
1.116 +5 -5 openpkg-src/perl-gtk/perl-gtk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-gtk/perl-gtk.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 perl-gtk.patch
--- openpkg-src/perl-gtk/perl-gtk.patch 20 Nov 2006 11:17:22 -0000
1.9
+++ openpkg-src/perl-gtk/perl-gtk.patch 13 Oct 2007 12:55:12 -0000
1.10
@@ -1,7 +1,30 @@
-Index: Glib-1.141/Makefile.PL
---- Glib-1.141/Makefile.PL.orig 2005-10-18 18:39:44 +0200
-+++ Glib-1.141/Makefile.PL 2006-01-02 16:28:17 +0100
-@@ -112,6 +112,8 @@
+Index: Cairo-1.042/Makefile.PL
+--- Cairo-1.042/Makefile.PL.orig 2007-10-13 12:13:24 +0200
++++ Cairo-1.042/Makefile.PL 2007-10-13 12:14:39 +0200
+@@ -48,7 +48,7 @@
+ }
+
+ # Add this now since it's not required to generate a Makefile.
+-$prereqs{'Test::Number::Delta'} = 1.00;
++# $prereqs{'Test::Number::Delta'} = 1.00;
+
+ my $autogen_dir = 'build';
+ mkdir $autogen_dir unless (-d $autogen_dir);
+@@ -308,7 +308,9 @@
+
+ my $dep = ExtUtils::Depends->new ('Cairo');
+ $dep->set_inc ('-I. -I'.$autogen_dir.' '.$cairo_cfg{cflags});
+-$dep->set_libs ($cairo_cfg{libs});
++my $libs = $cairo_cfg{libs};
++$libs =~ s/(.*?)\s+-lz\s+(.*?\s+-lz\s+)/$1 $2/s;
++$dep->set_libs ($libs);
+ $dep->add_xs (@xs_files);
+ $dep->add_c ('cairo-perl-enums.c');
+ $dep->add_pm ('Cairo.pm' => '$(INST_LIBDIR)/Cairo.pm');
+Index: Glib-1.160/Makefile.PL
+--- Glib-1.160/Makefile.PL.orig 2007-09-16 19:05:03 +0200
++++ Glib-1.160/Makefile.PL 2007-10-13 12:12:39 +0200
+@@ -121,6 +121,8 @@
# this will be inherited by dependant modules, so they can find their
# generated files.
$glib->set_inc ($glibcfg{cflags} . $gthreadcfg{cflags} . ' -I. ');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-gtk/perl-gtk.spec
============================================================================
$ cvs diff -u -r1.115 -r1.116 perl-gtk.spec
--- openpkg-src/perl-gtk/perl-gtk.spec 1 Jan 2007 17:40:47 -0000
1.115
+++ openpkg-src/perl-gtk/perl-gtk.spec 13 Oct 2007 12:55:12 -0000
1.116
@@ -25,9 +25,9 @@
# package versions
%define V_perl 5.8.8
%define V_gtk_perl 0.7009
-%define V_cairo 1.022
-%define V_glib 1.141
-%define V_gtk2 1.141
+%define V_cairo 1.042
+%define V_glib 1.160
+%define V_gtk2 1.160
# package information
Name: perl-gtk
@@ -40,7 +40,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20061231
+Release: 20071013
# package options
%option with_gtk1 yes
@@ -97,7 +97,6 @@
regex = Gtk2-(__VER__)\.tar\.gz
}
prog perl-gtk:Gtk2-Perl:Cairo = {
- comment = "rse: 0.4 requires cairo >= 1.1.8 (unstable)"
version = %{V_cairo}
url = http://prdownloads.sourceforge.net/gtk2-perl/
regex = Cairo-(__VER__)\.tar\.gz
@@ -122,6 +121,7 @@
%endif
%if "%{with_gtk2}" == "yes"
%{l_prefix}/bin/perl-openpkg -d %{SOURCE1} configure build install
+ export FORCE_GMAKE=1
%{l_prefix}/bin/perl-openpkg -d %{SOURCE2} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE3} configure build install
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
