Ticket #15420: osx-gcc45.patch

File osx-gcc45.patch, 10.8 KB (added by pinny@…, 14 years ago)

diff for 10.6.4 using gcc45

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile

     
    2121
    2222%.o : %.java
    2323        $(GCJ) $(GCJFLAGS) -c $< -o $@
     24        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2425
    2526%.class : %.java
    2627        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    3435# the "$*" automatic variable, here
    3536#
    3637%.h : %.class
    37         $(GCJH) --classpath="." $*;
    38         $(RM) $<
     38        $(GCJH) --classpath="$(java_libs_root):." $*;
    3939
    4040##
    4141# targets

  • pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/java_libs/Makefile

     
    1313# append gcj flags
    1414export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
    1515
    16 all : libgcj_local itext
     16all : itext
    1717
    18 libgcj_local :
    19         $(MAKE) -C "$(java_libs_root)/gnu_local/java/security";
    20         $(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider";
    21         $(MAKE) -C "$(java_libs_root)/gnu/gcj/convert";
    22         $(MAKE) -C "$(java_libs_root)/java_local/security";
    23 
    2418itext :
    2519        $(MAKE) -C "$(java_libs_root)/com/lowagie/text";
    2620#       $(MAKE) -C "$(java_libs_root)/com/lowagie/text/html";
    … …  
    3529        $(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
    3630        $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
    3731
    38 clean : libgcj_local_clean itext_clean
     32clean : itext_clean
    3933
    40 libgcj_local_clean :
    41         $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean;
    42         $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean;
    43         $(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean;
    44         $(MAKE) -iC "$(java_libs_root)/java_local/security" clean;
    45 
    4634itext_clean :
    4735        $(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean;
    4836#       $(MAKE) -iC "$(java_libs_root)/com/lowagie/text/html" clean;

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java

     
    5050
    5151package com.lowagie.text.pdf;
    5252
    53 import java_local.security.MessageDigest; // ssteward
     53import java.security.MessageDigest;
    5454import com.lowagie.text.ExceptionConverter;
    5555
    5656/**

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java

     
    7676    // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would
    7777    // omit this class because of its reference by reflection;
    7878    // this treatment ensures that ld will include it
    79     private static Class c1= gnu.java.locale.Calendar.class;
     79    private static Class c1= java.util.Calendar.class;
    8080
    8181    private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,
    8282        Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/java_libs/com/lowagie/text/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/pdftk/Makefile.Generic

     
    1111#                                                                       
    1212
    1313# tools
    14 TOOLPATH=
    15 VERSUFF=
     14TOOLPATH= /opt/local/bin/
     15VERSUFF= -mp-4.5
    1616CXX= $(TOOLPATH)g++$(VERSUFF)
    1717export GCJ= $(TOOLPATH)gcj$(VERSUFF)
    1818export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
    … …  
    2424# ASK_ABOUT_WARNINGS to true; otherwise: false; override this default
    2525# with the dont_ask or do_ask command-line options
    2626CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers
    27 CXXFLAGS= -lgcj
     27CXXFLAGS= -lgcj /opt/local/lib/libiconv.2.dylib
    2828
    2929# itext compiler flags
    3030# -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
    31 export GCJFLAGS= -O2
     31export GCJFLAGS= -O2 -w
    3232
    3333#
    3434export ARFLAGS= rs

  • pdftk-1.41/java_libs/remove_symbols

     
     1__ZGr8_$_dummy
     2 No newline at end of file

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/pdftk/Makefile.Base

     
    3131afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
    3232afm_objects= $(patsubst %.afm, %.o, $(afms))
    3333
    34 # older versions of libgcj might not have the MD5 algorithm,
    35 # so I added it here; these *_local java files were grabbed from
    36 # libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1
    37 #
    38 # gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1
    39 #
    40 libgcj_local_libs = \
    41 $(java_libs_root)/java_local/security/security.a \
    42 $(java_libs_root)/gnu_local/java/security/provider/provider.a \
    43 $(java_libs_root)/gnu_local/java/security/security.a \
    44 $(java_libs_root)/gnu/gcj/convert/convert.a
    45 
    4634# this must already be set according to your platform Makefile;
    4735# we're just appending to it, here
    4836#
    49 CPPFLAGS += -DPDFTK_VER=\"1.41\"
     37CPPFLAGS += -DPDFTK_VER=\"1.41-r2\"
    5038
    5139all : java_libs pdftk
    5240

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets

  • pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile

     
    1717
    1818%.o : %.java
    1919        $(GCJ) $(GCJFLAGS) -c $< -o $@
     20        nmedit -R "$(java_libs_root)/remove_symbols" $@
    2021
    2122%.class : %.java
    2223        $(GCJ) $(GCJFLAGS) -C $<
    … …  
    2526# the "$*" automatic variable, here
    2627#
    2728%.h : %.class
    28         $(GCJH) --classpath="." $*;
    29         $(RM) $<
     29        $(GCJH) --classpath="$(java_libs_root):." $*;
    3030
    3131##
    3232# targets