diff options
Diffstat (limited to 'system/pcmanfm')
-rw-r--r-- | system/pcmanfm/README | 6 | ||||
-rw-r--r-- | system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch | 54 | ||||
-rw-r--r-- | system/pcmanfm/pcmanfm.SlackBuild | 44 | ||||
-rw-r--r-- | system/pcmanfm/pcmanfm.info | 6 |
4 files changed, 30 insertions, 80 deletions
diff --git a/system/pcmanfm/README b/system/pcmanfm/README index a8e5b2a028..f7b14ceb9f 100644 --- a/system/pcmanfm/README +++ b/system/pcmanfm/README @@ -1,10 +1,10 @@ PCManFM is an extremely fast and lightweight GTK+ based file manager which features tabbed browsing and a user-friendly interface. -By default the gtk+2 version is built: if you prefer to build the -gtk+3 one pass the script the parameter GTK=3, like +By default the gtk+3 version is built: if you prefer to build the +gtk+2 one pass the script the parameter GTK3=no, like - GTK=3 ./pcmanfm.SlackBuild + GTK3=no ./pcmanfm.SlackBuild If you have problems viewing icons on pcmanfm and you're using the gtk+2 version, include this line to your $HOME/.gtkrc-2.0: diff --git a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch b/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch deleted file mode 100644 index ad9a022db9..0000000000 --- a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0619a81f358d85568d990fc78c67e121e55f1c05 Mon Sep 17 00:00:00 2001 -From: Michael Weghorn <m.weghorn@posteo.de> -Date: Thu, 27 Dec 2018 11:56:09 +0100 -Subject: [PATCH] Avoid undefined 'isdigit()' behaviour - -As the C11 standard says in section 7.4, 1), -the 'isdigit()' function is only well-defined -under this precondition: - -> The header <ctype.h> declares several functions -> useful for classifying and mapping characters. -> In all cases the argument is an int, the value of -> which shall be representable as an unsigned char or -> shall equal the value of the macro EOF. If the argument -> has any other value, the behavior is undefined. - -Therefore avoid to use the 'isdigit()' function here, -since the Gdk key codes and thus the 'keyval' -member from the 'GdkEventKey' do not always fulfill -this requirement and the behaviour is thus undefined. ---- - NEWS | 5 +++++ - src/main-win.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index d2e6caa..c5b2285 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,8 @@ -+Changes on 1.3.2 since 1.3.1: -+ -+* Fixed case when some keyboard shortcuts stopped working: Alt+Home, Alt+Up. -+ -+ - Changes on 1.3.1 since 1.3.0: - - * Allowed bigger sizes of icons and thumbnails as 256*256 appears to be small -diff --git a/src/main-win.c b/src/main-win.c -index 3907dba..49fc53b 100644 ---- a/src/main-win.c -+++ b/src/main-win.c -@@ -2465,7 +2465,7 @@ static gboolean on_key_press_event(GtkWidget* w, GdkEventKey* evt) - - if(modifier == GDK_MOD1_MASK) /* Alt */ - { -- if(isdigit(evt->keyval)) /* Alt + 0 ~ 9, nth tab */ -+ if(evt->keyval >= '0' && evt->keyval <= '9') /* Alt + 0 ~ 9, nth tab */ - { - int n; - if(evt->keyval == '0') --- -2.1.4 - diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index 2785dd5496..852d5f2cae 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for PCMan File Manager (PCManFM) # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com> # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix doc permissions. +# - remove empty/useless files from doc dir. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pcmanfm -VERSION=${VERSION:-1.3.1} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.3.2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -56,12 +67,9 @@ else LIBDIRSUFFIX="" fi -case "$GTK" in - 3) gtk="--with-gtk=3" ;; - *) gtk="--with-gtk=2" ;; -esac +gtk="--with-gtk=3" ; [ "${GTK3:-yes}" = "no" ] && gtk="--with-gtk=2" -DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO" +DOCS="AUTHORS COPYING NEWS README TODO" set -e @@ -71,14 +79,12 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z 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 {} \; - -# Apply upstream patches -for i in $CWD/patches/* ; do patch -p1 < $i ; done + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ sh autogen.sh || true @@ -96,12 +102,10 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG - -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 +gzip -9 $PKG/usr/man/man*/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +install -m0644 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -109,4 +113,4 @@ 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:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index 7cb89e0763..d3546b675e 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,8 +1,8 @@ PRGNAM="pcmanfm" -VERSION="1.3.1" +VERSION="1.3.2" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.1.tar.xz" -MD5SUM="d32ad2c9c7c52bff2004bbc120b53420" +DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz" +MD5SUM="ef7c4417d2697ef138d175db7aeae15a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" |