summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-26 10:48:50 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-27 01:09:49 +0700
commit491199ca4948d7509516dedef5f965e10fc4d5e8 (patch)
treeaadde9210d4ac49758fd517286cd15db9b5df267
parent4d717774e93e4e8ad9da060f54ae510d51af40a3 (diff)
downloadslackbuilds-491199ca4948d7509516dedef5f965e10fc4d5e8.tar.gz
perl/perl-Image-Sane: Fix build if dbus not running.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--perl/perl-Image-Sane/perl-Image-Sane.SlackBuild16
1 files changed, 11 insertions, 5 deletions
diff --git a/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild b/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
index fefd421f57..d9ba988f5d 100644
--- a/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
+++ b/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
@@ -22,6 +22,9 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220222 bkw: Modified by SlackBuilds.org: fix build when dbus
+# isn't running.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=perl-Image-Sane
@@ -40,9 +43,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
@@ -77,9 +77,15 @@ cd $SRCNAM-$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 {} \+
+
+# 20220226 bkw: if dbus service isn't running, dike out the test
+# that requires it (so 'make test' will succeed).
+if ! ps -u messagebus -c | grep -wq dbus-daemon; then
+ rm -f t/options.t
+fi
perl Makefile.PL \
PREFIX=/usr \