office/texlive: Updated for version 20100722.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 14 insertions, 75 deletions

diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index f88019fe666b..a7d27661bebd 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -23,25 +23,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# URL: ftp://tug.org/historic/systems/texlive/2009/
+# URL: ftp://tug.org/historic/systems/texlive/2010/
 
 PRGNAM=texlive
-VERSION=20091107
-BUILD=${BUILD:-3}
+VERSION=20100722
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
 TEXMF_VERS=$VERSION
-EXTRA_VERS=$VERSION
+EXTRA_VERS=20100826
 
 TEXI2HTML=1.82		# texi2html version - http://www.nongnu.org/texi2html/
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -89,17 +87,18 @@ find . \
 #   "go with the flow" and use "--enable-multiplatform" so the symlinks
 #   that are automatically created will be correct...
 # Building with "--without-system-xpdf" because poppler API changes too often
+# Re ^^ let's try again with the system poppler library
 TL_BUILD_ENV="CFLAGS=\"$SLKCFLAGS\" CXXFLAGS=\"$SLKCFLAGS\"" \
 TL_CONFIGURE_ARGS="\
   --enable-multiplatform \
-  --with-tex-banner='TeX Live 2009/Slackware (unofficial)' \
+  --with-tex-banner='TeX Live 2010/Slackware (unofficial)' \
   --disable-native-texlive-build \
   --disable-static \
   --enable-ipc \
   --with-x \
   --without-etex \
   --disable-xindy \
-  --without-system-xpdf \
+  --with-system-xpdf \
   --with-system-ncurses \
   --with-system-zlib \
   --with-system-pnglib \
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 71fc80dc2fe7..28311cc8c8df 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,13 +1,13 @@
 PRGNAM="texlive"
-VERSION="20091107"
+VERSION="20100722"
 HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-extra.tar.xz \
-          ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-source.tar.xz \
-          ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-texmf.tar.xz \
+DOWNLOAD="ftp://tug.org/historic/systems/texlive/2010/texlive-20100722-source.tar.xz \
+          ftp://tug.org/historic/systems/texlive/2010/texlive-20100722-texmf.tar.xz \
+          ftp://tug.org/historic/systems/texlive/2010/texlive-20100826-extra.tar.xz \
           http://savannah.nongnu.org/download/texi2html/texi2html-1.82.tar.bz2"
-MD5SUM="da136791d9ba34f6396c6b1d4379ee53 \
-        18f992b4e6394770fb80e42719c0ec84 \
-        5c6b33235ab3330626f58ca665d53a3c \
+MD5SUM="156fa34c56acb901fdc687b8d9860f1f \
+        12dec3a323c4eb75b98a3160c62dc865 \
+        d268c292605117d9de895d21db3a2e86 \
         a8a9193c0ac1bec2f3ca7be40a5a82eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/texlive/texlive.png14.diff b/office/texlive/texlive.png14.diff
deleted file mode 100644
index ab3c8cc0922a..000000000000
--- a/office/texlive/texlive.png14.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -u -Nur texlive-20091107-source/libs/gd/gd-2.0.35/gd_png.c texlive-20091107-source.fixed/libs/gd/gd-2.0.35/gd_png.c
---- texlive-20091107-source/libs/gd/gd-2.0.35/gd_png.c	2009-03-20 10:58:16.000000000 +0300
-+++ texlive-20091107-source.fixed/libs/gd/gd-2.0.35/gd_png.c	2010-03-05 10:17:14.350872597 +0300
-@@ -149,7 +149,7 @@
- 	return NULL;
-   }
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (!(png_sig_cmp(sig, 0, 8) == 0)) { /* bad signature */
-     	return NULL;		/* bad signature */
- 	}
- 
-diff -u -Nur texlive-20091107-source/texk/dvipdfmx/src/pngimage.c texlive-20091107-source.fixed/texk/dvipdfmx/src/pngimage.c
---- texlive-20091107-source/texk/dvipdfmx/src/pngimage.c	2009-05-26 03:12:24.000000000 +0400
-+++ texlive-20091107-source.fixed/texk/dvipdfmx/src/pngimage.c	2010-03-05 10:12:39.976897269 +0300
-@@ -148,7 +148,7 @@
-   rewind (png_file);
-   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
-       sizeof(sigbytes) ||
--      (!png_check_sig (sigbytes, sizeof(sigbytes))))
-+      (!(png_sig_cmp(sigbytes, 0, sizeof(sigbytes)) == 0)))
-     return 0;
-   else
-     return 1;
-diff -u -Nur texlive-20091107-source/texk/web2c/xetexdir/pngimage.c texlive-20091107-source.fixed/texk/web2c/xetexdir/pngimage.c
---- texlive-20091107-source/texk/web2c/xetexdir/pngimage.c	2006-07-26 20:19:45.000000000 +0400
-+++ texlive-20091107-source.fixed/texk/web2c/xetexdir/pngimage.c	2010-03-05 10:15:45.010872612 +0300
-@@ -101,7 +101,7 @@
-   rewind (png_file);
-   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
-       sizeof(sigbytes) ||
--      (!png_check_sig (sigbytes, sizeof(sigbytes))))
-+      (!(png_sig_cmp(sigbytes, 0, sizeof(sigbytes)) == 0)))
-     return 0;
-   else
-     return 1;
-diff -u -Nur texlive-20091107-source/texk/xdvipdfmx/src/pngimage.c texlive-20091107-source.fixed/texk/xdvipdfmx/src/pngimage.c
---- texlive-20091107-source/texk/xdvipdfmx/src/pngimage.c	2007-11-22 19:48:06.000000000 +0300
-+++ texlive-20091107-source.fixed/texk/xdvipdfmx/src/pngimage.c	2010-03-05 10:37:12.920343277 +0300
-@@ -146,7 +146,7 @@
-   rewind (png_file);
-   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
-       sizeof(sigbytes) ||
--      (!png_check_sig (sigbytes, sizeof(sigbytes))))
-+      (!(png_sig_cmp(sigbytes, 0, sizeof(sigbytes)) == 0)))
-     return 0;
-   else
-     return 1;
-diff -u -Nur texlive-20091107-source/texk/xdvipdfmx/src/xbb.c texlive-20091107-source.fixed/texk/xdvipdfmx/src/xbb.c
---- texlive-20091107-source/texk/xdvipdfmx/src/xbb.c	2008-05-25 19:00:35.000000000 +0400
-+++ texlive-20091107-source.fixed/texk/xdvipdfmx/src/xbb.c	2010-03-05 10:15:23.713902927 +0300
-@@ -246,7 +246,7 @@
-   unsigned char sigbytes[4];
-   rewind (png_file);
-   if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
--      (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
-+      (!(png_sig_cmp(sigbytes, 0, sizeof(sigbytes)) == 0))) return 0;
-   else return 1;
- }             
-