From 54cc32076721b1540deb6af06e220b7c2bf47485 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 18 Apr 2022 16:28:36 -0400 Subject: [PATCH] libraries/libcryptui: Add doinst.sh, fix icons. Signed-off-by: B. Watson --- libraries/libcryptui/doinst.sh | 5 +++ libraries/libcryptui/libcryptui.SlackBuild | 38 +++++++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 libraries/libcryptui/doinst.sh diff --git a/libraries/libcryptui/doinst.sh b/libraries/libcryptui/doinst.sh new file mode 100644 index 0000000000..6922dbb756 --- /dev/null +++ b/libraries/libcryptui/doinst.sh @@ -0,0 +1,5 @@ +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/libraries/libcryptui/libcryptui.SlackBuild b/libraries/libcryptui/libcryptui.SlackBuild index c60ed6b6f5..a09faec62b 100644 --- a/libraries/libcryptui/libcryptui.SlackBuild +++ b/libraries/libcryptui/libcryptui.SlackBuild @@ -21,25 +21,28 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220418 bkw: Modified by SlackBuilds.org, BUILD=3: +# - add doinst.sh, because we need a glib-compile-schemas at install time. +# - resize 2 of the icons to match the directory names. +# Note to maintainer: I think the icons may belong in /usr/share/icons, +# you might want to check into this. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libcryptui VERSION=${VERSION:-3.12.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -49,8 +52,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" @@ -71,14 +74,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -94,13 +97,15 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man*/* -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# 20220418 bkw: a couple of the icons are slightly the wrong size. +for i in bad ok; do + icon=$PKG/usr/share/pixmaps/cryptui/22x22/seahorse-sign-$i.png + convert -background none -extent 22x22 -gravity center $icon new.png + mv new.png $icon +done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION @@ -110,6 +115,7 @@ rm -f $PKG/usr/lib*/*.la mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE