libraries/wxGTK3: Support static and webview feature.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 36 insertions, 11 deletions

diff --git a/libraries/wxGTK3/README b/libraries/wxGTK3/README
index ddb59333c7..60664362d1 100644
--- a/libraries/wxGTK3/README
+++ b/libraries/wxGTK3/README
@@ -5,8 +5,17 @@ platform's controls and utilities.
 webkitgtk and webkitgtk3 are optional dependencies of this package.
 This will provide webview support.
 
-NOTE: this package is NOT built using --enable-stl by default.
-if you need to enable stl, use STL=yes ./wxGTK3.SlackBuild
+NOTE:
+this package is NOT built using --enable-stl by default.
+if you need to enable stl, use:
+STL=yes ./wxGTK3.SlackBuild
+
+If you need to build static version, use:
+STATIC=yes ./wxGTK3.SlackBuild
+When building with static libraries, plugin support will be disabled.
+
+This script also auto-detect webkitgtk presence. If it's installed,
+it will automatically use --enable-webkit parameter.
 
 wxGTK3 can be installed alongside with wxGTK/wxPython, but it will
 overwrite wx-config created by wxGTK/wxPython.
diff --git a/libraries/wxGTK3/wxGTK3.SlackBuild b/libraries/wxGTK3/wxGTK3.SlackBuild
index 05d45ce493..3a9ce7237e 100644
--- a/libraries/wxGTK3/wxGTK3.SlackBuild
+++ b/libraries/wxGTK3/wxGTK3.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=wxGTK3
 VERSION=${VERSION:-3.0.2}
-GITVER=${GITVER:-a34b9c1e01699c4924357ace906644c03ea9d0bf}
-BUILD=${BUILD:-3}
+GITVER=${GITVER:-1a9900a81340b3b509ec2e904667f3538bca4e3d}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 SRCNAM=wxWidgets
@@ -57,8 +57,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
-
 # Check for STL
 if [ "${STL:-no}" = "yes" ]; then
   stl="--enable-stl"
@@ -66,19 +64,35 @@ else
   stl=""
 fi
 
+# Check for WebKit
+webkit=`pkg-config --exists webkit-1.0`
+if [ "$?" -eq 0 ]; then
+  wk="--enable-webkit"
+else
+  wk=""
+fi
+
+# Check for static
+if [ "${STATIC:-no}" = "yes" ]; then
+  st="--disable-shared"
+else
+  st="--enable-shared"
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$GITVER
-#tar xvf $CWD/$SRCNAM-$GITVER.tar.bz2
 unzip $CWD/$SRCNAM-$GITVER.zip
 cd $SRCNAM-$GITVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,7 +100,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --enable-shared \
   --enable-mediactrl \
   --with-opengl \
   --enable-graphics_ctx \
@@ -94,7 +107,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-unicode \
   --enable-plugins \
   --enable-ipv6 \
+  --enable-webview \
+  $wk \
   $stl \
+  $st \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/wxGTK3/wxGTK3.info b/libraries/wxGTK3/wxGTK3.info
index af93ff1a5b..02ca222d8b 100644
--- a/libraries/wxGTK3/wxGTK3.info
+++ b/libraries/wxGTK3/wxGTK3.info
@@ -1,7 +1,7 @@
 PRGNAM="wxGTK3"
 VERSION="3.0.2"
 HOMEPAGE="http://www.wxwidgets.org"
-DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/a34b9c1e01699c4924357ace906644c03ea9d0bf/wxWidgets-a34b9c1e01699c4924357ace906644c03ea9d0bf.zip"
+DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/1a9900a81340b3b509ec2e904667f3538bca4e3d/wxWidgets-1a9900a81340b3b509ec2e904667f3538bca4e3d.zip"
 MD5SUM="7074ddaa9336b941737b985761861b0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""