From 466aaa20d00a31f31f863cfcdc81cd3e313ee173 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sat, 9 Apr 2022 14:30:48 -0400 Subject: system/d-feet: Fix doinst.sh, symlinks. Signed-off-by: B. Watson --- system/d-feet/d-feet.SlackBuild | 21 +++++++++++++-------- system/d-feet/doinst.sh | 5 +++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild index 9ab02732cc..c2fe7e4e0a 100644 --- a/system/d-feet/d-feet.SlackBuild +++ b/system/d-feet/d-feet.SlackBuild @@ -22,11 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: +# - add glib-compile-schemas to doinst.sh. +# - use relative symlinks in /usr/share/help. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d-feet VERSION=${VERSION:-0.3.15} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +42,6 @@ if [ -z "$ARCH" ]; then 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 @@ -75,9 +76,9 @@ 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 \ + -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 {} \+ mkdir build cd build @@ -91,13 +92,17 @@ cd build --mandir=/usr/man \ --infodir=/usr/info \ --buildtype=release \ + -Dstrip=true \ -Dtests=false "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. -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 +# 20220409 bkw: absolute symlinks suck. +for i in $PKG/usr/share/help/??/$PRGNAM/figures; do + rm -f $i/icon.png + ln -s ../../../C/$PRGNAM/figures/icon.png $i/icon.png +done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING HACKING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/d-feet/doinst.sh b/system/d-feet/doinst.sh index 4a25de5e6f..401d987795 100644 --- a/system/d-feet/doinst.sh +++ b/system/d-feet/doinst.sh @@ -8,3 +8,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi +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 -- cgit v1.2.3-65-gdbad