diff options
Diffstat (limited to 'source/l/cairo')
-rw-r--r-- | source/l/cairo/cairo-1.10.0-buggy_gradients.patch | 13 | ||||
-rwxr-xr-x | source/l/cairo/cairo.SlackBuild | 49 | ||||
-rwxr-xr-x | source/l/cairo/paredown.sh | 51 |
3 files changed, 81 insertions, 32 deletions
diff --git a/source/l/cairo/cairo-1.10.0-buggy_gradients.patch b/source/l/cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 13ef50b25..000000000 --- a/source/l/cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c 2010-08-04 11:57:49.000000000 +0200 -+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200 -@@ -353,11 +353,7 @@ - /* Prior to Render 0.10, there is no protocol support for gradients and - * we call function stubs instead, which would silently consume the drawing. - */ --#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 - display->buggy_gradients = TRUE; --#else -- display->buggy_gradients = FALSE; --#endif - display->buggy_pad_reflect = FALSE; - display->buggy_repeat = FALSE; diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild index cd31e8ecd..1b834332d 100755 --- a/source/l/cairo/cairo.SlackBuild +++ b/source/l/cairo/cairo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.10.2 -BUILD=${BUILD:-2} +PKGNAM=cairo +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -52,14 +53,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-cairo +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf cairo-$VERSION -tar xvf $CWD/cairo-$VERSION.tar.?z* || exit 1 -cd cairo-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -67,10 +68,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Thanks to Ubuntu for this, but I found it at Gentoo's bugtracker -# http://bugs.gentoo.org/show_bug.cgi?id=336696 -zcat $CWD/cairo-1.10.0-buggy_gradients.patch.gz | patch -p1 || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -83,21 +80,28 @@ CFLAGS="$SLKCFLAGS" \ --disable-win32 \ --disable-trace \ --enable-xlib \ - --enable-freetype \ + --enable-xcb \ + --enable-xcb-shm \ + --enable-xlib-xcb \ --enable-ps \ --enable-pdf \ --enable-svg \ --enable-tee \ --enable-gobject \ + --enable-xml \ --build=$ARCH-slackware-linux + # None of these are 'stable' yet... # --enable-qt \ # --enable-gl \ # --enable-drm \ -# --enable-xcb \ # --enable-xlib-xcb \ -# --enable-xcb-drm \ -# --enable-drm-xr \ +# --enable-xcb-shm \ + +# Not sure if these two are needed / useful yet; --enable-xcb is now default +# --enable-xcb-shm \ +# --enable-xlib-xcb \ + # Skipping this, because it causes a dependency on the specific # version of binutils installed at compile time: # --enable-trace @@ -108,15 +112,22 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/cairo-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS BIBLIOGRAPHY BUGS CODING_STYLE COPYING* HACKING NEWS PORTING_GUIDE README RELEASING \ - $PKG/usr/doc/cairo-$VERSION -( cd $PKG/usr/doc/cairo-$VERSION ; ln -sf /usr/share/gtk-doc/html/cairo html ) + $PKG/usr/doc/$PKGNAM-$VERSION +( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -sf /usr/share/gtk-doc/html/cairo html ) + +# We do not need the entire NEWS file. +if [ -r NEWS ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat NEWS | head -n 1000 > $DOCSDIR/NEWS + touch -r NEWS $DOCSDIR/NEWS +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/cairo-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/cairo/paredown.sh b/source/l/cairo/paredown.sh new file mode 100755 index 000000000..a24369747 --- /dev/null +++ b/source/l/cairo/paredown.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Remove the reference PNG files from the cairo source tarball. +# These are used only for build time testing, and cairo always fails +# a large number of tests, making these files more or less useless to +# the average end user. If you really need them for some reason, you +# can fetch the original tarball from cairographics.org. +# +# Removing these files reduces the size of the source tarball by 93%. + +PKGNAM=cairo +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} + +if [ ! -r $PKGNAM-$VERSION.tar.xz ]; then + echo "$PKGNAM-$VERSION.tar.xz is not a cairo tarball. Exiting." + exit 1 +fi + +touch -r $PKGNAM-$VERSION.tar.xz tmp-timestamp || exit 1 + +rm -rf $PKGNAM-$VERSION +tar xvf $PKGNAM-$VERSION.tar.xz || exit 1 +rm -f $PKGNAM-$VERSION/test/reference/* +rm -f $PKGNAM-$VERSION.tar.xz +tar cvf $PKGNAM-$VERSION.tar $PKGNAM-$VERSION +touch -r tmp-timestamp $PKGNAM-$VERSION.tar +xz -9 -v $PKGNAM-$VERSION.tar +rm -rf $PKGNAM-$VERSION tmp-timestamp + +echo "Repacking of $PKGNAM-$VERSION.tar.xz complete." + |