summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author B. Watson2022-02-17 22:22:47 +0100
committer Willy Sudiarto Raharjo2022-02-19 06:09:27 +0100
commitfde9d29f67f074bccfc41b6455604485055d138d (patch)
tree0e70563cc7748d9775403d6b353444eb87296ccb /office
parenta066700687d9be0db608f8e1a0c173ed033b3f52 (diff)
downloadslackbuilds-fde9d29f67f074bccfc41b6455604485055d138d.tar.gz
office/tudu: Fix conflict with PDCurses.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/tudu/tudu.SlackBuild20
1 files changed, 15 insertions, 5 deletions
diff --git a/office/tudu/tudu.SlackBuild b/office/tudu/tudu.SlackBuild
index e8693d9fb4..40088320f5 100644
--- a/office/tudu/tudu.SlackBuild
+++ b/office/tudu/tudu.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.
+# 20220217 bkw: Modified by SlackBuilds.org: fix build if PDCurses happens
+# to be installed on the build host.
cd $(dirname $0) ; CWD=$(pwd)
@@ -39,9 +41,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
@@ -76,9 +75,20 @@ 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 {} \+
+
+# 20220217 bkw: PDCurses installs a /usr/include/xcurses.h that
+# lacks support for wide characters. Forcing HAVE_XCURSES_H=0
+# prevents this build from failing if PDCurses happens to
+# be installed. Note to fellow admins: this is why you have to also
+# test SlackBuilds on a 'polluted' system with lots of packages
+# installed. If you only ever tested on a clean VM with no SBo
+# packages, you'd never find this issue (but our users would, because
+# they don't do the clean VM thing).
+
+sed -i '/^check_include *HAVE_XCURSES_H/aHAVE_XCURSES_H=0' configure
CXXFLAGS="$SLKCFLAGS" \
./configure \