[arch-commits] Commit in sawfish/repos (3 files)

Juergen Hoetzel juergen at archlinux.org
Thu Apr 9 20:46:14 UTC 2009


    Date: Thursday, April 9, 2009 @ 16:46:14
  Author: juergen
Revision: 34504

Merged revisions 34488,34497 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/sawfish/trunk

........
  r34488 | juergen | 2009-04-09 20:19:27 +0200 (Do, 09 Apr 2009) | 1 line
  
  upgpkg: sawfish 1.3.5.2-1
........
  r34497 | juergen | 2009-04-09 22:09:29 +0200 (Do, 09 Apr 2009) | 1 line
  
  fix broken config.h.in
........

Added:
  sawfish/repos/extra-x86_64/sawfish-1.3.5.2-config.h.in.patch
    (from rev 34497, sawfish/trunk/sawfish-1.3.5.2-config.h.in.patch)
Modified:
  sawfish/repos/extra-x86_64/	(properties)
  sawfish/repos/extra-x86_64/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   11 -
 sawfish-1.3.5.2-config.h.in.patch |  285 ++++++++++++++++++++++++++++++++++++
 2 files changed, 292 insertions(+), 4 deletions(-)


Property changes on: sawfish/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sawfish/trunk:1-34478
   + /sawfish/trunk:1-34503

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-09 20:44:20 UTC (rev 34503)
+++ extra-x86_64/PKGBUILD	2009-04-09 20:46:14 UTC (rev 34504)
@@ -3,19 +3,22 @@
 
 pkgname=sawfish
 pkgver=1.3.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An extensible window manager using a Lisp-based scripting language"
 url="http://sawfish.wikia.com/"
 arch=(i686 x86_64)
-license=('GPL')fdd
+license=('GPL')
 depends=('librep' 'esd' 'gtk2' 'rep-gtk' 'libsm' 'gmp')
-source=(http://downloads.sourceforge.net/sourceforge/sawmill/sawfish-$pkgver.tar.bz2 sawfish.install)
-md5sums=('c552404e721abb7b82fa2028483123b5' '2203a70baad2a2b482636ab41557c848')
+source=(http://downloads.sourceforge.net/sourceforge/sawmill/sawfish-$pkgver.tar.bz2 sawfish.install\ 
+	sawfish-1.3.5.2-config.h.in.patch)
+md5sums=('c552404e721abb7b82fa2028483123b5' '2203a70baad2a2b482636ab41557c848'\
+         'ed0a68f48d5680997f645511b1367678')
 install=sawfish.install
 
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -p1 -i $startdir/src/sawfish-1.3.5.2-config.h.in.patch || return 1
   ./configure --prefix=/usr --enable-capplet
   make || return 1
   make DESTDIR=$startdir/pkg install

Copied: sawfish/repos/extra-x86_64/sawfish-1.3.5.2-config.h.in.patch (from rev 34497, sawfish/trunk/sawfish-1.3.5.2-config.h.in.patch)
===================================================================
--- extra-x86_64/sawfish-1.3.5.2-config.h.in.patch	                        (rev 0)
+++ extra-x86_64/sawfish-1.3.5.2-config.h.in.patch	2009-04-09 20:46:14 UTC (rev 34504)
@@ -0,0 +1,285 @@
+diff -ub sawfish-1.3.5.2.orig/config.h.in sawfish-1.3.5.2/config.h.in
+--- sawfish-1.3.5.2.orig/config.h.in	2009-03-05 08:43:10.000000000 +0100
++++ sawfish-1.3.5.2/config.h.in	2009-04-09 22:02:28.000000000 +0200
+@@ -1,174 +1,154 @@
+-/* config.h.in.  Generated from configure.in by autoheader.  */
++/* config.h.in -- config.h configure input
++   $Id: config.h.in,v 1.16 2005/07/01 16:04:49 jsh Exp $
+ 
+-/* Define if building universal (internal helper macro) */
+-#undef AC_APPLE_UNIVERSAL_BUILD
++   Copyright (C) 1999 John Harper <john at dcs.warwick.ac.uk>
+ 
+-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+-   systems. This function is required for `alloca.c' support on those systems.
+-   */
+-#undef CRAY_STACKSEG_END
++   This file is part of sawmill.
+ 
+-/* Define to 1 if using `alloca.c'. */
+-#undef C_ALLOCA
++   sawmill is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
+ 
+-/* Doug Lea malloc */
+-#undef DOUG_LEA_MALLOC
++   sawmill is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++   GNU General Public License for more details.
+ 
+-/* Define to 1 if you have `alloca', as a function or macro. */
+-#undef HAVE_ALLOCA
++   You should have received a copy of the GNU General Public License
++   along with sawmill; see the file COPYING.  If not, write to
++   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
+-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+-   */
+-#undef HAVE_ALLOCA_H
+-
+-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+-#undef HAVE_DOPRNT
+-
+-/* Have esound */
+-#undef HAVE_ESD
++#ifndef SAWMILL_CONFIG_H
++#define SAWMILL_CONFIG_H
+ 
+-/* Define to 1 if you have the <fcntl.h> header file. */
+-#undef HAVE_FCNTL_H
++/* Define if X11 is available */
++#undef HAVE_X11
+ 
+-/* gdk pixbuf */
+-#undef HAVE_GDK_PIXBUF
++/* Define if using alloca.c.  */
++#undef C_ALLOCA
+ 
+-/* Define to 1 if you have the `gethostname' function. */
+-#undef HAVE_GETHOSTNAME
++/* Define to empty if the keyword does not work.  */
++#undef const
+ 
+-/* Define to 1 if you have the `getpagesize' function. */
+-#undef HAVE_GETPAGESIZE
++/* Define as __inline if that's what the C compiler calls it.  */
++#undef inline
+ 
+-/* have imlib */
+-#undef HAVE_IMLIB
++/* Define if words are stored with the most significant byte first */
++#undef WORDS_BIGENDIAN
+ 
+-/* Define to 1 if you have the <inttypes.h> header file. */
+-#undef HAVE_INTTYPES_H
++/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
++   This function is required for alloca.c support on those systems.  */
++#undef CRAY_STACKSEG_END
+ 
+-/* have libaudiofile */
+-#undef HAVE_LIBAUDIOFILE
++/* Define if you have alloca, as a function or macro.  */
++#undef HAVE_ALLOCA
+ 
+-/* Define to 1 if you have the `nsl' library (-lnsl). */
+-#undef HAVE_LIBNSL
++/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
++#undef HAVE_ALLOCA_H
+ 
+-/* Define to 1 if you have the `socket' library (-lsocket). */
+-#undef HAVE_LIBSOCKET
++/* Define if you don't have vprintf but do have _doprnt.  */
++#undef HAVE_DOPRNT
+ 
+-/* Define to 1 if you have the <memory.h> header file. */
+-#undef HAVE_MEMORY_H
++/* Define if you have the vprintf function.  */
++#undef HAVE_VPRINTF
+ 
+-/* Define to 1 if you have the `snprintf' function. */
+-#undef HAVE_SNPRINTF
++/* Define to `unsigned' if <sys/types.h> doesn't define.  */
++#undef size_t
+ 
+-/* Define to 1 if you have the `socket' function. */
+-#undef HAVE_SOCKET
++/* If using the C implementation of alloca, define if you know the
++   direction of stack growth for your system; otherwise it will be
++   automatically deduced at run-time.
++ STACK_DIRECTION > 0 => grows toward higher addresses
++ STACK_DIRECTION < 0 => grows toward lower addresses
++ STACK_DIRECTION = 0 => direction of growth unknown
++ */
++#undef STACK_DIRECTION
+ 
+-/* Define to 1 if you have the <stdint.h> header file. */
+-#undef HAVE_STDINT_H
++/* Define if you have the ANSI C header files.  */
++#undef STDC_HEADERS
+ 
+-/* Define to 1 if you have the <stdlib.h> header file. */
+-#undef HAVE_STDLIB_H
++/* Define if you can safely include both <sys/time.h> and <time.h>.  */
++#undef TIME_WITH_SYS_TIME
+ 
+-/* Define to 1 if you have the <strings.h> header file. */
+-#undef HAVE_STRINGS_H
++/* Define if <memory.h> exists */
++#undef HAVE_MEMORY_H
++#ifdef HAVE_MEMORY_H
++# define NEED_MEMORY_H		/* backwards compatibility */
++#endif
+ 
+-/* Define to 1 if you have the <string.h> header file. */
+-#undef HAVE_STRING_H
++/* Define if <X11/SM/SMlib.h> exists */
++#undef HAVE_X11_SM_SMLIB_H
+ 
+-/* Define to 1 if you have the <sys/stat.h> header file. */
+-#undef HAVE_SYS_STAT_H
++/* Define if <X11/extensions/Xdbe.h> exists */
++#undef HAVE_X11_EXTENSIONS_XDBE_H
+ 
+-/* Define to 1 if you have the <sys/time.h> header file. */
+-#undef HAVE_SYS_TIME_H
++/* Define if <X11/extensions/Xinerama.h> exists */
++#undef HAVE_X11_EXTENSIONS_XINERAMA_H
+ 
+-/* Define to 1 if you have the <sys/types.h> header file. */
+-#undef HAVE_SYS_TYPES_H
++/* Define if <X11/extensions/Xrandr.h> exists */
++#undef HAVE_X11_EXTENSIONS_XRANDR_H
+ 
+-/* Define to 1 if you have the <sys/utsname.h> header file. */
+-#undef HAVE_SYS_UTSNAME_H
++/* Define if <X11/Xft/Xft.h> exists */
++#undef HAVE_X11_XFT_XFT_H
+ 
+-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
++/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+ #undef HAVE_SYS_WAIT_H
+ 
+-/* Define to 1 if you have the <unistd.h> header file. */
+-#undef HAVE_UNISTD_H
+-
+-/* Define to 1 if you have the `vprintf' function. */
+-#undef HAVE_VPRINTF
+-
+-/* have x11 */
+-#undef HAVE_X11
+-
+-/* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
+-#undef HAVE_X11_EXTENSIONS_XDBE_H
++/* Define if you have the gethostname function.  */
++#undef HAVE_GETHOSTNAME
+ 
+-/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
+-#undef HAVE_X11_EXTENSIONS_XINERAMA_H
++/* Define if you have the snprintf function. */
++#undef HAVE_SNPRINTF
+ 
+-/* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
+-#undef HAVE_X11_EXTENSIONS_XRANDR_H
++/* Define if you have the getpagesize function. */
++#undef HAVE_GETPAGESIZE
+ 
+-/* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
+-#undef HAVE_X11_SM_SMLIB_H
++/* Define if you have the <fcntl.h> header file.  */
++#undef HAVE_FCNTL_H
+ 
+-/* libc malloc */
+-#undef LIBC_MALLOC
++/* Define if you have the <sys/time.h> header file.  */
++#undef HAVE_SYS_TIME_H
+ 
+-/* pixmap cache */
+-#undef NEED_PIXMAP_CACHE
++/* Define if you have the <sys/utsname.h> header file.  */
++#undef HAVE_SYS_UTSNAME_H
+ 
+-/* Define to the address where bug reports for this package should be sent. */
+-#undef PACKAGE_BUGREPORT
++/* Define if you have the <unistd.h> header file.  */
++#undef HAVE_UNISTD_H
+ 
+-/* Define to the full name of this package. */
+-#undef PACKAGE_NAME
++/* Define if you have the nsl library (-lnsl).  */
++#undef HAVE_LIBNSL
+ 
+-/* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
++/* Define if you have the og library (-log).  */
++#undef HAVE_LIBOG
+ 
+-/* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
++/* Define if you have the socket library (-lsocket).  */
++#undef HAVE_LIBSOCKET
+ 
+-/* Define to the version of this package. */
+-#undef PACKAGE_VERSION
++/* Define if using Doug Lea's malloc */
++#undef DOUG_LEA_MALLOC
+ 
+-/* If using the C implementation of alloca, define if you know the
+-   direction of stack growth for your system; otherwise it will be
+-   automatically deduced at runtime.
+-	STACK_DIRECTION > 0 => grows toward higher addresses
+-	STACK_DIRECTION < 0 => grows toward lower addresses
+-	STACK_DIRECTION = 0 => direction of growth unknown */
+-#undef STACK_DIRECTION
++/* Define if using libc's malloc */
++#undef LIBC_MALLOC
+ 
+-/* Define to 1 if you have the ANSI C header files. */
+-#undef STDC_HEADERS
++/* Define if using r_alloc and friends */
++#undef USE_R_ALLOC
+ 
+-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+-#undef TIME_WITH_SYS_TIME
++/* Define if you have the enlightened sound daemon */
++#undef HAVE_ESD
+ 
+-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+-   significant byte first (like Motorola and SPARC, unlike Intel). */
+-#if defined AC_APPLE_UNIVERSAL_BUILD
+-# if defined __BIG_ENDIAN__
+-#  define WORDS_BIGENDIAN 1
+-# endif
+-#else
+-# ifndef WORDS_BIGENDIAN
+-#  undef WORDS_BIGENDIAN
+-# endif
+-#endif
++/* Define if using Imlib 1 */
++#undef HAVE_IMLIB
+ 
+-/* Define to 1 if the X Window System is missing or not being used. */
+-#undef X_DISPLAY_MISSING
++/* Define if using pixmap-cache.c */
++#undef NEED_PIXMAP_CACHE
+ 
+-/* Define to empty if `const' does not conform to ANSI C. */
+-#undef const
++/* Define if you have gdk-pixbuf (the xlib version) */
++#undef HAVE_GDK_PIXBUF
+ 
+-/* Define to `__inline__' or `__inline' if that's what the C compiler
+-   calls it, or to nothing if 'inline' is not supported under any name.  */
+-#ifndef __cplusplus
+-#undef inline
+-#endif
++/* Define if you have pango */
++#undef HAVE_PANGO
++#undef HAVE_PANGO_X
++#undef HAVE_PANGO_XFT
+ 
+-/* Define to `unsigned int' if <sys/types.h> does not define. */
+-#undef size_t
++#endif /* SAWMILL_CONFIG_H */




More information about the arch-commits mailing list