From 6cf9644d620274f9803dcd3514698228b0c927ae Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Tue, 1 Sep 2009 13:00:56 +0000
Subject: htmldoc: Fixing gentoo bug 278186

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2237 370017ae-e619-0410-ac65-c121f96126d4
---
 app/text/htmldoc/Manifest            | 32 ++++++++++++++++----------------
 app/text/htmldoc/htmldoc-1.8.27.diff | 36 ++++++++++++++++++++++++++++++++++++
 app/text/htmldoc/htmldoc.SlackBuild  | 29 +++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 18 deletions(-)
 create mode 100644 app/text/htmldoc/htmldoc-1.8.27.diff

diff --git a/app/text/htmldoc/Manifest b/app/text/htmldoc/Manifest
index 631b1e47..61fb6d64 100644
--- a/app/text/htmldoc/Manifest
+++ b/app/text/htmldoc/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 DIST htmldoc-1.8.27-source.tar.bz2 3960271 MD5 35589e7b8fe9c54e11be87cd5aec4dcc RMD160 9605a5894675439f5fae405fb060972e19f33c7e SHA1 472908e0aafed1cedfbacd8ed3168734aebdec4b SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512 f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438
-MKBUILD htmldoc.mkbuild 6113 MD5 94ca89659adef7cab9d0960672c5725e RMD160 28a0fd03a7c235ee17cec0f25b44da1c92475747 SHA1 33869e18b8995cac79c26bc6ee58033c36b95235 SHA256 fcb6ea1167da14fac88f79526c5c2f0e1d41c466034be6d434f301716c4a509b SHA512 f65eeccba8c8d58b980bfb9e6a7ff5861246e69de43be1bbbb92f1b30712c95fd73f0d522d643334cc503b5b443b92adbbf122c0d0c34c79636a85c66ba1af45
-SLACKBUILD htmldoc-1.8.27.SlackBuild 7757 MD5 09aa606ccb2193a35979aeb2d3648bda RMD160 62d15efb6a94dcbb0050875bf8a1a4ff69fccf6b SHA1 14201580df22bffb4a65d3bbdb0b5fd6f0f3f132 SHA256 5956000787e1eed992917fb7bc3be7a37f85dbaef1c6de327bdeaf27a13b7148 SHA512 a674911c38f7596c47b49f19afb81af0ac646b8699e7f55d4f7c2d93f3cc319365b4c0830d00245d27587f68fdf22e6884faae343fc45560df1cefbeecb9e634
-SLACKBUILD htmldoc.SlackBuild 7715 MD5 f52a55c0ed8851b5c588896ed193e2fe RMD160 3efbc426579a42300b3dcde9694ede26b4ab6f3b SHA1 24253e847a0265bf529e9d6f596c1e8ef82eb5ae SHA256 efcbc547ed3cfe9c3b23672861337539b7cfb2fca5e008a1948a6a829f919ce6 SHA512 ef83a88d943940b8978d4515acbf9d81983caff073b2767a7d68a14f554df63dd04861ba759889ce3074d4ecad67f8dcc03394336822b80e0d017332c401d3d7
+MKBUILD htmldoc.mkbuild 6114 MD5 427b85d9bf3408ebe0ee5e43344af034 RMD160 8f58d494f3cfd66ce2f05837f3ce8473848cfcf1 SHA1 851d64d95321934b5b5741f67dbad1c58124f00b SHA256 9056f650bc2e1b6402cc69818a74e3655c4c84a5655ebf963ef4992ace3fd5b1 SHA512 08863d842e5472226a0b1e6344ef216c2844f341a9665d7007ccbc70057d4f64a7b56e690372e9ac72983f51d7bccfdc06aef163b65d4beb279a71331b5685db
+PATCH htmldoc-1.8.27.diff 1272 MD5 700ceb22ebb8084e8f991c02c5bbef89 RMD160 d6880a8e8a449d747a2a8f260b40d046510d48ae SHA1 b2a23826c4b9686206eeaea62135d1faf7053b80 SHA256 8ef9d5de8b28cf789a8f9b7f18b86836a79105ceaf46b7d159b2dc5309a32c25 SHA512 6991ccebbb2604fcd60f207bfee13eab95180104ddd045fc0734426f4e5e92c9e542da47d51004c5d6b468f94ca92270d9447ea3b7ba449cdcb6ca9511effbbd
+SLACKBUILD htmldoc.SlackBuild 8693 MD5 c135674a3f0a7115f5d63d3cdc0c617c RMD160 53066d74e18a61b11c851606513fde6d27a9031c SHA1 e6b48fd035cb1b9ff92013eb44392283a5605314 SHA256 6b8c388445aa7becc4dec744f4228c8d0fc867fa8fa3f9e05d88b873417f63e7 SHA512 7ce831ccb1ee3397d368342df29b2ab447019a7ed7f7778a780fbb7a2a60cf059d06d574d59371c3489472160eee30638cf55db7bd80043a92d4b205efcd07f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBCAAGBQJKAzG0AAoJEEHL93ESzgeichkP/RU52++QkS7rqDVVSCjtWwio
-m4E/Enlx+BJCiFsvqIiRZWbdXE4ajPS7qzB3aUK75vVBslZaCA2LV2iqgTiqLx/U
-GD49JagQiQiZJi/f53s+nofU1vTlRP/3yr9/MEOH7tjRkXKqOJUyX3tj38gvzBo/
-B9OKIexmvTZD46bOmLS2DlEB/MgA7xuDbeyicx8tU7jFj2tTLf4/F0o6qBAYMumO
-DwMmh0kO41Uhpth2kkVO+bSawaXtQFkjjbUcsPOlwFKzvhB6sbnLJVuDpMbuTW3w
-XzhqEMdexgpHsXPyrPnI2UYCaeLD25rPb+sU3auzNINbVjgUhR5XM2y2LjfHYCJa
-/TWO8tRXy6clfrbkbFS3WmavX9Iz9LRZ2AhInfClBH7J4fh3OzxFz5NZrc0AgGaJ
-veRZ2Ozw0H1ezbgJy1p0mPlrGgAGOiM6f5D+EnbsDWi451kotw8tfyi630oahMVu
-AMNMJN3OrmfajJPIhFkrn5zR191pPQLUdpF2QGVIfsU2PSNlHd7DfrvoNArzuAVx
-BPOuriZkeh1wWjTmLT10+lO5C1z5kaNaoE7DPuRth+fK4r3hqm2sNIV5EwircQk2
-oIqUZychh77ehxSln+cnMAKdV1MqOjPTFnnPR8tlVMOV4p3EtM6LpVgPpOK80xVk
-qzka1lZT8kbCCLx8t92E
-=yIGa
+iQIcBAEBCAAGBQJKnRpmAAoJEEHL93ESzgeijAAP/RwaASj27EepmuzwEPCGY2Ln
+8VgmuFW871Skl0SM/UuYySi0Hgp/gZQ4BrL+GOYtYQOrFh+fJssLV672ojPslqt0
+E5KdgPWbJ7VuP0Hia0vY+oKhFWBg5Mih/0cP7NTLpv0TrGgr75XTstSBx+ahjWzV
+YjSoCcak8p6NwVNr1XAiUNLB36WxkxmN1yiDT33qdlpMrPc8/3AP4IX6o1cRInH3
+6l1hxMztf+h/DRJNwhveMJidXw5jPlvw3Fy4MtqZo9nKaDTLdBdZax9SZchBj2ho
+z26tGABGRMAH0rQ9+6x2L4gLQIXXxquTh8B5AO9tChkC0apQTYg/n3dwQ1l58LZ6
+qYjFNRcuy/tRv3vHwFkXTMg+Tkms/WIzsaEIILbHadQ3gJV8jyTQKAsPpRyGGLVS
+UPqEuB3tw8MhgGsoqIDdGeNCjtiROMc8GqDlHEVfOtT0WBAgf37Mf/eGfTNh6j/y
+04SzaiIcmmIRU7b8l5qDPD1asNB5Ziza327ZNUqW48ltNfzIrHx4iqmNsfgmF7iR
+uwhA5rH8duAy6SgIYK/7/xCBF7NFMiDIKIM4H3zZwnCpRHBd+2SU5llaeNv0Vqpx
+rve7Oqtr+iCJxHsi1Mw/mssJGeAzgLCKj7dcigAtxqWyG9xVxMtp7dBpbZTb4rCJ
+f5zVxqwi4g3TI/7xcXh8
+=+q77
 -----END PGP SIGNATURE-----
diff --git a/app/text/htmldoc/htmldoc-1.8.27.diff b/app/text/htmldoc/htmldoc-1.8.27.diff
new file mode 100644
index 00000000..ee7859cd
--- /dev/null
+++ b/app/text/htmldoc/htmldoc-1.8.27.diff
@@ -0,0 +1,36 @@
+diff -ru a/htmldoc/htmllib.cxx b/htmldoc/htmllib.cxx
+--- a/htmldoc/htmllib.cxx	2006-06-07 19:43:52.000000000 +0200
++++ b/htmldoc/htmllib.cxx	2009-08-01 19:52:46.301099436 +0200
+@@ -2139,7 +2139,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
++          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+           for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/ps-pdf.cxx b/htmldoc/ps-pdf.cxx
+--- a/htmldoc/ps-pdf.cxx	2006-08-01 18:58:50.000000000 +0200
++++ b/htmldoc/ps-pdf.cxx	2009-08-01 19:53:14.300610480 +0200
+@@ -12512,7 +12512,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
++	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+ 	  for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/util.cxx b/htmldoc/util.cxx
+--- a/htmldoc/util.cxx	2005-04-24 21:20:32.000000000 +0200
++++ b/htmldoc/util.cxx	2009-08-01 19:52:14.469652088 +0200
+@@ -484,7 +484,7 @@
+     PageWidth  = 595;
+     PageLength = 792;
+   }
+-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
++  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
+   {
+    /*
+     * Custom size...
diff --git a/app/text/htmldoc/htmldoc.SlackBuild b/app/text/htmldoc/htmldoc.SlackBuild
index 56f07151..afb9eaf3 100644
--- a/app/text/htmldoc/htmldoc.SlackBuild
+++ b/app/text/htmldoc/htmldoc.SlackBuild
@@ -17,7 +17,7 @@
 # slackbuild for htmldoc, by Silvio Rhatto
 # requires:  
 # tested: htmldoc-1.8.27
-# model: generic.mkSlackBuild $Rev: 805 $
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -34,7 +34,7 @@ PKG_NAME="htmldoc"
 ARCH=${ARCH:=i486}
 SRC_VERSION=${VERSION:=1.8.27}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=1rha}
+BUILD=${BUILD:=2rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
@@ -159,6 +159,31 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
+# Patch source
+patches=" [[PATCH URLS]]
+         $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
+         $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
+for patch in $patches; do
+  patch="`basename $patch`"
+  if [ -f "$CWD/$patch" ]; then
+    patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch" ]; then
+    patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/$patch.gz" ]; then
+    gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch.gz" ]; then
+    gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$SRC_DIR/$patch" ]; then
+    if [ "`basename $patch .gz`" != "$patch" ]; then
+      gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    elif [ "`basename $patch .bz2`" != "$patch" ]; then
+      bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    else
+      patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
+    fi
+  fi
+done
+
 # Thanks LukenShiro <lukenshiro at ngi.it> for the SlackBuild from slackbuilds.org
 # Thanks to Gentoo htmldoc's .ebuild maintainer for hints about configure's workaround
 
-- 
cgit v1.2.3