From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 20 Dec 2014 23:50:59 +0000 (+0100)
Subject: package/perl-gd: rename patches to follow the new name convention
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7007963882baa61361a9905771a68077ae2d695;p=buildroot.git

package/perl-gd: rename patches to follow the new name convention

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/perl-gd/0001-getoptions.patch b/package/perl-gd/0001-getoptions.patch
new file mode 100644
index 0000000000..74f055bead
--- /dev/null
+++ b/package/perl-gd/0001-getoptions.patch
@@ -0,0 +1,43 @@
+fix option handling in Makefile.PL
+
+the call to GetOptions() must be unique.
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+see https://github.com/lstein/Perl-GD/pull/6
+
+Index: b/Makefile.PL
+===================================================================
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -24,7 +24,15 @@
+ my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
+ 
+ use Getopt::Long;
+-GetOptions("ignore_missing_gd" => \$force);
++my $result = GetOptions("options=s"         => \$options,
++			"lib_gd_path=s"     => \$lib_gd_path,
++			"lib_ft_path=s"     => \$lib_ft_path,
++			"lib_png_path=s"    => \$lib_png_path,
++			"lib_jpeg_path=s"   => \$lib_jpeg_path,
++			"lib_xpm_path=s"    => \$lib_xpm_path,
++			"lib_zlib_path=s"   => \$lib_zlib_path,
++			"ignore_missing_gd" => \$force,
++		       );
+ 
+ unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
+     die <<END;
+@@ -47,14 +55,6 @@
+ #############################################################################################
+ # Build options passed in to script to support reproducible builds via Makefiles
+ #############################################################################################
+-my $result = GetOptions("options=s"       => \$options,
+-			"lib_gd_path=s"   => \$lib_gd_path,
+-			"lib_ft_path=s"   => \$lib_ft_path,
+-			"lib_png_path=s"  => \$lib_png_path,
+-			"lib_jpeg_path=s" => \$lib_jpeg_path,
+-			"lib_xpm_path=s"  => \$lib_xpm_path,
+-			"lib_zlib_path=s" => \$lib_zlib_path,
+-		       );
+ unless ($result) {
+   print STDERR <<END;
+ Usage: perl Makefile.PL [options]
diff --git a/package/perl-gd/0002-lgd.patch b/package/perl-gd/0002-lgd.patch
new file mode 100644
index 0000000000..4a69c2ae8e
--- /dev/null
+++ b/package/perl-gd/0002-lgd.patch
@@ -0,0 +1,28 @@
+refactor -lgd in @LIBS
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+see https://github.com/lstein/Perl-GD/pull/7
+
+Index: b/Makefile.PL
+===================================================================
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -34,9 +34,9 @@
+ END
+ }
+ 
++push @LIBS, "-lgd";
+ @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
+ @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
+-@LIBS    = qw(-lgd) unless @LIBS;
+ 
+ # support for AMD64 libraries
+ if (-d '/usr/lib64') {
+@@ -291,7 +291,6 @@
+   @$LIBPATH      = map {s/^-L// && "-L$_"} split /\s+/,$ldflags;
+   @$LIBS         = split /\s+/,$libs;
+ 
+-  push @$LIBS,"-lgd";
+   push @$LIBPATH,"-L$libdir";
+   ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
+   $$options      = $features;
diff --git a/package/perl-gd/0003-force.patch b/package/perl-gd/0003-force.patch
new file mode 100644
index 0000000000..0a121a994e
--- /dev/null
+++ b/package/perl-gd/0003-force.patch
@@ -0,0 +1,32 @@
+let @INC and @LIBPATH empty when ignore_missing_gd
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+see https://github.com/lstein/Perl-GD/pull/7
+
+Index: b/Makefile.PL
+===================================================================
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -35,13 +35,15 @@
+ }
+ 
+ push @LIBS, "-lgd";
+-@INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
+-@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
+-
+-# support for AMD64 libraries
+-if (-d '/usr/lib64') {
+-  my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
+-  @LIBPATH = (@LIBPATH,@libs64);
++unless ($force) {
++  @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
++  @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
++
++  # support for AMD64 libraries
++  if (-d '/usr/lib64') {
++    my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
++    @LIBPATH = (@LIBPATH,@libs64);
++  }
+ }
+ 
+ #############################################################################################
diff --git a/package/perl-gd/perl-gd-01-getoptions.patch b/package/perl-gd/perl-gd-01-getoptions.patch
deleted file mode 100644
index 74f055bead..0000000000
--- a/package/perl-gd/perl-gd-01-getoptions.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-fix option handling in Makefile.PL
-
-the call to GetOptions() must be unique.
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/6
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,15 @@
- my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
- 
- use Getopt::Long;
--GetOptions("ignore_missing_gd" => \$force);
-+my $result = GetOptions("options=s"         => \$options,
-+			"lib_gd_path=s"     => \$lib_gd_path,
-+			"lib_ft_path=s"     => \$lib_ft_path,
-+			"lib_png_path=s"    => \$lib_png_path,
-+			"lib_jpeg_path=s"   => \$lib_jpeg_path,
-+			"lib_xpm_path=s"    => \$lib_xpm_path,
-+			"lib_zlib_path=s"   => \$lib_zlib_path,
-+			"ignore_missing_gd" => \$force,
-+		       );
- 
- unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
-     die <<END;
-@@ -47,14 +55,6 @@
- #############################################################################################
- # Build options passed in to script to support reproducible builds via Makefiles
- #############################################################################################
--my $result = GetOptions("options=s"       => \$options,
--			"lib_gd_path=s"   => \$lib_gd_path,
--			"lib_ft_path=s"   => \$lib_ft_path,
--			"lib_png_path=s"  => \$lib_png_path,
--			"lib_jpeg_path=s" => \$lib_jpeg_path,
--			"lib_xpm_path=s"  => \$lib_xpm_path,
--			"lib_zlib_path=s" => \$lib_zlib_path,
--		       );
- unless ($result) {
-   print STDERR <<END;
- Usage: perl Makefile.PL [options]
diff --git a/package/perl-gd/perl-gd-02-lgd.patch b/package/perl-gd/perl-gd-02-lgd.patch
deleted file mode 100644
index 4a69c2ae8e..0000000000
--- a/package/perl-gd/perl-gd-02-lgd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-refactor -lgd in @LIBS
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/7
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -34,9 +34,9 @@
- END
- }
- 
-+push @LIBS, "-lgd";
- @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
- @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
--@LIBS    = qw(-lgd) unless @LIBS;
- 
- # support for AMD64 libraries
- if (-d '/usr/lib64') {
-@@ -291,7 +291,6 @@
-   @$LIBPATH      = map {s/^-L// && "-L$_"} split /\s+/,$ldflags;
-   @$LIBS         = split /\s+/,$libs;
- 
--  push @$LIBS,"-lgd";
-   push @$LIBPATH,"-L$libdir";
-   ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
-   $$options      = $features;
diff --git a/package/perl-gd/perl-gd-03-force.patch b/package/perl-gd/perl-gd-03-force.patch
deleted file mode 100644
index 0a121a994e..0000000000
--- a/package/perl-gd/perl-gd-03-force.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-let @INC and @LIBPATH empty when ignore_missing_gd
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/7
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -35,13 +35,15 @@
- }
- 
- push @LIBS, "-lgd";
--@INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
--@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
--
--# support for AMD64 libraries
--if (-d '/usr/lib64') {
--  my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
--  @LIBPATH = (@LIBPATH,@libs64);
-+unless ($force) {
-+  @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
-+  @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
-+
-+  # support for AMD64 libraries
-+  if (-d '/usr/lib64') {
-+    my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
-+    @LIBPATH = (@LIBPATH,@libs64);
-+  }
- }
- 
- #############################################################################################