- rediff patches

diff --git a/perl-PDL-Makefile.PL.patch-dumb b/perl-PDL-Makefile.PL.patch-dumb
index 55acf23f42ec6531fb77d734552d9e2526b13688..85d240cb44567fc11f26f5cb684e0618368b8542 100644 (file)
--- a/perl-PDL-Makefile.PL.patch-dumb
+++ b/perl-PDL-Makefile.PL.patch-dumb
@@ -1,7 +1,7 @@
-diff -urN PDL-2.4.0.org/Makefile.PL PDL-2.4.0/Makefile.PL
---- PDL-2.4.0.org/Makefile.PL  2003-12-30 14:54:25.623918583 +0100
-+++ PDL-2.4.0/Makefile.PL      2003-12-30 15:28:50.633783248 +0100
-@@ -174,7 +174,7 @@
+diff -urNp -x '*.orig' PDL-2.018.org/Makefile.PL PDL-2.018/Makefile.PL
+--- PDL-2.018.org/Makefile.PL  2017-04-30 18:32:41.000000000 +0200
++++ PDL-2.018/Makefile.PL      2021-05-09 00:22:58.708445809 +0200
+@@ -284,7 +284,7 @@ sub make_PDL_Config_pm {
  # AUTOMATICALLY GENERATED BY THE PDL TOPLEVEL Makefile.PL.
  # DO NOT HAND-EDIT - CHANGES WILL BE LOST UPON YOUR NEXT
  #  'perl Makefile.PL'!!!
@@ -9,4 +9,4 @@ diff -urN PDL-2.4.0.org/Makefile.PL PDL-2.4.0/Makefile.PL
 +package PDL::Config;
  use File::Spec;
  \%PDL::Config = (\n";
-   for(keys %PDL_CONFIG) {
+   for (sort keys %PDL::Config) {

diff --git a/perl-PDL-conf.patch b/perl-PDL-conf.patch
index dd3894fe77ce2ffbd781b6219e840a30815ff78c..348c9820b15ef6f1b954639813491be239190b05 100644 (file)
--- a/perl-PDL-conf.patch
+++ b/perl-PDL-conf.patch
@@ -1,7 +1,7 @@
-diff -urN PDL-2.4.0.org/perldl.conf PDL-2.4.0/perldl.conf
---- PDL-2.4.0.org/perldl.conf  2003-12-30 14:54:25.663910257 +0100
-+++ PDL-2.4.0/perldl.conf      2003-12-30 15:14:41.363631658 +0100
-@@ -58,15 +58,15 @@
+diff -urNp -x '*.orig' PDL-2.018.org/perldl.conf PDL-2.018/perldl.conf
+--- PDL-2.018.org/perldl.conf  2017-01-14 22:13:33.000000000 +0100
++++ PDL-2.018/perldl.conf      2021-05-09 00:22:58.271774104 +0200
+@@ -107,7 +107,7 @@
  # false -> skip build of PDL::Graphics:::TriD
  # undef -> let PDL build decide based on dependencies present
  #
@@ -10,7 +10,7 @@ diff -urN PDL-2.4.0.org/perldl.conf PDL-2.4.0/perldl.conf
  
  # Build Graphics/TriD using Perl OpenGL
  #
- # true -> use new Perl OpenGL bindings
+@@ -115,7 +115,7 @@
  # false -> use legacy, deprecated X11 only bindings
  # undef -> let PDL build decide (check if Perl OpenGL is present)
  #
@@ -18,10 +18,10 @@ diff -urN PDL-2.4.0.org/perldl.conf PDL-2.4.0/perldl.conf
 +        USE_POGL => 1,
  #       USE_POGL => 0,
  #
-         POGL_VERSION => 0.63,           # minimum compatible OpenGL version
-@@ -110,7 +110,7 @@
- #    about curses to fix it 
- #  - 1 builds, 0 or undef does not build
+         POGL_VERSION => 0.6702,           # minimum compatible OpenGL version
+@@ -189,7 +189,7 @@
+ # Do we build PDL::IO::Browser?
+ # default -> do not build
  #
 -        WITH_IO_BROWSER => 0,
 +        WITH_IO_BROWSER => 1,

diff --git a/perl-PDL-vendorarch.patch b/perl-PDL-vendorarch.patch
index 86fe10202bd84864d1f505e0bca1d479a55a7419..1276f5bb06e0e5edd821fbf6d2b979cc10c80d3e 100644 (file)
--- a/perl-PDL-vendorarch.patch
+++ b/perl-PDL-vendorarch.patch
@@ -1,9 +1,9 @@
-diff -urN PDL-2.4.0.org/Makefile.PL PDL-2.4.0/Makefile.PL
---- PDL-2.4.0.org/Makefile.PL  2003-12-30 15:48:05.287018839 +0100
-+++ PDL-2.4.0/Makefile.PL      2003-12-30 16:29:53.451383052 +0100
-@@ -313,6 +313,11 @@
-       @$(PERL) -Mblib Doc/scantree.pl $(INSTALLSITEARCH)
-       @$(PERL) Doc/mkhtmldoc.pl $(INSTALLSITEARCH)/PDL
+diff -urNp -x '*.orig' PDL-2.018.org/Makefile.PL PDL-2.018/Makefile.PL
+--- PDL-2.018.org/Makefile.PL  2021-05-09 00:22:58.841780681 +0200
++++ PDL-2.018/Makefile.PL      2021-05-09 00:22:58.928448347 +0200
+@@ -557,6 +557,11 @@ doc_vendor_install ::
+ %HTML%        $(NOECHO) $(ECHO) "doc_vendor_install: Building PDL documentation web pages ..."
+ %HTML%        $(NOECHO) $(PERL) Doc$(DFSEP)mkhtmldoc.pl "$(DESTDIR)$(INSTALLVENDORARCH)$(DFSEP)PDL"
  
 +doc_vendor_install ::
 +      @echo "doc_vendor_install: Building PDL documentation database ..."
@@ -11,5 +11,5 @@ diff -urN PDL-2.4.0.org/Makefile.PL PDL-2.4.0/Makefile.PL
 +      @$(PERL) Doc/mkhtmldoc.pl $(DESTINSTALLVENDORARCH)/PDL
 +      
  doc_perl_install ::
-       @echo "doc_perl_install: Building PDL documentation database ..."
-       @$(PERL) -Mblib Doc/scantree.pl $(INSTALLARCHLIB)
+       $(NOECHO) $(ECHO) "doc_perl_install: Building PDL documentation database ..."
+       $(NOECHO) $(PERLRUNINST) Doc$(DFSEP)scantree.pl "$(DESTDIR)$(INSTALLARCHLIB)"