Attachment 84108 Details for Bug 120053 – sawfish.diff

[patch] sawfish.diff

sawfish.diff (text/plain), 11.47 KB, created by Andrey Slusar on 2008-01-27 18:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Slusar

Created: 2008-01-27 18:00:01 UTC

Size: 11.47 KB

patch

obsolete

>Index: ports/x11-wm/sawfish/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11-wm/sawfish/Makefile,v
>retrieving revision 1.72
>diff -u -r1.72 Makefile
>--- ports/x11-wm/sawfish/Makefile	24 Oct 2007 23:37:08 -0000	1.72
>+++ ports/x11-wm/sawfish/Makefile	27 Jan 2008 17:30:33 -0000
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	sawfish
>-PORTVERSION=	1.3
>-PORTREVISION=	16
>+PORTVERSION=	1.3.2
> PORTEPOCH=	2
> CATEGORIES=	x11-wm
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>@@ -28,11 +27,13 @@
> USE_XLIB=	yes
> USE_GMAKE=	yes
> USE_GNOME=	gnomehier gnomehack esound
>+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
> WANT_GNOME=	yes
> USE_GETTEXT=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-readline \
>-		--localstatedir=${PREFIX}/share \
>+
>+CONFIGURE_SCRIPT=	autogen.sh
>+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
> 		--datadir=${PREFIX}/share \
> 		--enable-capplet \
> 		--disable-themer \
>@@ -44,8 +45,6 @@
> INFO=		sawfish
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
>-		 s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|prog_name|program_name|g' \
> 	    	${WRKSRC}/src/main.c
> 
>Index: ports/x11-wm/sawfish/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/x11-wm/sawfish/distinfo,v
>retrieving revision 1.37
>diff -u -r1.37 distinfo
>--- ports/x11-wm/sawfish/distinfo	29 May 2006 06:23:01 -0000	1.37
>+++ ports/x11-wm/sawfish/distinfo	27 Jan 2008 17:30:33 -0000
>@@ -1,3 +1,3 @@
>-MD5 (gnome2/sawfish-1.3.tar.gz) = 9e5ce5e76c60acecdb1889c1f173295a
>-SHA256 (gnome2/sawfish-1.3.tar.gz) = c53cd96d03c584cf3570cb92fc03c8b2af4e68fa86f19259535d4a7b178faa87
>-SIZE (gnome2/sawfish-1.3.tar.gz) = 1582279
>+MD5 (gnome2/sawfish-1.3.2.tar.gz) = b068bb0f0c4326bbac0981837f6d293e
>+SHA256 (gnome2/sawfish-1.3.2.tar.gz) = 2d614fdf62da8f70b52b8025789f236adca29ad6c8ee791c1d60747f1e1a4309
>+SIZE (gnome2/sawfish-1.3.2.tar.gz) = 1950794
>Index: ports/x11-wm/sawfish/pkg-descr
>===================================================================
>RCS file: /home/pcvs/ports/x11-wm/sawfish/pkg-descr,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-descr
>--- ports/x11-wm/sawfish/pkg-descr	29 May 2006 06:23:01 -0000	1.4
>+++ ports/x11-wm/sawfish/pkg-descr	27 Jan 2008 17:30:33 -0000
>@@ -1,3 +1,4 @@
> Lisp configurable window manager
> 
>-WWW: http://sawmill.sourceforge.net/
>+WWW: http://sawfish.wikia.com/
>+
>Index: ports/x11-wm/sawfish/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/x11-wm/sawfish/pkg-plist,v
>retrieving revision 1.45
>diff -u -r1.45 pkg-plist
>--- ports/x11-wm/sawfish/pkg-plist	24 Oct 2007 23:37:09 -0000	1.45
>+++ ports/x11-wm/sawfish/pkg-plist	27 Jan 2008 17:30:33 -0000
>@@ -47,6 +47,7 @@
> share/pixmaps/sawfish-workspaces.png
> share/gnome/wm-properties/Sawfish.desktop
> share/locale/am/LC_MESSAGES/sawfish.mo
>+share/locale/ar/LC_MESSAGES/sawfish.mo
> share/locale/az/LC_MESSAGES/sawfish.mo
> share/locale/be/LC_MESSAGES/sawfish.mo
> share/locale/bg/LC_MESSAGES/sawfish.mo
>@@ -55,7 +56,9 @@
> share/locale/cs/LC_MESSAGES/sawfish.mo
> share/locale/da/LC_MESSAGES/sawfish.mo
> share/locale/de/LC_MESSAGES/sawfish.mo
>+share/locale/dz/LC_MESSAGES/sawfish.mo
> share/locale/el/LC_MESSAGES/sawfish.mo
>+share/locale/en_CA/LC_MESSAGES/sawfish.mo
> share/locale/en_GB/LC_MESSAGES/sawfish.mo
> share/locale/es/LC_MESSAGES/sawfish.mo
> share/locale/et/LC_MESSAGES/sawfish.mo
>@@ -69,17 +72,25 @@
> share/locale/ja/LC_MESSAGES/sawfish.mo
> share/locale/ko/LC_MESSAGES/sawfish.mo
> share/locale/lv/LC_MESSAGES/sawfish.mo
>+share/locale/mk/LC_MESSAGES/sawfish.mo
> share/locale/ms/LC_MESSAGES/sawfish.mo
>+share/locale/nb/LC_MESSAGES/sawfish.mo
>+share/locale/ne/LC_MESSAGES/sawfish.mo
> share/locale/nl/LC_MESSAGES/sawfish.mo
> share/locale/nn/LC_MESSAGES/sawfish.mo
> share/locale/no/LC_MESSAGES/sawfish.mo
>+share/locale/oc/LC_MESSAGES/sawfish.mo
>+share/locale/pa/LC_MESSAGES/sawfish.mo
> share/locale/pl/LC_MESSAGES/sawfish.mo
> share/locale/pt/LC_MESSAGES/sawfish.mo
> share/locale/pt_BR/LC_MESSAGES/sawfish.mo
> share/locale/ro/LC_MESSAGES/sawfish.mo
> share/locale/ru/LC_MESSAGES/sawfish.mo
>+share/locale/rw/LC_MESSAGES/sawfish.mo
> share/locale/sk/LC_MESSAGES/sawfish.mo
> share/locale/sl/LC_MESSAGES/sawfish.mo
>+share/locale/sr/LC_MESSAGES/sawfish.mo
>+share/locale/sr@Latn/LC_MESSAGES/sawfish.mo
> share/locale/sv/LC_MESSAGES/sawfish.mo
> share/locale/tr/LC_MESSAGES/sawfish.mo
> share/locale/uk/LC_MESSAGES/sawfish.mo
>@@ -652,7 +663,7 @@
> @dirrm %%DATADIR%%/%%VERSION%%/themes/brushed-metal
> @dirrm %%DATADIR%%/%%VERSION%%/themes/absolute-e
> @dirrm %%DATADIR%%/%%VERSION%%/themes/Crux
>-@dirrm %%DATADIR%%/%%VERSION%%/themes
>+@dirrmtry %%DATADIR%%/%%VERSION%%/themes
> @dirrm %%DATADIR%%/%%VERSION%%/sounds
> @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/util
> @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/theming
>@@ -671,8 +682,8 @@
> @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk
> @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish
> @dirrm %%DATADIR%%/%%VERSION%%/lisp
>-@dirrm %%DATADIR%%/%%VERSION%%
>-@dirrm %%DATADIR%%
>+@dirrmtry %%DATADIR%%/%%VERSION%%
>+@dirrmtry %%DATADIR%%
> @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
> @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
> @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish
>Index: ports/x11-wm/sawfish/files/patch-configure
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-configure
>diff -N ports/x11-wm/sawfish/files/patch-configure
>--- ports/x11-wm/sawfish/files/patch-configure	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,20 +0,0 @@
>---- configure.orig	Tue Nov 12 16:10:53 2002
>-+++ configure	Tue Nov 12 16:12:11 2002
>-@@ -2688,7 +2688,7 @@
>-   (error
>-     (throw 'quit 1)))
>- EOF
>--if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
>-+if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
>-   echo "$ac_t""yes" 1>&6
>- else
>-   echo "$ac_t""no" 1>&6
>-@@ -3387,7 +3387,7 @@
>- if test "$enable_themer" = yes; then
>-     echo $ac_n "checking for rep-gtk libglade wrapper""... $ac_c" 1>&6
>- echo "configure:3390: checking for rep-gtk libglade wrapper" >&5
>--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
>-+   if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then
>-     echo "$ac_t""yes" 1>&6
>-     add_subdir "themer"
>-   else 
>Index: ports/x11-wm/sawfish/files/patch-configure.in
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-configure.in
>diff -N ports/x11-wm/sawfish/files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ports/x11-wm/sawfish/files/patch-configure.in	27 Jan 2008 17:30:33 -0000
>@@ -0,0 +1,20 @@
>+--- configure.in.orig	2007-07-27 15:43:23.000000000 +0300
>++++ configure.in	2007-11-24 00:39:45.000000000 +0200
>+@@ -159,7 +159,7 @@
>+   (error
>+     (throw 'quit 1)))
>+ EOF
>+-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
>++if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
>+   AC_MSG_RESULT([yes])
>+ else
>+   AC_MSG_RESULT([no])
>+@@ -264,7 +264,7 @@
>+ if test "$enable_themer" = yes; then
>+   dnl configure redirects &5 to config.log
>+   AC_MSG_CHECKING([for rep-gtk libglade wrapper])
>+-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
>++  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then 
>+     AC_MSG_RESULT([yes])
>+     add_subdir "themer"
>+   else 
>Index: ports/x11-wm/sawfish/files/patch-functions.c
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-functions.c
>diff -N ports/x11-wm/sawfish/files/patch-functions.c
>--- ports/x11-wm/sawfish/files/patch-functions.c	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>---- src/functions.c 3 Nov 2002 21:00:36 -0000       1.98
>-+++ src/functions.c 30 Oct 2003 05:35:18 -0000      1.99
>-@@ -704,8 +704,10 @@
>-	    repv name;
>-	    if (type == XA_ATOM && (name = x_atom_symbol (l_data[i])) != Qnil)
>-		rep_VECTI(ret_data, i) = name;
>-+	    else if (type == XA_INTEGER)
>-+		rep_VECTI(ret_data, i) = rep_make_long_int((long) l_data[i]);
>-	    else
>--		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i]);
>-+		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i] & 0xffffffffUL);
>-	}
>-	break;
>-     }
>Index: ports/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
>diff -N ports/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
>--- ports/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- lisp/sawfish/wm/state/wm-spec.jl.orig	Sun Sep 28 22:51:20 2003
>-+++ lisp/sawfish/wm/state/wm-spec.jl	Sun Sep 28 22:52:10 2003
>-@@ -125,7 +125,7 @@
>-      _NET_WM_WINDOW_TYPE_UTILITY
>-      _NET_WM_WINDOW_TYPE_SPLASH])
>-   
>--  (defvar wm-spec-below-depth +2)
>-+  (defvar wm-spec-below-depth -2)
>-   (defvar wm-spec-above-depth +2)
>- 
>-   (define supported-states '())
>Index: ports/x11-wm/sawfish/files/patch-sawmill.h
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-sawmill.h
>diff -N ports/x11-wm/sawfish/files/patch-sawmill.h
>--- ports/x11-wm/sawfish/files/patch-sawmill.h	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- src/sawmill.h.orig      Mon Jan 13 05:35:23 2003
>-+++ src/sawmill.h   Mon May  8 11:52:40 2006
>-@@ -153,7 +153,7 @@
>-     /* Frame data */
>-     Window frame;
>-     struct frame_part *frame_parts;
>--    u_int frame_x, frame_y;		/* relative to client-window */
>-+    int frame_x, frame_y;		/* relative to client-window */
>-     u_int frame_width, frame_height;
>-     void (*destroy_frame)(struct lisp_window *w);
>-     void (*focus_change)(struct lisp_window *w);
>Index: ports/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
>diff -N ports/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
>--- ports/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,12 +0,0 @@
>---- scripts/sawfish-menu.jl.orig	Tue May 20 11:49:42 2003
>-+++ scripts/sawfish-menu.jl	Tue May 20 11:50:54 2003
>-@@ -106,7 +106,8 @@
>-     (g-signal-connect menu "deactivate" gtk-main-quit)
>-     (setq menu-selected nil)
>-     (gtk-menu-popup-interp menu nil nil 0 (or timestamp 0) position)
>--    (gtk-main)
>-+    (when (memq 'visible (GTK-WIDGET-FLAGS menu))
>-+      (gtk-main))
>-     menu-selected))
>- 
>- 
>Index: ports/x11-wm/sawfish/files/patch-src_fonts.c
>===================================================================
>RCS file: ports/x11-wm/sawfish/files/patch-src_fonts.c
>diff -N ports/x11-wm/sawfish/files/patch-src_fonts.c
>--- ports/x11-wm/sawfish/files/patch-src_fonts.c	29 May 2006 06:23:01 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- src/fonts.c.orig	Sun Nov  3 22:00:36 2002
>-+++ src/fonts.c	Wed Feb  8 04:22:13 2006
>-@@ -131,7 +131,7 @@
>- 	    if (end == 0)
>- 		end = p + strlen (p);
>- 	    len = end - (p + 1);
>--	    buf = malloc (len);
>-+	    buf = malloc (len + 1);
>- 	    memcpy (buf, p + 1, len);
>- 	    buf[len] = 0;
>- 	    return buf;

Actions: View | Diff

Attachments on bug 120053: 84108