summaryrefslogtreecommitdiffstats
path: root/wine-pipelight
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-06-04 20:22:43 +0000
committer Eric Hameleers <alien@slackware.com>2014-06-04 20:22:43 +0000
commit422a5aee773f8fcec94a1e1302a7fe518d33b90b (patch)
tree3e617d85afa769d02f043255a73141d420a8c074 /wine-pipelight
parentce89199ae35487f13908f91aa4bef419157ae79e (diff)
downloadasb-422a5aee773f8fcec94a1e1302a7fe518d33b90b.tar.gz
asb-422a5aee773f8fcec94a1e1302a7fe518d33b90b.tar.xz
USe new patch location and its own Makefile. Compress the manpages.
Diffstat (limited to 'wine-pipelight')
-rwxr-xr-xwine-pipelight/build/wine-pipelight.SlackBuild25
1 files changed, 14 insertions, 11 deletions
diff --git a/wine-pipelight/build/wine-pipelight.SlackBuild b/wine-pipelight/build/wine-pipelight.SlackBuild
index aab3a15c..83cb2d1a 100755
--- a/wine-pipelight/build/wine-pipelight.SlackBuild
+++ b/wine-pipelight/build/wine-pipelight.SlackBuild
@@ -56,7 +56,9 @@
PRGNAM=wine-pipelight
SRCNAM=wine
+PATNAM=wine-compholio
SRCVER=${SRCVER:-"1.7.19"}
+COMPHOLIO=${COMPHOLIO:-"v${SRCVER}-1"}
VERSION=$(echo $SRCVER | tr '-' '.')
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -124,8 +126,9 @@ esac
SOURCE[0]="$SRCDIR/${SRCNAM}-${SRCVER}.tar.bz2"
SRCURL[0]="http://downloads.sourceforge.net/project/${SRCNAM}/Source/${SRCNAM}-${SRCVER}.tar.bz2"
-SOURCE[1]="$SRCDIR/${SRCNAM}-${VERSION}-patches.tar.gz"
-SRCURL[1]="http://fds-team.de/mirror/wine-patches.tar.gz"
+SOURCE[1]="$SRCDIR/${PATNAM}-${COMPHOLIO}.tar.gz"
+SRCURL[1]="http://fds-team.de/mirror/wine-compholio-$COMPHOLIO.tar.gz"
+SRCURL[1]="https://github.com/compholio/wine-compholio-daily/archive/${COMPHOLIO}.tar.gz"
SOURCE[2]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
@@ -214,15 +217,15 @@ fi
cd $TMP/tmp-$PRGNAM
echo "Extracting the source archive(s) for $PRGNAM..."
-tar -xvf ${SOURCE[0]}
-[ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
-cd ${SRCNAM}-${VERSION}
+tar -xf ${SOURCE[0]}
+[ "$SRCVER" != "$VERSION" ] && mv ${SRCNAM}-${SRCVER} ${SRCNAM}-${VERSION}
# Apply the pipelight patches:
-tar -xOf ${SOURCE[1]} | git apply -p1 --verbose 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-
-# Regenerate server requests (required for wine-compholio >= 1.7.11)
-./tools/make_requests
+tar -xf ${SOURCE[1]}
+cd ${PATNAM}-*
+make -C patches/ DESTDIR=$(cd ../${SRCNAM}-${VERSION}; pwd) install \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+cd ../${SRCNAM}-${VERSION}
chown -R root:root .
chmod -R u+w,go+r-w,a+X-s .
@@ -307,8 +310,8 @@ chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s)
-if [ -d $PKG/usr/man ]; then
- cd $PKG/usr/man
+if [ -d $PKG/${WPREFIX}/man ]; then
+ cd $PKG/${WPREFIX}/man
find . -type f -name "*.?" -exec gzip -9f {} \;
for i in $(find . -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
fi