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

[Juergen Hoetzel]

    Date: Thursday, April 9, 2009 @ 14:20:02
  Author: juergen
Revision: 34489

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

........
  r34478 | juergen | 2009-04-09 19:20:38 +0200 (Do, 09 Apr 2009) | 1 line
  
  upgpkg: sawfish 1.3.5.2-1
........
  r34488 | juergen | 2009-04-09 20:19:27 +0200 (Do, 09 Apr 2009) | 1 line
  
  upgpkg: sawfish 1.3.5.2-1
........

Modified:
  sawfish/repos/extra-i686/	(properties)
  sawfish/repos/extra-i686/PKGBUILD
Deleted:
  sawfish/repos/extra-i686/gcc4.patch

------------+
 PKGBUILD   |    8 +++----
 gcc4.patch |   61 -----------------------------------------------------------
 2 files changed, 4 insertions(+), 65 deletions(-)


Property changes on: sawfish/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /sawfish/trunk:1-25273
   + /sawfish/trunk:1-34488

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-09 18:19:27 UTC (rev 34488)
+++ extra-i686/PKGBUILD	2009-04-09 18:20:02 UTC (rev 34489)
@@ -2,15 +2,15 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=sawfish
-pkgver=1.3.5.1
+pkgver=1.3.5.2
 pkgrel=1
-pkgdesc="An alternate window manager for GNOME"
+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=('a3e275ce6ec9cc67fe03593191e47550' '2203a70baad2a2b482636ab41557c848')
+md5sums=('c552404e721abb7b82fa2028483123b5' '2203a70baad2a2b482636ab41557c848')
 install=sawfish.install
 
 

Deleted: extra-i686/gcc4.patch
===================================================================
--- extra-i686/gcc4.patch	2009-04-09 18:19:27 UTC (rev 34488)
+++ extra-i686/gcc4.patch	2009-04-09 18:20:02 UTC (rev 34489)
@@ -1,61 +0,0 @@
---- src/display.c	2003/08/19 05:34:31	1.45
-+++ src/display.c	2005/01/04 15:34:25	1.46
-@@ -44,7 +44,7 @@
- # include <netdb.h>
- #endif
- 
--char *prog_name, *visual_name;
-+char *visual_name;
- Display *dpy;
- int screen_num, screen_width, screen_height;
- Window root_window, no_focus_window;
-@@ -286,7 +286,7 @@
- bool
- sys_init(char *program_name)
- {
--    char *display_name = 0;
-+    char *display_name = 0, *prog_name = 0;
-     repv opt;
- 
- #ifdef HAVE_UNIX
-
---- src/sawmill_subrs.h	2003/08/19 05:34:31	1.108
-+++ src/sawmill_subrs.h	2005/01/04 15:34:25	1.109
-@@ -51,7 +51,6 @@
- extern void commands_init (void);
- 
- /* from display.c */
--extern char *prog_name;
- extern Display *dpy;
- extern int screen_num, screen_width, screen_height, preferred_depth;
- extern Visual *preferred_visual;
-
---- src/main.c	2003/01/12 20:35:23	1.48
-+++ src/main.c	2005/01/04 15:34:25	1.49
-@@ -41,6 +41,7 @@
- #include "build.h"
- #include <string.h>
- #include <limits.h>
-+#include <unistd.h>
- #include <X11/Xlocale.h>		/* for setlocale () */
- #ifdef HAVE_GDK_PIXBUF
- #include <glib-object.h>
-@@ -49,9 +50,6 @@
- /* one of the ec_ values */
- int exit_code = ec_no_exit;
- 
--/* Saved value of argv[0] */
--static char *prog_name;
--
- DEFSYM(sawfish_directory, "sawfish-directory");
- DEFSYM(sawfish_lisp_lib_directory, "sawfish-lisp-lib-directory");
- DEFSYM(sawfish_site_lisp_directory, "sawfish-site-lisp-directory");
-@@ -336,6 +334,7 @@
-     char **old_argv;
-     int old_argc;
-     char *lang;
-+    char *prog_name;
- 
-     /* This will fork multiple copies, if necessary */
-     multihead_init (&argc, &argv);
-