inkscape fix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2153 370017ae-e619-0410-ac65-c121f96126d4

3 files changed, 21 insertions, 8 deletions

diff --git a/media/gfx/inkscape/Manifest b/media/gfx/inkscape/Manifest
index 37869715..0b6f42ba 100644
--- a/media/gfx/inkscape/Manifest
+++ b/media/gfx/inkscape/Manifest
@@ -1,5 +1,5 @@
 DIST inkscape-0.46.tar.gz 18615326 MD5 3bae9034047379012127e52f9b138d32 SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a SHA512 279fc80dc0e8b46530353619457f26ea2cfd00ec4a9a45456c66a6a454784394484a059e191a565777b39110e6f8842a546c8bb518b91b25c91726b60fbd505c RMD160 449e07fa4caa71f20025774353d19cad674631ac
-MKBUILD inkscape.mkbuild 4721 MD5 0ff562f12f4147e0c7b90ffc400d0ebe SHA1 c1a919c04ea0c6641aa1374ba1fbfde565e12ede SHA256 d625e267d038441ccb6d235fb03af66137c856c379aad82c2a0d6ee9af4741e6 SHA512 836314ef8c783867a0115869ab719a9d600ae18fda660af778d4ac01b1c81a8533c6d94ae5a58b4a3886ac5eea7fa574f7b367e2da3bf66de0cff8d3507c13b3 RMD160 206b3d2c1814a2196c584dffaac84bccf49deac5
+MKBUILD inkscape.mkbuild 4729 MD5 8d4009a09b54cd5b39f3c084b85861ee RMD160 80233b8e7a3a083db6b19181f7b755bf6cec89d9 SHA1 bde01c352b828c77eb9ea9ffb3f79d1d12e5ab38 SHA256 bc5f336496f8a689a77c5d83d2097e8b6849b89bb7fb30e49f22b8ffe62e9d62 SHA512 c5ec3f5b76f52700ee2321318ea3d30ded31a96720373bcc1e78e8b88e284116e5abc1d4f26ff14b97acdb1936456cd399f8191bb6029860fdcccb1cb3e96ef4
 PATCH inkscape-0.46.diff 1571 MD5 fffe7ed73bdadcf0f90282d5afc4df30 SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c SHA512 c0ff0125659f74d5047ea4e6c8bbc37a52f6c5dd75bced13ad93c2a82b1ca0969c64a65732f540699fa38a648ed39eefeb9660b493ff991604541657fab3499a RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba
-SLACK-REQUIRED slack-required 195 MD5 f51bb1179ebcc7ce1565e15ef356bd3d SHA1 87e66c153cf0848645bdb0a3123bf2eb2dc5e2e5 SHA256 7f30ea4811cdb5d750b60a93a183ccd3e0f321520c4912f02d5d29590b7c6e1b SHA512 dca8465d1867aafa71b24fc0fbb1140db77b91a1160149ab6902549c0d3d4628d754ca6c94e1bf2240de2c1ee6583bbb3862825a694c537dfd64db1f0cdeda2a RMD160 f4a07ad0e8d39d7c616ef6541b03c200b1cd1f96
-SLACKBUILD inkscape.SlackBuild 9589 MD5 6ff965fb41e0dca11c179fa5474b1d94 SHA1 d9d41d7ee07c97418e41309fad373bfd94a91e2c SHA256 d18bbfd18835b6f8a4a670db1822e94ee33c6afc9c5d93415083ffc3323cb28b SHA512 066407fea4fce6a28887850e20af4f6203ddfd013580107d63efbc03e3eaf164c01ed1d935e60445a2cbaa09b11f38a3464ce7f90bc25c7f557108b76f25e259 RMD160 2bcf7719a01dae3d74a8a9000ae5edf467ae94a2
+SLACK-REQUIRED slack-required 205 MD5 2a078439228457eb50361ccc76213b66 RMD160 8e9f1bfb2cb4c112b7ed8eb8a24d5574707810c5 SHA1 b923eb2dbd77fd3c621af6dce89f01e7364bd840 SHA256 27ec6da8a5a33d8acaab4fda01e38693a0ded83b016c1be71aa85aa6a6c77fb4 SHA512 01f44736d74525cf77c98fe9e2944c254c750d8cdaa6bcf23059c19f1f91f7fd7066456f8a222e819bd119bded5f7b9a9366b79b50ae6a45e8187badf3c9ed6b
+SLACKBUILD inkscape.SlackBuild 9993 MD5 445a80a73ffbb89a09d971d683a089aa RMD160 cdf73b8d15b9147f622fdb5d6cfeb8c4fe84ddd6 SHA1 d2b57f5e55a5ee1c4f1cbd054f7ccdd8d3179840 SHA256 f8f2cfa1bac21d6e0991de38c456eccc768ec24b5a1e01685a8f1c54d1b4568e SHA512 9e0667e01880d063d8030cad9b13c5ff941fa34057153f5a2f25afa34964b9ec74baf298acd0c08b66debfa6587c10f0a4dfd3b1d36c7430839bd49793999290
diff --git a/media/gfx/inkscape/inkscape.SlackBuild b/media/gfx/inkscape/inkscape.SlackBuild
index 2875bcc8..c2e72b17 100755
--- a/media/gfx/inkscape/inkscape.SlackBuild
+++ b/media/gfx/inkscape/inkscape.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for inkscape, by Alexandre Vieira de Souza
-# requires: gtk+2 gtkmm glib2 libsigc++ libxslt libxml2 libgc 
+# requires: gtk+2 gtkmm glib2 libsigc++ libxslt libxml2 libgc boost 
 # tested: inkscape-0.46
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/gfx/inkscape"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -132,6 +134,15 @@ echo Success.
 # Check Manifest file
 if [ -e "$CWD/Manifest" ]; then
 
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
   MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
 
   for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
@@ -164,7 +175,7 @@ if [ -e "$CWD/Manifest" ]; then
     fi
 
     # Check source code integrity
-    for ALGO in md5 sha1 sha256 sha512 rmd160; do
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
       if [ $ALGO = "rmd160" ]; then
         ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
       else
@@ -278,7 +289,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/gfx/inkscape/slack-required b/media/gfx/inkscape/slack-required
index edf8b4dc..3d9b5cea 100644
--- a/media/gfx/inkscape/slack-required
+++ b/media/gfx/inkscape/slack-required
@@ -8,3 +8,4 @@ libsigc++		>=		2.0.12
 libxslt		>=		1.0.15
 libxml2		>=		2.6.20
 libgc		>=		6.4
+boost