From 1fa6afb7311322fa5c2b9c22a9a37c810a2b3418 Mon Sep 17 00:00:00 2001 From: Lukc Date: Sat, 18 Dec 2010 23:16:03 +0100 Subject: Import automatique des recettes de Crux. (git://crux.nu/ports/xorg.git - branche 2.7) --- xorg-xcursorgen/.footprint | 6 +++ xorg-xcursorgen/.md5sum | 2 + xorg-xcursorgen/Pkgfile | 18 ++++++++ xorg-xcursorgen/Pkgfile.old | 21 ++++++++++ xorg-xcursorgen/xorg-xcursorgen.diff | 80 ++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 xorg-xcursorgen/.footprint create mode 100644 xorg-xcursorgen/.md5sum create mode 100644 xorg-xcursorgen/Pkgfile create mode 100644 xorg-xcursorgen/Pkgfile.old create mode 100644 xorg-xcursorgen/xorg-xcursorgen.diff (limited to 'xorg-xcursorgen') diff --git a/xorg-xcursorgen/.footprint b/xorg-xcursorgen/.footprint new file mode 100644 index 0000000..6974f40 --- /dev/null +++ b/xorg-xcursorgen/.footprint @@ -0,0 +1,6 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/xcursorgen +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/xcursorgen.1.gz diff --git a/xorg-xcursorgen/.md5sum b/xorg-xcursorgen/.md5sum new file mode 100644 index 0000000..65960a7 --- /dev/null +++ b/xorg-xcursorgen/.md5sum @@ -0,0 +1,2 @@ +69df079b3950a0db4e5f4e6f0e00ddee xcursorgen-1.0.3.tar.bz2 +4bf56ad1c9336ff018b56d89ac29b6ca xorg-xcursorgen.diff diff --git a/xorg-xcursorgen/Pkgfile b/xorg-xcursorgen/Pkgfile new file mode 100644 index 0000000..1b4f217 --- /dev/null +++ b/xorg-xcursorgen/Pkgfile @@ -0,0 +1,18 @@ +description="Utility to create X cursors" +packager="" +maintainer="Tilman Sauerbeck, tilman at crux dot nu" +url="http://xorg.freedesktop.org" +depends=(xorg-libxcursor libpng) + +name=xorg-xcursorgen +version=1.0.3 +release=2 +source=(http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.3.tar.bz2 xorg-xcursorgen.diff) +build () +{ + cd xcursorgen-$version; + patch -p1 -i $SRC/$name.diff; + ./configure --prefix=/usr --mandir=$mandir; + make; + make DESTDIR=$PKG install +} diff --git a/xorg-xcursorgen/Pkgfile.old b/xorg-xcursorgen/Pkgfile.old new file mode 100644 index 0000000..3876153 --- /dev/null +++ b/xorg-xcursorgen/Pkgfile.old @@ -0,0 +1,21 @@ +# Description: Utility to create X cursors +# URL: http://xorg.freedesktop.org +# Maintainer: Tilman Sauerbeck, tilman at crux dot nu +# Depends on: xorg-libxcursor, libpng + +name=xorg-xcursorgen +version=1.0.3 +release=2 +source=(http://xorg.freedesktop.org/releases/individual/app/xcursorgen-$version.tar.bz2 + $name.diff) + +build() { + cd xcursorgen-$version + + patch -p1 -i $SRC/$name.diff + + ./configure --prefix=/usr --mandir=/usr/man + + make + make DESTDIR=$PKG install +} diff --git a/xorg-xcursorgen/xorg-xcursorgen.diff b/xorg-xcursorgen/xorg-xcursorgen.diff new file mode 100644 index 0000000..4418b96 --- /dev/null +++ b/xorg-xcursorgen/xorg-xcursorgen.diff @@ -0,0 +1,80 @@ +Adjusted from commit 9e7c41e0e16183110cd7b28d012a0bb69aed4655 upstream. + +diff -aur xcursorgen-1.0.3.orig/configure xcursorgen-1.0.3/configure +--- xcursorgen-1.0.3.orig/configure 2009-10-17 02:42:25.000000000 +0200 ++++ xcursorgen-1.0.3/configure 2010-09-05 11:59:50.910999988 +0200 +@@ -5043,12 +5043,12 @@ + pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 +- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng >= 1.2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null` ++ pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng >= 1.2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5059,12 +5059,12 @@ + pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 +- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng >= 1.2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null` ++ pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng >= 1.2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5082,14 +5082,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1` ++ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng >= 1.2.0" 2>&1` + else +- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1` ++ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng >= 1.2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XCURSORGEN_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng >= 1.2.0) were not met: + + $XCURSORGEN_PKG_ERRORS + +@@ -5100,7 +5100,7 @@ + and XCURSORGEN_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met: ++$as_echo "$as_me: error: Package requirements (x11 xcursor libpng >= 1.2.0) were not met: + + $XCURSORGEN_PKG_ERRORS + + + +diff --git a/xcursorgen.c b/xcursorgen.c +index fc80f6d..daae18b 100644 +--- a/xcursorgen.c ++++ b/xcursorgen.c +@@ -196,7 +196,7 @@ load_image (struct flist *list, char *prefix) + return NULL; + } + +- if (setjmp (png->jmpbuf)) ++ if (setjmp (png_jmpbuf(png))) + { + png_destroy_read_struct (&png, &info, NULL); + return NULL; + -- cgit v1.2.3-54-g00ecf