r28868 - in /branches/upstream/libgtk2-gladexml-perl/current: ChangeLog GladeXML.pm META.yml Makefile.PL NEWS README
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Sun Dec 28 19:32:35 UTC 2008
Author: ryan52-guest
Date: Sun Dec 28 19:32:32 2008
New Revision: 28868
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28868
Log:
[svn-upgrade] Integrating new upstream version, libgtk2-gladexml-perl (1.007)
Modified:
branches/upstream/libgtk2-gladexml-perl/current/ChangeLog
branches/upstream/libgtk2-gladexml-perl/current/GladeXML.pm
branches/upstream/libgtk2-gladexml-perl/current/META.yml
branches/upstream/libgtk2-gladexml-perl/current/Makefile.PL
branches/upstream/libgtk2-gladexml-perl/current/NEWS
branches/upstream/libgtk2-gladexml-perl/current/README
Modified: branches/upstream/libgtk2-gladexml-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/ChangeLog?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/ChangeLog (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/ChangeLog Sun Dec 28 19:32:32 2008
@@ -1,3 +1,15 @@
+2008-09-07 Torsten Schoenfeld <kaffeetisch at gmx.de>
+
+ * GladeXML.pm
+ * NEWS
+ * README: Stable release 1.007.
+
+2008-09-07 Torsten Schoenfeld <kaffeetisch at gmx.de>
+
+ * Makefile.PL: Depend on ExtUtils::Depends 0.300 so that we can
+ remove our custom find_extra_libs hack. Also play nice with CPAN
+ testers and exit with status 0 if we can't find libglade-2.0.
+
2006-09-04 kaffeetisch
* GladeXML.pm, NEWS, README: Stable release 1.006.
Modified: branches/upstream/libgtk2-gladexml-perl/current/GladeXML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/GladeXML.pm?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/GladeXML.pm (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/GladeXML.pm Sun Dec 28 19:32:32 2008
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/GladeXML.pm,v 1.31 2006/09/04 18:48:51 kaffeetisch Exp $
+# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/GladeXML.pm,v 1.32 2008/09/07 20:10:48 kaffeetisch Exp $
#
# Based strongly on gtk-perl's GladeXML
#
@@ -16,7 +16,7 @@
our @ISA = qw(DynaLoader);
-our $VERSION = '1.006';
+our $VERSION = '1.007';
sub import {
my $class = shift;
Modified: branches/upstream/libgtk2-gladexml-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/META.yml?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/META.yml (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/META.yml Sun Dec 28 19:32:32 2008
@@ -1,14 +1,16 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Gtk2-GladeXML
-version: 1.006
-version_from: GladeXML.pm
-installdirs: site
-requires:
- ExtUtils::Depends: 0.1
- ExtUtils::PkgConfig: 1.0
- Glib: 1.02
- Gtk2: 1.00
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+--- #YAML:1.0
+name: Gtk2-GladeXML
+version: 1.007
+abstract: Create user interfaces directly from Glade XML files.
+license: ~
+author: ~
+generated_by: ExtUtils::MakeMaker version 6.44
+distribution_type: module
+requires:
+ ExtUtils::Depends: 0.300
+ ExtUtils::PkgConfig: 1.000
+ Glib: 1.020
+ Gtk2: 1.000
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
Modified: branches/upstream/libgtk2-gladexml-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/Makefile.PL?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/Makefile.PL (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/Makefile.PL Sun Dec 28 19:32:32 2008
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/Makefile.PL,v 1.20 2006/09/04 18:47:55 kaffeetisch Exp $
+# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/Makefile.PL,v 1.21 2008/09/07 20:05:50 kaffeetisch Exp $
#
use strict;
@@ -10,10 +10,10 @@
# minimum required version of dependancies we need to build
our %build_reqs = (
- 'perl-ExtUtils-Depends' => '0.1',
- 'perl-ExtUtils-PkgConfig' => '1.0',
- 'perl-Glib' => '1.02', # for Glib::MakeHelper
- 'perl-Gtk2' => '1.00',
+ 'perl-ExtUtils-Depends' => '0.300',
+ 'perl-ExtUtils-PkgConfig' => '1.000',
+ 'perl-Glib' => '1.020', # for Glib::MakeHelper
+ 'perl-Gtk2' => '1.000',
'Glade' => '2.0.0',
);
@@ -42,13 +42,21 @@
exit 1; # not reached
}
-our %pkgcfg = ExtUtils::PkgConfig->find ('libglade-2.0 >= '.$build_reqs{Glade});
+# If the package can't be found, warn and exit with status 0 to indicate to
+# CPAN testers that their system is not supported.
+our %pkgcfg;
+unless (eval { %pkgcfg = ExtUtils::PkgConfig->find ('libglade-2.0 >= '.$build_reqs{Glade});
+ 1; })
+{
+ warn $@;
+ exit 0;
+}
mkdir 'build', 0777;
my $gladexml = ExtUtils::Depends->new ('GladeXML', 'Gtk2', 'Glib');
$gladexml->set_inc ($pkgcfg{cflags});
-$gladexml->set_libs ($pkgcfg{libs} . $gladexml->_find_extra_libs);
+$gladexml->set_libs ($pkgcfg{libs});
$gladexml->add_pm ('GladeXML.pm' => '$(INST_LIBDIR)/GladeXML.pm');
$gladexml->add_xs ('GladeXML.xs');
my $cwd = cwd();
@@ -80,34 +88,3 @@
'PERL_GTK' => $build_reqs{'perl-Gtk2'},
);
}
-
-
-# this probably needs to go into ExtUtils::Depends.
-sub ExtUtils::Depends::_find_extra_libs {
- # right now we need this terrible hack only for windows.
- return "" unless $^O eq "MSWin32";
-
- my $self = shift;
-
- # win32 does not allow unresolved symbols in libraries, but
- # Gtk2 uses on symbols in the dll created for Glib.
- # so, we have to break all this nice abstraction and encapsulation
- # and find the actual Glib.dll and Glib.lib installed by perl when
- # the Glib module was built, and add it to the list of lib files.
- #
- # say it with me: "i hate win32."
-
- my $retstring = "";
-
- use File::Find;
-
- my %deps = $self->get_deps;
- foreach my $mod (keys %deps) {
- find (sub {
- $retstring .= " ".$File::Find::name
- if /$mod.lib/i;
- }, @INC);
- }
-
- return $retstring;
-}
Modified: branches/upstream/libgtk2-gladexml-perl/current/NEWS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/NEWS?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/NEWS (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/NEWS Sun Dec 28 19:32:32 2008
@@ -1,3 +1,8 @@
+Overview of changes in Gtk2::GladeXML 1.007
+===========================================
+
+* Depend on ExtUtils::Depends 0.300 for improved portability.
+
Overview of changes in Gtk2::GladeXML 1.006
===========================================
Modified: branches/upstream/libgtk2-gladexml-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-gladexml-perl/current/README?rev=28868&op=diff
==============================================================================
--- branches/upstream/libgtk2-gladexml-perl/current/README (original)
+++ branches/upstream/libgtk2-gladexml-perl/current/README Sun Dec 28 19:32:32 2008
@@ -1,4 +1,4 @@
-Gtk2::GladeXML version 1.005
+Gtk2::GladeXML version 1.007
============================
This package adds perl support for Glade 2.x to Gtk2-Perl.
@@ -55,8 +55,8 @@
In order to build it from source, you'll also need
- ExtUtils::Depends >= 0.1
- ExtUtils::PkgConfig >= 1.00
+ ExtUtils::Depends >= 0.300
+ ExtUtils::PkgConfig >= 1.000
BUG REPORTS
@@ -86,4 +86,4 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307 USA.
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/README,v 1.19 2006/09/04 18:48:51 kaffeetisch Exp $
+# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Glade/README,v 1.20 2008/09/07 20:10:48 kaffeetisch Exp $
More information about the Pkg-perl-cvs-commits
mailing list