diff options
| -rw-r--r-- | system/multiload-ng/README | 5 | ||||
| -rw-r--r-- | system/multiload-ng/multiload-ng.SlackBuild | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/system/multiload-ng/README b/system/multiload-ng/README index 5b5a6effee9e..e59e2269e667 100644 --- a/system/multiload-ng/README +++ b/system/multiload-ng/README @@ -9,6 +9,9 @@ Note: upstream defaults are - build the generic system tray plugin - build the xfce4 panel plugin +The xfce4 panel plugin is disabled in this SlackBuid, because it won't +build with Slackware's version of XFCE4. + any of these may be overridden by passing its corresponding parameter to the script, i. e. - GTK=2 @@ -16,7 +19,7 @@ the script, i. e. - LXPANEL=yes - MATE=yes - SYSTRAY=no - - XFCE4=no + - XFCE4=yes (currently this will cause the build to fail, patches welcome) for example GTK=2 LXPANEL=yes ./multiload-ng.SlackBuild diff --git a/system/multiload-ng/multiload-ng.SlackBuild b/system/multiload-ng/multiload-ng.SlackBuild index bbb9c2f3d1c6..a30f27c3d31d 100644 --- a/system/multiload-ng/multiload-ng.SlackBuild +++ b/system/multiload-ng/multiload-ng.SlackBuild @@ -22,6 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220210 bkw: Modified by SlackBuilds.org: fix the build on 15.0. I +# had to disable the XFCE4 plugin; if you know how to fix it, please +# send a patch. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=multiload-ng @@ -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 @@ -94,10 +95,11 @@ case "$SYSTRAY" in *) SYSTRAY="yes" ;; esac -# default is to build the xfce4 panel plugin +# 20220210 bkw: default is to NOT build the xfce4 panel plugin, +# because it fails to build on 15.0. case "$XFCE4" in - no) ;; - *) XFCE4="yes" ;; + yes) XFCE4="yes" ;; + *) XFCE4="no" ;; esac set -e @@ -111,12 +113,14 @@ 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 {} \+ ./autogen.sh +SLKCFLAGS+=" -fcommon" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -132,10 +136,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS Changelog.md CONTRIBUTING.md COPYING README.md \ |