network/xombrero: Updated for version 1.6.4.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
Erik Falor 2017-01-23 23:53:17 +00:00 committed by David Spencer
parent 3de7f9f310
commit ce5bff46e2
5 changed files with 20 additions and 37 deletions

View file

@ -1,9 +1,3 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
fi
fi

View file

@ -16,4 +16,4 @@ xombrero:
xombrero: In addition to providing a familiar mouse-based interface, it offers a
xombrero: set of vi-like keyboard commands for power-users.
xombrero:
xombrero: Homepage: https://opensource.conformal.com/wiki/xombrero
xombrero: Homepage: https://github.com/conformal/xombrero/wiki

View file

@ -2,7 +2,7 @@
# Slackware build script for xombrero
# Copyright 2014 Erik Falor, Utah, USA
# Copyright 2017 Erik Falor, Utah, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,13 +23,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xombrero
VERSION=${VERSION:-1.6.3}
BUILD=${BUILD:-2}
VERSION=${VERSION:-1.6.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PRGNAM_UPPER=$(echo $PRGNAM | tr '[:lower:]' '[:upper:]')
VERSION_UNDERSCORE=$(echo $VERSION | tr . _)
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@ -54,28 +56,26 @@ else
LIBDIRSUFFIX=""
fi
set -e
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tgz
cd $PRGNAM-$VERSION
rm -rf $PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}
tar xvf $CWD/$PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}.tar.gz
cd $PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}
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 \
\( -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 {} \;
# Patch xombrero.h to not expect resources in /usr/local/share/xombrero
# https://opensource.conformal.com/flyspray/index.php?do=details&task_id=372
patch -i $CWD/xombrero.h.patch
sed -i 's|https://www.cyphertite.com|http://www.slackware.com|' xombrero.{c,conf,h}
sed -i 's|https://www.cyphertite.com|http://www.slackware.com|' xombrero.{conf,h}
sed -i 's|/etc/ssl/cert.pem|/etc/ssl/certs/ca-certificates.crt|' xombrero.conf
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
PREFIX=/usr \

View file

@ -1,11 +0,0 @@
--- xombrero.h 2012-11-28 11:23:15.000000000 -0700
+++ xombrero.h.new 2013-02-08 12:49:32.000610834 -0700
@@ -689,7 +689,7 @@
#define XT_DS_ALLOW_INSECURE_CONTENT (TRUE)
#define XT_DS_ALLOW_INSECURE_SCRIPTS (TRUE)
#define XT_DS_WARN_CERT_CHANGES (0)
-#define XT_DS_RESOURCE_DIR ("/usr/local/share/xombrero")
+#define XT_DS_RESOURCE_DIR ("/usr/share/xombrero")
#define XT_DS_DO_NOT_TRACK (0)
#define XT_DS_PRELOAD_STRICT_TRANSPORT (1)
#define XT_DS_GNUTLS_PRIORITY_STRING (NULL)

View file

@ -1,8 +1,8 @@
PRGNAM="xombrero"
VERSION="1.6.3"
HOMEPAGE="https://opensource.conformal.com/wiki/xombrero"
DOWNLOAD="https://opensource.conformal.com/snapshots/xombrero/xombrero-1.6.3.tgz"
MD5SUM="11248a0f40542265022e8dfe692644da"
VERSION="1.6.4"
HOMEPAGE="https://github.com/conformal/xombrero/wiki"
DOWNLOAD="https://github.com/conformal/xombrero/archive/XOMBRERO_1_6_4/xombrero-XOMBRERO_1_6_4.tar.gz"
MD5SUM="a7c570f67b5791ec132bade643b508f7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libbsd webkitgtk3"