components/perl_modules/perl-tk/patches/001-system-jpeg.patch
author Bill Rushmore <bill.rushmore@oracle.com>
Fri, 07 Aug 2015 13:43:38 -0700
changeset 4746 8e237ffd0a48
parent 1677 e41bbf0b1631
permissions -rw-r--r--
20995635 Perl TK needs to be upgraded to work with Perl 5.20 20994112 Perl XML::Parser needs to work with Perl 5.20 20989929 Perl net-ssleay needs to be fixed so it builds with Perl 5.20 20989909 Perl libxml needs to be fixed so it builds with Perl 5.20 20989894 Perl DBI - needs to be fixed so it builds with Perl 5.20 20989877 AUTHEN-PAM needs to be fixed so it builds with Perl 5.20 21195142 OpenSCAP's Makefile needs to be updated to work with Perl 5.20 21216887 Dependencies and references to Perl 5.16 need to be replaced with Perl 5.20
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1677
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     1
In-House patch. 
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     2
Making sure Perl-Tk does not build its own copy of libjpeg, instead links against libjpeg library already present in Solaris in /usr/lib.
4746
8e237ffd0a48 20995635 Perl TK needs to be upgraded to work with Perl 5.20
Bill Rushmore <bill.rushmore@oracle.com>
parents: 1677
diff changeset
     3
--- Tk-804.033/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800
8e237ffd0a48 20995635 Perl TK needs to be upgraded to work with Perl 5.20
Bill Rushmore <bill.rushmore@oracle.com>
parents: 1677
diff changeset
     4
+++ Tk-804.033/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800
1677
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     5
@@ -1,27 +1,6 @@
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     6
 # -*- cperl -*-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     7
 use Tk::MMutil;
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     8
 use Tk::Config ();
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
     9
-use File::Copy;
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    10
-my $l = $Config::Config{'lib_ext'};
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    11
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    12
-use Tk::MMtry;
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    13
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    14
-if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    15
- {
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    16
-  push(@args, LIBS => ['-ljpeg'],
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    17
-              INC  => '-I/usr/local/include',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    18
-              DEFINE => '-DHAVE_JPEGLIB_H',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    19
-      );
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    20
-  warn "Using system's -ljpeg\n";
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    21
-  unlink("jpeg/Makefile.PL");
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    22
- }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    23
-else
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    24
- {
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    25
-  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    26
-              'INC'     => '-Ijpeg');
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    27
-  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    28
-  warn "Building jpeg/libjpeg$l\n";
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    29
- }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    30
 
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    31
 Tk::MMutil::TkExtMakefile(@args,
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    32
     'NAME'         => 'Tk::JPEG',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    33
@@ -32,9 +11,9 @@
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    34
     'OBJECT'       => '$(O_FILES)',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    35
     'VERSION_FROM' => 'JPEG.pm',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    36
     'XS_VERSION'   => $Tk::Config::VERSION,
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    37
-    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    38
-    'clean'        => { FILES => 'jpeg/Makefile jpeg/Makefile.PL jpeg/config.status jpeg/jconfig.h' }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    39
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    40
+    'LIBS'         => ['-ljpeg'],
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    41
+    'DEFINE'       => '-DHAVE_JPEGLIB_H',
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    42
+    'dist'         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    43
    );
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    44
 
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    45
 sub MY::test_via_harness
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    46
@@ -45,19 +24,3 @@
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    47
 }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    48
 
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    49
 package MY;
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    50
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    51
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    52
-sub postamble {
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    53
-  if (-f "jpeg/Makefile.PL")
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    54
-   {
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    55
-    return
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    56
-'
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    57
-$(MYEXTLIB)  : FORCE
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    58
-	cd jpeg && $(MAKE) libjpeg'.$l.'
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    59
-';
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    60
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    61
-   }
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    62
-}
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    63
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    64
-
e41bbf0b1631 PSARC 2013/271 perl-tk version 804.031
mahmood.ali@oracle.com <mahmood.ali@oracle.com>
parents:
diff changeset
    65
-