diff options
| author |   B. Watson <urchlay@slackware.uk> | 2023-01-26 12:51:02 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-01-28 08:23:14 +0700 |
| commit | 37168998cb0b2f1a019f60d162adeea2bb307243 (patch) | |
| tree | da5632696e27ab00d41edf04d5f3a238a95c2bbd | |
| parent | 3cb6b4db26e9178cdf5e21e3bfcecb402f4d35b7 (diff) | |
| download | slackbuilds-37168998cb0b2f1a019f60d162adeea2bb307243.tar.gz slackbuilds-37168998cb0b2f1a019f60d162adeea2bb307243.tar.xz | |
desktop/hsetroot: Work around imlib2 breakage.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/hsetroot/hsetroot.SlackBuild | 19 | ||||
| -rw-r--r-- | desktop/hsetroot/imlib2_pkgconfig.diff | 20 |
2 files changed, 32 insertions, 7 deletions
diff --git a/desktop/hsetroot/hsetroot.SlackBuild b/desktop/hsetroot/hsetroot.SlackBuild index c21558ff0f..d2c8dae32a 100644 --- a/desktop/hsetroot/hsetroot.SlackBuild +++ b/desktop/hsetroot/hsetroot.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. +# 20230126 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix build with imlib2-1.10.0. +# - get rid of useless INSTALL from doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hsetroot VERSION=${VERSION:-1.0.2} -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,13 @@ 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 {} \+ + +# 20230126 bkw: fix build for later imlib2, which lacks imlib2-config. +patch -p1 < $CWD/imlib2_pkgconfig.diff +autoreconf -if CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -94,7 +99,7 @@ make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog 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/desktop/hsetroot/imlib2_pkgconfig.diff b/desktop/hsetroot/imlib2_pkgconfig.diff new file mode 100644 index 0000000000..f1230480c0 --- /dev/null +++ b/desktop/hsetroot/imlib2_pkgconfig.diff @@ -0,0 +1,20 @@ +diff -Naur hsetroot-1.0.2/configure.ac hsetroot-1.0.2.patched/configure.ac +--- hsetroot-1.0.2/configure.ac 2003-09-05 17:41:38.000000000 -0400 ++++ hsetroot-1.0.2.patched/configure.ac 2023-01-26 12:45:06.365351344 -0500 +@@ -39,15 +39,8 @@ + AC_C_CONST + + # Check for imlib2 +-AC_CHECK_PROGS(imlib2config_cmd, imlib2-config) +-if test x$imlib2config_cmd = "x"; then +- AC_MSG_ERROR([error. Imlib2 is required to compile.]) +-fi +- +-IMLIB2_CFLAGS=`$imlib2config_cmd --cflags` ++PKG_CHECK_MODULES([IMLIB2], [imlib2]) + AC_SUBST(IMLIB2_CFLAGS) +- +-IMLIB2_LIBS=`$imlib2config_cmd --libs` + AC_SUBST(IMLIB2_LIBS) + + # Some extra definitions for config.h |