diff options
| -rw-r--r-- | system/cndrvcups-capt/cndrvcups-capt.SlackBuild | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild index cca42232af44b..580543df1071b 100644 --- a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild +++ b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220212 bkw: Modified by SlackBuilds.org: fix the build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cndrvcups-capt @@ -32,15 +34,12 @@ 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 @@ -50,8 +49,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" @@ -75,13 +74,15 @@ 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 {} \+ # Fix missing include patch -p1 <$CWD/ppapdata.c.diff +SLKCFLAGS+=" -fcommon" + ( cd driver CFLAGS="$SLKCFLAGS" \ @@ -153,7 +154,7 @@ patch -p1 <$CWD/ppapdata.c.diff cd statusui CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - LIBS="-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0" \ + LIBS="$( pkg-config --libs gtk+-2.0) -lpthread" \ ./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} |