summaryrefslogtreecommitdiff
path: root/source/xap/xpaint
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2010-05-19 08:58:23 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:43:05 +0200
commitb76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/xap/xpaint
parent5a12e7c134274dba706667107d10d231517d3e05 (diff)
downloadcurrent-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
Diffstat (limited to 'source/xap/xpaint')
-rwxr-xr-xsource/xap/xpaint/xpaint.SlackBuild33
-rw-r--r--source/xap/xpaint/xpaint_2.7.8.1-1.2.diff47
-rw-r--r--source/xap/xpaint/xpaint_xaw3d_no_scroll_mode.diff11
3 files changed, 26 insertions, 65 deletions
diff --git a/source/xap/xpaint/xpaint.SlackBuild b/source/xap/xpaint/xpaint.SlackBuild
index c353c738..367df5ee 100755
--- a/source/xap/xpaint/xpaint.SlackBuild
+++ b/source/xap/xpaint/xpaint.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,20 @@
PKGNAM=xpaint
-VERSION=${VERSION:-2.7.8.1}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-2.8.16}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
CWD=$(pwd)
@@ -43,6 +53,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
cd $TMP
@@ -54,8 +67,6 @@ if [ "$ARCH" = "x86_64" ]; then
# Make it detect Xaw3d:
sed -i -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" $( grep -lr 'usr/lib/' * )
fi
-zcat ${CWD}/xpaint_xaw3d_no_scroll_mode.diff.gz | patch -p1 || exit 1
-#zcat ${CWD}/xpaint_2.7.8.1-1.2.diff.gz | patch -p1 || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
@@ -109,9 +120,17 @@ fi
# Add a documentation directory:
mkdir -p ${PKG}/usr/doc/xpaint-$VERSION
cp -a \
- README README.PNG README.old TODO \
+ GPL* INSTALL README* TODO* \
${PKG}/usr/doc/xpaint-$VERSION
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > ${PKG}/install/slack-desc
diff --git a/source/xap/xpaint/xpaint_2.7.8.1-1.2.diff b/source/xap/xpaint/xpaint_2.7.8.1-1.2.diff
deleted file mode 100644
index 1f8cc82e..00000000
--- a/source/xap/xpaint/xpaint_2.7.8.1-1.2.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./misc.h.orig 2005-08-15 14:50:05.000000000 -0500
-+++ ./misc.h 2007-05-10 16:46:23.000000000 -0500
-@@ -24,7 +24,7 @@
- long random(void);
- #endif
-
--#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
-+#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__GLIBC__)
- #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
- void srandom(unsigned int);
- #else
---- ./Local.config.orig 2005-04-30 16:33:14.000000000 -0500
-+++ ./Local.config 2007-05-10 16:47:02.000000000 -0500
-@@ -132,11 +132,11 @@
- XCOMM You must have the XPM library.
- XCOMM Make sure the path name to the library is correct.
-
--XPM_LIB = -L/usr/X11R6/lib -lXpm
-+XPM_LIB = -lXpm
-
- XCOMM Make sure this points to the location of the 'xpm.h' file.
-
--XPM_INCLUDE = -I/usr/X11R6/include/X11
-+XPM_INCLUDE = -I/usr/include/X11
-
-
- DEPENDFLAGS = -I./bitmaps
---- ./configure.orig 2005-06-03 07:26:11.000000000 -0500
-+++ ./configure 2007-05-10 16:46:23.000000000 -0500
-@@ -7,7 +7,7 @@
- echo "(looking for Xaw, Xaw3d, Xaw95, neXtaw)"
- echo ""
- else
-- WIDGETS=`echo $1 | tr [a:z] [A:Z]`
-+ WIDGETS=`echo $1`
- fi
-
- if test "$WIDGETS" = "" ; then
-@@ -54,7 +54,7 @@
- fi
- fi
-
--if test "$WIDGETS" = "XAW3DG" ; then
-+if test "$WIDGETS" = "xaw3dg" ; then
- ln -sf /usr/include/X11/Xaw3d xaw_incdir
- echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG"
- echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" > Local.xawdefs
diff --git a/source/xap/xpaint/xpaint_xaw3d_no_scroll_mode.diff b/source/xap/xpaint/xpaint_xaw3d_no_scroll_mode.diff
deleted file mode 100644
index f89b12c1..00000000
--- a/source/xap/xpaint/xpaint_xaw3d_no_scroll_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpaint-2.7.8.1/misc.c.orig 2005-04-24 11:57:52.000000000 +0000
-+++ xpaint-2.7.8.1/misc.c 2008-11-06 21:43:46.000000000 +0000
-@@ -671,7 +671,7 @@
- }
- else return;
- if (sb == None) return;
--#ifdef XAW3DG
-+#if defined(XAW3DG) && defined(XAW_ARROW_SCROLLBARS)
- if (((ScrollbarWidget)sb)->scrollbar.scroll_mode == 2 /* if scroll continuous */
- || LookAhead (sb, event))
- return;