wxwidgets: updating to 2.8.10

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

2 files changed, 99 insertions, 6 deletions

diff --git a/x11/libs/wxwidgets/Manifest b/x11/libs/wxwidgets/Manifest
new file mode 100644
index 00000000..5e9ebf2e
--- /dev/null
+++ b/x11/libs/wxwidgets/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST wxWidgets-2.8.10.tar.bz2 14007241 MD5 0461c2085ac1ad7e648aa84c4ba51dd1 RMD160 d7a25ec0a78c43d378999abac2cefeacb0da6e3a SHA1 5784b10d7cf662c57049f03c5d66151bde950c5e SHA256 b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5 SHA512 7c6b27c51b30b4f7b3bccbc02748a35e2dd78b523d438cadc517f919eb35b0f6b119014578c57346457e4bd4d8db5df358a46cf85c88016fc781dce4ca3520a2
+MKBUILD wxWidgets.mkbuild 3480 MD5 f80ce95d883ebeb8c1d26fe10f206f98 RMD160 0184d7d189362d00e889c3add78e6444cde740e8 SHA1 0c8588f85fdc064817dd17d612320949d2745a9a SHA256 5c1ff3d64b5f2a81e4b49c8fb23f2d7a3a114db9f2af1f8e0f8d13c6719ae2df SHA512 8c9364eb8274880e86db809d708d30468549430d2e16199fe7145d4b04a990219952e9d03d4424ced320e0877173592116fd704336a48306d0dcb3dfab8a4a79
+SLACKBUILD wxWidgets.SlackBuild 7595 MD5 97e770ee435c40a06255981a2f721af5 RMD160 d47b61397c3069c8dd669a83f2304e293004e89d SHA1 c9eb1b6c135bf6a996978dd836be594c977eaf39 SHA256 2abf52c4361f6c30ae159e2174f6667a0985d0ad6592d4c0fadd3d69ca9aa93d SHA512 5ad1c748361242322079dd8cc77497ae608e231d5c86c5af6468f0ff6b3b8ddbb396f1f6bb498c23bb6a3aaad135ff1db8eaa256f0406192cddd912215c0b138
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKtn4eAAoJEEHL93ESzgeiIagP+QFplWQIt+mBirPmzsOomArw
+uRFCzQmaaeGVxAl+D0jfYW/BUBZZMMSc/tUH3RoLC0G5JAw/CgytdOYTrcN0p1F2
+Sk+2irH+LFoqdaEV6/UnYR/gRkmO2FoV3eE5URlCC4hjDYWf1cx5FSu02b6p6LTG
+zT3uJa6WPAfaR6Ylnq06dWukYIFFmExrzFnFMUCkvq/wVkzFZOJvS8mvD0eDae6O
+fVyAM18DPybu7kyY99rUUkX1aw6PGfXwXG2abCGy30hl2jGyNxCK5iN/uvqUGiVf
+GKI3R3PWERKpRBTpmdSmso0d9i7aq3TG7NSbVTEf5v/HanKULB85vCK7g1km5d3r
+eUSubPQQlIJCUaqakG8po3erynpxYHIZqmrL7PgHb0eJU1BPLkBAk+4hTswSKv5A
+0bEtHzhavCM2yDbXQv+xs0XvF+UfHZZ4e6kx2vt+gIUTi/2judfFL3OdAmOVY0d2
+qyYNPDvV/DWh6wfGPa8sBQxnY7c7PQfU8v+a660+2PRc/po+NcQlWiKzqNnIumXl
+cQJTZXrDDuRQPvJAs0nsRGwM2E6uDqz/wk+/HQLrKwJa+3k6m73UlpXja5tPblyb
+TRPewf+U8xxpTfKXndB7hKBBhe9iDQoA0zdq4ob9vVH/L79s3XXgv+PD7rMOY8kZ
+R1DB1fEBf1YwtbJsCwnc
+=r3yr
+-----END PGP SIGNATURE-----
diff --git a/x11/libs/wxwidgets/wxWidgets.SlackBuild b/x11/libs/wxwidgets/wxWidgets.SlackBuild
index 33f58e37..c9d7f473 100755
--- a/x11/libs/wxwidgets/wxWidgets.SlackBuild
+++ b/x11/libs/wxwidgets/wxWidgets.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for wxWidgets, by Silvio Rhatto
 # requires:  
-# tested: wxWidgets-2.8.8
+# tested: wxWidgets-2.8.10
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="wxWidgets"
 PKG_NAME="wxWidgets"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.8.8}
+SRC_VERSION=${VERSION:=2.8.10}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="x11/libs/wxwidgets"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--enable-unicode --with-opengl"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# 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
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -149,9 +218,10 @@ EODESC
 
 # 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi