system/epson-printer-utility: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 40 insertions, 26 deletions

diff --git a/system/epson-printer-utility/epson-printer-utility.SlackBuild b/system/epson-printer-utility/epson-printer-utility.SlackBuild
index bc48675174..fa010d0817 100644
--- a/system/epson-printer-utility/epson-printer-utility.SlackBuild
+++ b/system/epson-printer-utility/epson-printer-utility.SlackBuild
@@ -24,13 +24,20 @@
 
 #thanks to B.Watson for support on this build. :-)
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - fix build on 15.0.
+# - add qt4 as a dependency, and modify the script to use it.
+# - fix weird libtool issue (libcutils.la wasn't being built).
+# - stop writing to $CWD. use a top-level build dir instead.
+# - fix hardcoded /usr/lib64 in rm command (fix build on 32-bit)!
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=epson-printer-utility
 VERSION=${VERSION:-1.1.1}
 EXTRABIT=1lsb3.2
 TARNAM=$PRGNAM-$VERSION.tar.gz
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -42,14 +49,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-#lets get the source tarball from the rpm and clean up the bits we don't need
-rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
-tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION.tar.gz ./
-cp $PRGNAM-$VERSION-$EXTRABIT/epson-backend-$VERSION.tar.gz ./
-rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-rm -r $PRGNAM-$VERSION-$EXTRABIT
-
 # 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.
@@ -78,21 +77,35 @@ fi
 
 set -e
 
+TOPDIR=$TMP/$PRGNAM-$VERSION-build
+
+source /etc/profile.d/qt4.sh; export PATH
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAM
+rm -rf $TOPDIR
+mkdir -p $TOPDIR
+cd $TOPDIR
+
+#lets get the source tarball from the rpm and clean up the bits we don't need
+ln -s $CWD/$PRGNAM-$VERSION-$EXTRABIT.src.rpm .
+rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
+tar xvf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+
+tar xvf $TARNAM
 #we remove the tarnam as the original is an rpm
 #this keeps things tidy.
-rm $CWD/$TARNAM
+rm $TARNAM
+
 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 {} \+
 
 echo "patch configure.ac"
 sed -i 's_/opt/lsb/bin/lsbc++_/usr/bin/c++_g' configure.ac
@@ -132,11 +145,11 @@ autoreconf --install --force
 #fix hardcoded /opt/lsb stuff
 sed -i 's_/opt/lsb_/usr_g' EPSCommonLib/Makefile.am
 #patch qtlibs reference in wrong place
-sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" EPSCommonLib/Makefile.am
+sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt4/include/QtCore_g" EPSCommonLib/Makefile.am
 sed -i 's_/opt/lsb_/usr_g' PrinterUtility/Makefile.am
-sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" PrinterUtility/Makefile.am
-sed -i "s_/usr/include/QtGui_/usr/lib${LIBDIRSUFFIX}/qt/include/QtGui_g" PrinterUtility/Makefile.am
-sed -i "s_include/QtNetwork_lib${LIBDIRSUFFIX}/qt/include/QtNetwork_g" PrinterUtility/Makefile.am
+sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt4/include/QtCore_g" PrinterUtility/Makefile.am
+sed -i "s_/usr/include/QtGui_/usr/lib${LIBDIRSUFFIX}/qt4/include/QtGui_g" PrinterUtility/Makefile.am
+sed -i "s_include/QtNetwork_lib${LIBDIRSUFFIX}/qt4/include/QtNetwork_g" PrinterUtility/Makefile.am
 echo "running configure"
 
 CC=/usr/bin/c++ \
@@ -184,19 +197,19 @@ cp PrinterUtility/Images/AppIcon.png $PKG/usr/share/pixmaps/epson-printer-utilit
 #+-----------------------------------------------------------+
 #| we now have to process the communication daemon           |
 #+-----------------------------------------------------------+
-cd $TMP
+cd $TOPDIR
 rm -rf epson-backend-$VERSION
-tar -xzf $CWD/epson-backend-$VERSION.tar.gz
+tar xvf epson-backend-$VERSION.tar.gz
 #we remove the tarnam as the original is an rpm
 #this keeps things tidy.
-rm $CWD/epson-backend-$VERSION.tar.gz
+rm epson-backend-$VERSION.tar.gz
 cd epson-backend-$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 {} \+
 
 echo "running aclocal"
 aclocal
@@ -222,6 +235,7 @@ CXXFLAGS="$SLKCFLAGS -fpermissive" \
 echo "patching source for backend daemon. epmnt.c"
 sed -i "1 i #include <stdlib.h>\n#include <string.h>" daemon/epmnt.c
 echo "running make"
+make -C src libcutils.la   # 20220307 bkw: this one wasn't being made
 make
 echo "running make install"
 make install DESTDIR=$PKG
@@ -233,7 +247,7 @@ make install DESTDIR=$PKG
 #we will trash the contents of /usr/lib64/epson-backend  for now, it looks like it is just debian daemon stuff.
 #we need to create our own rc.ecbd file to start/stop/restart the backend
 #this should be added into rc.local to make it active at startup
-rm -r $PKG/usr/lib64/epson-backend
+rm -r $PKG/usr/lib$LIBDIRSUFFIX/epson-backend
 mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.ecbd $PKG/etc/rc.d/rc.ecbd.new
 #the utility won't work without the daemon, so reduce steps admin has to do to get
@@ -247,7 +261,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/epson-printer-utility/epson-printer-utility.info b/system/epson-printer-utility/epson-printer-utility.info
index 04281e9828..0d37bccc40 100644
--- a/system/epson-printer-utility/epson-printer-utility.info
+++ b/system/epson-printer-utility/epson-printer-utility.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-pr
 MD5SUM="4285b0585dd559d53f2c233fb96b4a00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"