Attachment 128554 Details for Bug 172421 – file.diff

[patch] file.diff

file.diff (text/plain), 7.71 KB, created by Chris Petrik on 2012-10-07 04:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2012-10-07 04:50:11 UTC

Size: 7.71 KB

patch

obsolete

>Index: windowmaker/pkg-plist
>===================================================================
>--- windowmaker/pkg-plist	(revision 305424)
>+++ windowmaker/pkg-plist	(working copy)
>@@ -101,6 +101,7 @@
> include/WINGs/WINGsP.h
> include/WINGs/WUtil.h
> include/wraster.h
>+include/WMaker.h
> lib/libWINGs.a
> lib/libWINGs.la
> lib/libWINGs.so
>@@ -113,6 +114,10 @@
> lib/libwraster.la
> lib/libwraster.so
> lib/libwraster.so.4
>+lib/libWMaker.so.1
>+lib/libWMaker.so
>+lib/libWMaker.la
>+lib/libWMaker.a
> libdata/pkgconfig/WINGs.pc
> libdata/pkgconfig/wrlib.pc
> share/WINGs/Images.tiff
>@@ -331,6 +336,7 @@
> share/locale/pl/LC_MESSAGES/WindowMaker.mo
> share/locale/pt/LC_MESSAGES/WPrefs.mo
> share/locale/pt/LC_MESSAGES/WindowMaker.mo
>+share/locale/pt/LC_MESSAGES/wmgenmenu.mo
> share/locale/ro/LC_MESSAGES/WindowMaker.mo
> share/locale/ru/LC_MESSAGES/WPrefs.mo
> share/locale/ru/LC_MESSAGES/WindowMaker.mo
>Index: windowmaker/Makefile
>===================================================================
>--- windowmaker/Makefile	(revision 305424)
>+++ windowmaker/Makefile	(working copy)
>@@ -1,11 +1,8 @@
>-# New ports collection makefile for:	Window Maker
>-# Date created:				August 13, 1997
>-# Whom:					Brian Handy <handy@physics.montana.edu>
>-#
>+# Created by: Brian Handy <handy@physics.montana.edu>
> # $FreeBSD$
> 
> PORTNAME?=	windowmaker
>-PORTVERSION=	0.95.2
>+PORTVERSION=	0.95.3
> PORTREVISION?=	4
> CATEGORIES=	x11-wm windowmaker
> MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
>@@ -23,14 +20,12 @@
> .if !defined(LWR_SLAVE)
> RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
> USE_PERL5=	yes
>-
>-OPTIONS=	XRANDR "xrandr support (EXPERIMENTAL)" off
>+OPTIONS_DEFINE=	XRANDR
> .endif
> 
> MAKE_JOBS_SAFE=	yes
> 
> USE_AUTOTOOLS=	libtool
>-USE_BZIP2=	yes
> USE_GNOME=	gnomehack
> USE_XORG=	xft xinerama xmu xpm
> USE_GETTEXT=	yes
>@@ -60,24 +55,37 @@
> BROKEN=		does not compile on FreeBSD 7.X
> .endif
> 
>-.if defined(WITH_XRANDR)
>+.if ${PORT_OPTIONS:MXRANDR}
> USE_XORG+=	xrandr
> CONFIGURE_ARGS+=	--enable-xrandr
> .endif
> 
> CONFLICTS=	libwraster-0.*
> 
>-MANLANG=	"" cs ru sk
>-MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
>-		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
>+MANLANG=	"" cs sk ru
>+MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
>+		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
>+		get-wraster-flags.1 get-wutil-flags.1 wdread.1 WindowMaker.1x \
>+		wmagnify.1x wmgenmenu.1 wmmenugen.1 WPrefs.1x
> 
>+MAN8_EN=	upgrade-windowmaker-defaults.8
>+
>+MAN1_CS=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
>+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
>+	
>+MAN1_SK=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
>+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
>+
>+MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
>+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
>+
> PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
> 		INSTALL-WMAKER NEWS README README.definable-cursor TODO
> 
> LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
> CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
> 
>-pre-patch:
>+post-patch:
> .for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
>     WindowMaker/*menu*
> 	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}
>Index: windowmaker/distinfo
>===================================================================
>--- windowmaker/distinfo	(revision 305424)
>+++ windowmaker/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (WindowMaker-0.95.2.tar.bz2) = 65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b
>-SIZE (WindowMaker-0.95.2.tar.bz2) = 2190825
>+SHA256 (WindowMaker-0.95.3.tar.gz) = b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a
>+SIZE (WindowMaker-0.95.3.tar.gz) = 2780245
>Index: windowmaker/files/patch-clang-warnings
>===================================================================
>--- windowmaker/files/patch-clang-warnings	(revision 305424)
>+++ windowmaker/files/patch-clang-warnings	(working copy)
>@@ -1,94 +0,0 @@
>-diff -ur ../WindowMaker-0.95.2-pre-clang/src/actions.c ./src/actions.c
>---- ../WindowMaker-0.95.2-pre-clang/src/actions.c	2012-02-14 11:36:01.000000000 -0800
>-+++ ./src/actions.c	2012-02-25 02:29:30.000000000 -0800
>-@@ -60,6 +60,9 @@
>- 				  unsigned int *new_width, unsigned int *new_height);
>- static void save_old_geometry(WWindow *wwin);
>- 
>-+/* In usermenu.c */
>-+void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin);
>-+
>- /******* Local Variables *******/
>- static struct {
>- 	int steps;
>-diff -ur ../WindowMaker-0.95.2-pre-clang/src/event.c ./src/event.c
>---- ../WindowMaker-0.95.2-pre-clang/src/event.c	2012-02-14 11:36:01.000000000 -0800
>-+++ ./src/event.c	2012-02-25 02:30:58.000000000 -0800
>-@@ -130,9 +130,11 @@
>- static void handleFocusIn(XEvent *event);
>- static void handleMotionNotify(XEvent *event);
>- static void handleVisibilityNotify(XEvent *event);
>--static void handle_inotify_events(int fd, int wd);
>- static void wdelete_death_handler(WMagicNumber id);
>- 
>-+#ifdef HAVE_INOTIFY
>-+static void handle_inotify_events(int fd, int wd);
>-+#endif
>- 
>- #ifdef SHAPE
>- static void handleShapeNotify(XEvent *event);
>-diff -ur ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c ./src/osdep_bsd.c
>---- ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c	2012-02-14 11:36:01.000000000 -0800
>-+++ ./src/osdep_bsd.c	2012-02-25 02:31:25.000000000 -0800
>-@@ -85,7 +85,7 @@
>- 		mib[0] = CTL_KERN;
>- 		mib[1] = KERN_ARGMAX;
>- 		mib[2] = 0;
>--		mib[4] = 0;
>-+		mib[3] = 0;
>- 
>- 		count = sizeof(argmax);
>- 		if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
>-diff -ur ../WindowMaker-0.95.2-pre-clang/src/usermenu.c ./src/usermenu.c
>---- ../WindowMaker-0.95.2-pre-clang/src/usermenu.c	2012-02-14 11:36:01.000000000 -0800
>-+++ ./src/usermenu.c	2012-02-25 02:37:25.000000000 -0800
>-@@ -82,6 +82,9 @@
>- /*** var ***/
>- extern WPreferences wPreferences;
>- 
>-+/* In xmodifier.c */
>-+int wXModifierFromKey(char *key);
>-+
>- typedef struct {
>- 	WScreen *screen;
>- 	WShortKey *key;
>-@@ -133,7 +136,6 @@
>- 	WUserMenuData *data;
>- 	KeySym ksym;
>- 	char *k;
>--	char *buffer;
>- 	char buf[MAX_SHORTCUT_LENGTH], *b;
>- 	int keycount, i, j, mod;
>- 
>-@@ -283,7 +285,6 @@
>- 
>- void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin)
>- {
>--	WMenuEntry *entry;
>- 	int i, j, count, paintflag;
>- 
>- 	paintflag = 0;
>-@@ -324,13 +325,11 @@
>- static WMenu *readUserMenuFile(WScreen * scr, char *file_name)
>- {
>- 	WMenu *menu;
>--	char *mtitle;
>--	WMPropList *plum, *elem, *title, *command, *params;
>--	int count, i;
>-+	WMPropList *plum;
>- 
>- 	menu = NULL;
>- 	plum = WMReadPropListFromFile(file_name);
>--	 /**/ if (plum) {
>-+	if (plum) {
>- 		menu = configureUserMenu(scr, plum);
>- 		WMReleasePropList(plum);
>- 	}
>-@@ -340,7 +339,6 @@
>- WMenu *wUserMenuGet(WScreen * scr, WWindow * wwin)
>- {
>- 	WMenu *menu = NULL;
>--	char buffer[100];
>- 	char *path = NULL;
>- 	char *tmp;
>- 	if (wwin->wm_instance && wwin->wm_class) {
>Index: windowmaker/files/patch-am
>===================================================================
>--- windowmaker/files/patch-am	(revision 305424)
>+++ windowmaker/files/patch-am	(working copy)
>@@ -1,18 +0,0 @@
>---- util/wm-oldmenu2new.orig	Wed Jan 20 21:39:18 1999
>-+++ util/wm-oldmenu2new	Wed Jan 20 21:39:29 1999
>-@@ -127,6 +127,7 @@
>- 	for (@foo2) {
>- 		s/^(\s*)"([^"]*)"\s\s*END/\1),/;
>- 		s/^(\s*)"([^"]*)"\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
>-+		s/^(\s*)"([^"]*)"\s\s*SHEXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
>- 		push @foo,split "\n";
>- 	}
>- 	@foo2=();
>-@@ -144,6 +145,7 @@
>- 	for (@foo) {
>- 		s/^(\s*)([^ 	]*)\s\s*END/\1),/;
>- 		s/^(\s*)([^ 	]*)\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
>-+		s/^(\s*)([^ 	]*)\s\s*SHEXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
>- 		push @foo2,split "\n";
>- 	}
>- 	@foo=();

Actions: View | Diff

Attachments on bug 172421: 128554 | 128555