X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Finject-xpdf.pl;h=16b2a77fb511430b43e77f97f719e93256f37dc5;hb=d46619a310dd04066cc117e904b84785d1a0cd51;hp=6571080d59fc1345f508090fc4ebd00f3a013c55;hpb=d7a44f0702f62381b468d0738c9c923d8c56fa03;p=swftools.git

diff --git a/lib/pdf/inject-xpdf.pl b/lib/pdf/inject-xpdf.pl
index 6571080..16b2a77 100755
--- a/lib/pdf/inject-xpdf.pl
+++ b/lib/pdf/inject-xpdf.pl
@@ -12,10 +12,15 @@ mkdir("$directory/tmp/");
 
 chdir("$directory/tmp/") or die;
 system("tar -zxvf ../../$filename") and die;
-system("find -type f -exec mv {} .. \\;") and die;
+system("find . -type f -exec mv {} .. \\;") and die;
 chdir("..");
-system("find -type d -exec rmdir {} \\; 2> /dev/null");
-system("patch < ../xpdf-changes.patch") and die;
+system("find . -type d -exec rmdir {} \\; 2> /dev/null");
+
+$c = 'find . \( -name "*.cc" -or -name "*.h" -or -name "*.c" \) -exec cp {} {}.orig \;';
+print "$c\n";
+system($c);
+
+system("patch < ../xpdf-changes.patch 2>&1 | grep -i failed");
 chdir("..");
 system("rm -f xpdf");
 system("ln -s $directory xpdf");
@@ -25,11 +30,17 @@ open(fi, ">switch");
 print fi <<EOF
 #!/bin/sh
 
-if test "x\$1" = "xstable";then
+VERSION=\$1
+PS3="choose> "
+
+if test "x\$VERSION" = "x";then
+    select V in stable latest;do VERSION="\$V";break;done
+fi
+if test "x\$VERSION" = "xstable";then
     echo "Switching to stable version"
     rm -f xpdf
-    ln -s xpdf-3.01 xpdf
-elif test "x\$1" = "xlatest";then
+    ln -s xpdf-3.02 xpdf
+elif test "x\$VERSION" = "xlatest";then
     echo "Switching to latest version"
     rm -f xpdf
     ln -s $directory xpdf
@@ -39,3 +50,4 @@ EOF
 close(fi);
 system("chmod a+x switch");
 
+