summaryrefslogtreecommitdiff
path: root/source/ap/mc
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2011-04-25 13:37:00 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:45:18 +0200
commit75a4a592e5ccda30715f93563d741b83e0dcf39e (patch)
tree502f745607e77a2c4386ad38d818ddcafe81489c /source/ap/mc
parentb76270bf9e6dd375e495fec92140a79a79415d27 (diff)
downloadcurrent-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
Diffstat (limited to 'source/ap/mc')
-rwxr-xr-xsource/ap/mc/mc.SlackBuild21
-rw-r--r--source/ap/mc/mc.ext.in.geeqie.diff11
2 files changed, 22 insertions, 10 deletions
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index d4f00205..87e929ac 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -63,6 +63,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Use geeqie instead of gqview as an external image viewer:
+zcat $CWD/mc.ext.in.geeqie.diff.gz | patch -p1 --verbose || exit 1
+
if [ ! -x ./configure ]; then
./autogen.sh
fi
@@ -82,10 +85,10 @@ CFLAGS="$SLKCFLAGS" \
--with-ext2undel \
--with-x=yes \
--with-vfs \
- --with-samba \
- --with-configdir=/etc/samba \
- --with-codepagedir=/etc/codepages \
- --build=$ARCH-slackware-linux
+ --enable-vfs-smb \
+ --with-smb-configdir=/etc/samba \
+ --with-smb-codepagedir=/etc/codepages \
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
@@ -97,15 +100,14 @@ mkdir -p $PKG/usr/share/mc/bin
cp -a $CWD/profile.d/mc-wrapper.* $PKG/usr/share/mc/bin
chown root:root $PKG/usr/share/mc/bin/*
chmod 755 $PKG/usr/share/mc/bin/*
+
mkdir -p $PKG/etc/profile.d
cp -a $CWD/profile.d/mc.* $PKG/etc/profile.d
chown root:root $PKG/etc/profile.d/*
chmod 755 $PKG/etc/profile.d/*
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/mc-$VERSION
cp -a \
@@ -115,7 +117,6 @@ cp -a \
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-# Build package:
cd $PKG
/sbin/makepkg -l y -c n $TMP/mc-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/ap/mc/mc.ext.in.geeqie.diff b/source/ap/mc/mc.ext.in.geeqie.diff
new file mode 100644
index 00000000..8cdfecca
--- /dev/null
+++ b/source/ap/mc/mc.ext.in.geeqie.diff
@@ -0,0 +1,11 @@
+--- ./misc/mc.ext.in.orig 2010-11-08 05:46:13.000000000 -0600
++++ ./misc/mc.ext.in 2010-11-11 14:34:30.000000000 -0600
+@@ -391,7 +391,7 @@
+ Include=image
+
+ include/image
+- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
++ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (geeqie %f &); fi
+ View=%view{ascii} identify %f
+ #View=%view{ascii} asciiview %f
+