Timo Myyra <timo.my...@wickedbsd.net> writes:
> Hi,
>
> Here's a updated windowmaker port.
> Most of the patches appeared to have reached upstream so got deleted
> in update.
> For some parts I couldn't find relevant sections where to apply those
> so I just deleted them.
>
> This is slightly tested on amd64 so could you wider testing.
>
> Timo
Here's updated version for the windowmaker, now with actual diff.
Changed the configure flags a bit to include new features.
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/windowmaker/Makefile,v
retrieving revision 1.90
diff -u -u -r1.90 Makefile
--- Makefile 25 Sep 2013 07:58:50 -0000 1.90
+++ Makefile 28 Jan 2014 15:45:21 -0000
@@ -3,14 +3,15 @@
COMMENT-main= window manager that emulates NEXTSTEP(tm)
COMMENT-lang= language subpackage for Window Maker
-V= 0.92.0
+V= 0.95.5
DISTNAME= WindowMaker-${V}
PKGNAME-main= ${DISTNAME:L}
-REVISION-main= 54
FULLPKGNAME-lang= windowmaker-lang-${V}
-REVISION-lang= 3
-SHARED_LIBS += wraster 5.0 # 4.0
+SHARED_LIBS += wraster 6.0 # 5.0
+SHARED_LIBS += WINGs 0.0 # 2.1
+SHARED_LIBS += WMaker 0.0 # 1.1
+SHARED_LIBS += WUtil 0.0 # 3.0
CATEGORIES= x11 x11/windowmaker
@@ -19,18 +20,19 @@
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += X11 Xext Xft Xinerama Xpm Xrender c expat fontconfig
-WANTLIB += freetype jpeg m png pthread-stubs tiff gif xcb z
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xmu Xpm
+WANTLIB += Xrender Xt c expat fontconfig freetype intl iconv
+WANTLIB += jpeg kvm m png pthread-stubs tiff gif xcb z
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER:=source/release/}
-EXTRACT_SUFX= .tar.bz2
NO_TEST= Yes
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --enable-static \
--enable-xinerama \
+ --enable-usermenu \
+ --enable-xrandr \
--with-datadir="${LOCALBASE}/share/WindowMaker" \
--with-nlsdir="${LOCALBASE}/share/locale"
@@ -44,7 +46,7 @@
graphics/png \
graphics/giflib
-RUN_DEPENDS-lang= x11/windowmaker>=0.90.0
+RUN_DEPENDS-lang= x11/windowmaker>=0.95.5
LIB_DEPENDS-lang=
WANTLIB-lang=
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/windowmaker/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo 5 Apr 2007 17:36:25 -0000 1.6
+++ distinfo 28 Jan 2014 15:45:21 -0000
@@ -1,5 +1,2 @@
-MD5 (WindowMaker-0.92.0.tar.bz2) = qqxUIbaG7S0+arZSKcmAlw==
-RMD160 (WindowMaker-0.92.0.tar.bz2) = wWHu5kCS+vtIaBgf4qC225btbeA=
-SHA1 (WindowMaker-0.92.0.tar.bz2) = T3/qb0C5up+HDS4vDORidHUO2yw=
-SHA256 (WindowMaker-0.92.0.tar.bz2) =
tDHOn0fF1M1Sq1uCmM/1b9VwDW5gUrFJ4ZtsVn5SbbE=
-SIZE (WindowMaker-0.92.0.tar.bz2) = 2202748
+SHA256 (WindowMaker-0.95.5.tar.gz) =
SyX0dP3gMqBgyT+8UPHOBHKasX6pY8o+uNu4L0mvcNA=
+SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
Index: patches/patch-WINGs_Makefile_in
===================================================================
RCS file: patches/patch-WINGs_Makefile_in
diff -N patches/patch-WINGs_Makefile_in
--- patches/patch-WINGs_Makefile_in 1 Nov 2005 17:28:34 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-WINGs_Makefile_in,v 1.7 2005/11/01 17:28:34 wilfried Exp $
---- WINGs/Makefile.in.orig Sun Jun 19 05:23:00 2005
-+++ WINGs/Makefile.in Mon Oct 31 18:34:05 2005
-@@ -114,7 +114,7 @@ wprefs_datadir = @wprefs_datadir@
-
- AUTOMAKE_OPTIONS = no-dependencies
-
--SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
-+SUBDIRS = WINGs . po Documentation Resources Extras
-
- #libWINGs_la_LDFLAGS = -version-info 1:1:0
-
-@@ -138,7 +138,7 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
-
- AM_CFLAGS = @NOSTRICTALIASING@
-
--INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@
@HEADER_SEARCH_PATH@ -DDEBUG
-+INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@
@HEADER_SEARCH_PATH@
-
-
- DISTCLEANFILES = WINGs.pc
Index: patches/patch-WINGs_array_c
===================================================================
RCS file: patches/patch-WINGs_array_c
diff -N patches/patch-WINGs_array_c
--- patches/patch-WINGs_array_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-WINGs_array_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- WINGs/array.c.orig Tue Oct 12 20:28:08 2004
-+++ WINGs/array.c Thu May 20 12:50:56 2010
-@@ -230,6 +230,8 @@ WMGetFromArray(WMArray *array, int index)
- void*
- WMPopFromArray(WMArray *array)
- {
-+ wassertr(array->itemCount > 0);
-+
- array->itemCount--;
-
- return array->items[array->itemCount];
Index: patches/patch-WINGs_findfile_c
===================================================================
RCS file: patches/patch-WINGs_findfile_c
diff -N patches/patch-WINGs_findfile_c
--- patches/patch-WINGs_findfile_c 25 Apr 2007 11:31:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,127 +0,0 @@
-$OpenBSD: patch-WINGs_findfile_c,v 1.1 2007/04/25 11:31:53 wilfried Exp $
---- WINGs/findfile.c.orig Tue Oct 12 20:30:07 2004
-+++ WINGs/findfile.c Wed Mar 14 21:16:22 2007
-@@ -23,6 +23,7 @@
-
- #include "WUtil.h"
-
-+#include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-@@ -79,6 +80,7 @@ getuserhomedir(char *username)
- char*
- wexpandpath(char *path)
- {
-+ char *origpath = path;
- char buffer2[PATH_MAX+2];
- char buffer[PATH_MAX+2];
- int i;
-@@ -91,25 +93,29 @@ wexpandpath(char *path)
- path++;
- if (*path=='/' || *path==0) {
- home = wgethomedir();
-+ if (strlen(home) > PATH_MAX)
-+ goto error;
- strcat(buffer, home);
- } else {
- int j;
- j = 0;
- while (*path!=0 && *path!='/') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *path;
- buffer2[j] = 0;
- path++;
- }
- home = getuserhomedir(buffer2);
-- if (!home)
-- return NULL;
-+ if (!home || strlen(home) > PATH_MAX)
-+ goto error;
- strcat(buffer, home);
- }
- }
-
- i = strlen(buffer);
-
-- while (*path!=0) {
-+ while (*path!=0 && i <= PATH_MAX) {
- char *tmp;
-
- if (*path=='$') {
-@@ -119,35 +125,50 @@ wexpandpath(char *path)
- if (*path=='(') {
- path++;
- while (*path!=0 && *path!=')') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *(path++);
- buffer2[j] = 0;
- }
-- if (*path==')')
-+ if (*path==')') {
- path++;
-- tmp = getenv(buffer2);
-+ tmp = getenv(buffer2);
-+ } else {
-+ tmp = NULL;
-+ }
- if (!tmp) {
-+ if ((i += strlen(buffer2)+2) > PATH_MAX)
-+ goto error;
- buffer[i] = 0;
- strcat(buffer, "$(");
- strcat(buffer, buffer2);
-- strcat(buffer, ")");
-- i += strlen(buffer2)+3;
-+ if (*(path-1)==')') {
-+ if (++i > PATH_MAX)
-+ goto error;
-+ strcat(buffer, ")");
-+ }
- } else {
-+ if ((i += strlen(tmp)) > PATH_MAX)
-+ goto error;
- strcat(buffer, tmp);
-- i += strlen(tmp);
- }
- } else {
- while (*path!=0 && *path!='/') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *(path++);
- buffer2[j] = 0;
- }
- tmp = getenv(buffer2);
- if (!tmp) {
-+ if ((i += strlen(buffer2)+1) > PATH_MAX)
-+ goto error;
- strcat(buffer, "$");
- strcat(buffer, buffer2);
-- i += strlen(buffer2)+1;
- } else {
-+ if ((i += strlen(tmp)) > PATH_MAX)
-+ goto error;
- strcat(buffer, tmp);
-- i += strlen(tmp);
- }
- }
- } else {
-@@ -156,7 +177,16 @@ wexpandpath(char *path)
- }
- }
-
-+ if (*path!=0)
-+ goto error;
-+
- return wstrdup(buffer);
-+
-+error:
-+ errno = ENAMETOOLONG;
-+ wsyserror(_("could not expand %s"), origpath);
-+ /* FIXME: too many functions handle a return value of NULL incorrectly */
-+ exit(1);
- }
-
-
Index: patches/patch-WINGs_string_c
===================================================================
RCS file: patches/patch-WINGs_string_c
diff -N patches/patch-WINGs_string_c
--- patches/patch-WINGs_string_c 25 Apr 2007 11:32:55 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-WINGs_string_c,v 1.4 2007/04/25 11:32:55 wilfried Exp $
---- WINGs/string.c.orig Tue Oct 12 20:32:12 2004
-+++ WINGs/string.c Thu Mar 15 20:00:31 2007
-@@ -1,6 +1,6 @@
-
- #include "wconfig.h"
--
-+#include <assert.h>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
-@@ -153,7 +153,7 @@ wtokenjoin(char **list, int count)
- void
- wtokenfree(char **tokens, int count)
- {
-- while (--count) wfree(tokens[count]);
-+ while (count--) wfree(tokens[count]);
- wfree(tokens);
- }
-
Index: patches/patch-WINGs_wapplication_c
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WINGs_wapplication_c,v
retrieving revision 1.4
diff -u -u -r1.4 patch-WINGs_wapplication_c
--- patches/patch-WINGs_wapplication_c 20 May 2010 10:58:08 -0000 1.4
+++ patches/patch-WINGs_wapplication_c 28 Jan 2014 15:45:21 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-WINGs_wapplication_c,v 1.4 2010/05/20 10:58:08 espie Exp $
---- WINGs/wapplication.c.orig Sun Oct 24 05:13:29 2004
-+++ WINGs/wapplication.c Thu May 20 12:50:56 2010
-@@ -175,7 +175,7 @@ WMPathForResourceOfType(char *resource, char *ext)
- }
- }
+$OpenBSD$
+--- WINGs/wapplication.c.orig Sat Jan 25 23:18:04 2014
++++ WINGs/wapplication.c Sat Jan 25 23:18:20 2014
+@@ -158,7 +158,7 @@ char *WMPathForResourceOfType(const char *resource, co
+ if (path)
+ goto out;
+
+- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
++ path = checkFile("%%PREFIX%%/GNUstep", appdir, ext, resource);
+ if (path)
+ goto out;
-- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-+ path = checkFile("%%PREFIX%%/GNUstep", appdir, ext, resource);
- if (path) {
- wfree(appdir);
- return path;
Index: patches/patch-WINGs_wwindow_c
===================================================================
RCS file: patches/patch-WINGs_wwindow_c
diff -N patches/patch-WINGs_wwindow_c
--- patches/patch-WINGs_wwindow_c 20 May 2010 10:58:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-WINGs_wwindow_c,v 1.3 2010/05/20 10:58:08 espie Exp $
---- WINGs/wwindow.c.orig Sun Oct 24 04:58:20 2004
-+++ WINGs/wwindow.c Thu May 20 12:50:56 2010
-@@ -254,14 +254,14 @@ static void
- setMiniwindow(WMWindow *win, RImage *image)
- {
- WMScreen *scr= win->view->screen;
-- CARD32 *data;
-+ long *data;
- int x, y;
- int o;
-
- if (!image)
- return;
-
-- data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
-+ data = wmalloc((image->width * image->height + 2) * sizeof(long));
-
- o= 0;
- data[o++] = image->width;
-@@ -269,7 +269,7 @@ setMiniwindow(WMWindow *win, RImage *image)
-
- for (y= 0; y < image->height; y++) {
- for (x= 0; x < image->width; x++) {
-- CARD32 pixel;
-+ long pixel;
- int offs= (x+y*image->width);
-
- if (image->format == RRGBFormat)
Index: patches/patch-WPrefs_app_Menu_c
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WPrefs_app_Menu_c,v
retrieving revision 1.4
diff -u -u -r1.4 patch-WPrefs_app_Menu_c
--- patches/patch-WPrefs_app_Menu_c 25 Aug 2007 09:27:12 -0000 1.4
+++ patches/patch-WPrefs_app_Menu_c 28 Jan 2014 15:45:21 -0000
@@ -1,29 +1,12 @@
-$OpenBSD: patch-WPrefs_app_Menu_c,v 1.4 2007/08/25 09:27:12 mglocker Exp $
---- WPrefs.app/Menu.c.orig Tue Oct 26 04:23:39 2004
-+++ WPrefs.app/Menu.c Fri Aug 17 20:58:09 2007
-@@ -577,7 +577,7 @@ createPanel(_Panel *p)
- data->param.exec.command = "xv";
+$OpenBSD$
+--- WPrefs.app/Menu.c.orig Sat Jan 25 23:20:50 2014
++++ WPrefs.app/Menu.c Sat Jan 25 23:21:28 2014
+@@ -518,7 +518,7 @@ static void createPanel(_Panel * p)
+ data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
+ data->param.directory.command = "setstyle";
+ data->param.directory.directory =
+- "/usr/share/WindowMaker/Themes
/usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
++ "/usr/share/WindowMaker/Themes
%%PREFIX%%/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+ data->param.directory.stripExt = 1;
- data = putNewItem(panel, pad, ExecInfo, _("Acrobat Reader"));
-- data->param.exec.command = "acroread ||
/usr/local/Acrobat4/bin/acroread";
-+ data->param.exec.command = "acroread";
-
- data = putNewItem(panel, pad, ExecInfo, _("ghostview"));
- data->param.exec.command = "gv";
-@@ -616,7 +616,7 @@ createPanel(_Panel *p)
-
- data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
- data->param.directory.command = "setstyle";
-- data->param.directory.directory = "/usr/share/WindowMaker/Themes
/usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
-+ data->param.directory.directory = "/usr/share/WindowMaker/Themes
%%PREFIX%%/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
- data->param.directory.stripExt = 1;
-
- data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
-@@ -1068,7 +1068,6 @@ parseCommand(WMPropList *item)
-
- for (i = 0, j = 0; i < tokn; i++) {
- if (strcmp(tokens[i], "-noext") == 0) {
-- wfree(tokens[i]);
- data->param.directory.stripExt = 1;
- } else {
- ctokens[j++] = tokens[i];
+ data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images
(scale)"));
Index: patches/patch-WPrefs_app_Paths_c
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WPrefs_app_Paths_c,v
retrieving revision 1.3
diff -u -u -r1.3 patch-WPrefs_app_Paths_c
--- patches/patch-WPrefs_app_Paths_c 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WPrefs_app_Paths_c 28 Jan 2014 15:45:21 -0000
@@ -1,23 +1,23 @@
-$OpenBSD: patch-WPrefs_app_Paths_c,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WPrefs.app/Paths.c.orig Tue Oct 12 22:18:33 2004
-+++ WPrefs.app/Paths.c Mon Oct 31 18:56:11 2005
-@@ -86,8 +86,8 @@ showData(_Panel *panel)
- addPathToList(panel->icoL, -1, "~/pixmaps");
- addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
-- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
-- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
-+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
-+ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
- addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
- } else {
- for (i=0; i<WMGetPropListItemCount(array); i++) {
-@@ -102,7 +102,7 @@ showData(_Panel *panel)
- wwarning(_("bad value in option PixmapPath. Using default path
list"));
- addPathToList(panel->pixL, -1, "~/pixmaps");
- addPathToList(panel->pixL, -1,
"~/GNUstep/Library/WindowMaker/Pixmaps");
-- addPathToList(panel->pixL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
-+ addPathToList(panel->pixL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
- } else {
- for (i=0; i<WMGetPropListItemCount(array); i++) {
- val = WMGetFromPLArray(array, i);
+$OpenBSD$
+--- WPrefs.app/Paths.c.orig Sat Jan 25 23:22:32 2014
++++ WPrefs.app/Paths.c Sat Jan 25 23:23:12 2014
+@@ -79,8 +79,8 @@ static void showData(_Panel * panel)
+ addPathToList(panel->icoL, -1, "~/pixmaps");
+ addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
+ addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
+- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Icons");
+- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
++ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Icons");
++ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
+ addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ } else {
+ for (i = 0; i < WMGetPropListItemCount(array); i++) {
+@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
+ wwarning(_("bad value in option PixmapPath. Using
default path list"));
+ addPathToList(panel->pixL, -1, "~/pixmaps");
+ addPathToList(panel->pixL, -1,
"~/GNUstep/Library/WindowMaker/Pixmaps");
+- addPathToList(panel->pixL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
++ addPathToList(panel->pixL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
+ } else {
+ for (i = 0; i < WMGetPropListItemCount(array); i++) {
+ val = WMGetFromPLArray(array, i);
Index: patches/patch-WindowMaker_Defaults_WMWindowAttributes_in
===================================================================
RCS file:
/cvs/ports/x11/windowmaker/patches/patch-WindowMaker_Defaults_WMWindowAttributes_in,v
retrieving revision 1.1
diff -u -u -r1.1 patch-WindowMaker_Defaults_WMWindowAttributes_in
--- patches/patch-WindowMaker_Defaults_WMWindowAttributes_in 9 Aug 2012
09:30:27 -0000 1.1
+++ patches/patch-WindowMaker_Defaults_WMWindowAttributes_in 28 Jan 2014
15:45:21 -0000
@@ -1,11 +1,11 @@
-$OpenBSD: patch-WindowMaker_Defaults_WMWindowAttributes_in,v 1.1 2012/08/09
09:30:27 dcoppa Exp $
---- WindowMaker/Defaults/WMWindowAttributes.in.orig Thu Aug 9 10:18:17 2012
-+++ WindowMaker/Defaults/WMWindowAttributes.in Thu Aug 9 10:19:28 2012
+$OpenBSD$
+--- WindowMaker/Defaults/WMWindowAttributes.in.orig Sat Jan 25 23:24:26 2014
++++ WindowMaker/Defaults/WMWindowAttributes.in Sat Jan 25 23:25:00 2014
@@ -2,6 +2,7 @@
Logo.WMDock = {Icon = GNUstepGlow.#extension#;};
Logo.WMPanel = {Icon = GNUstep.#extension#;};
Logo.WMClip = {Icon = clip.#extension#;};
-+ WPrefs = {Icon = "%%PREFIX%%/share/WPrefs/WPrefs.#extension#";};
++ WPrefs = {Icon = "%%PREFIX%%/share/WPrefx/WPrefs.#extension#";};
Dockit = {Icon = GNUstep.#extension#;};
DockApp = {NoAppIcon = NO;};
- WSoundServer = {Icon = sound.#extension#;};
+ panel.Panel = {NoAppIcon = YES;};
Index: patches/patch-WindowMaker_Defaults_WindowMaker_in
===================================================================
RCS file:
/cvs/ports/x11/windowmaker/patches/patch-WindowMaker_Defaults_WindowMaker_in,v
retrieving revision 1.1
diff -u -u -r1.1 patch-WindowMaker_Defaults_WindowMaker_in
--- patches/patch-WindowMaker_Defaults_WindowMaker_in 1 Nov 2005 17:28:34
-0000 1.1
+++ patches/patch-WindowMaker_Defaults_WindowMaker_in 28 Jan 2014 15:45:21
-0000
@@ -1,21 +1,25 @@
-$OpenBSD: patch-WindowMaker_Defaults_WindowMaker_in,v 1.1 2005/11/01 17:28:34
wilfried Exp $
---- WindowMaker/Defaults/WindowMaker.in.orig Wed Oct 27 05:01:38 2004
-+++ WindowMaker/Defaults/WindowMaker.in Mon Oct 31 18:52:02 2005
-@@ -15,7 +15,7 @@
- "/usr/X11R6/include/X11/pixmaps",
+$OpenBSD$
+--- WindowMaker/Defaults/WindowMaker.in.orig Fri Sep 13 00:43:54 2013
++++ WindowMaker/Defaults/WindowMaker.in Sun Jan 26 13:55:16 2014
+@@ -15,9 +15,7 @@
+ "/usr/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
- "/usr/share/icons",
+ "~/GNUstep/Library/WindowMaker/CachedPixmaps",
+- "/usr/share/icons",
- "/usr/local/share/pixmaps",
-+ "%%PREFIX%%/share/pixmaps",
- "/usr/share/pixmaps"
+- "/usr/share/pixmaps"
++ "%%PREFIX%%/share/pixmaps"
);
PixmapPath = (
-@@ -24,7 +24,7 @@
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+@@ -25,9 +23,7 @@
+ "~/GNUstep/Library/WindowMaker/CachedPixmaps",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/include/X11/pixmaps",
- "/usr/local/share/pixmaps",
-+ "%%PREFIX%%/share/pixmaps",
- "/usr/share/pixmaps"
+- "/usr/share/pixmaps"
++ "%%PREFIX%%/share/pixmaps"
);
WindowTitleBalloons = YES;
+ IconSize = 64;
Index: patches/patch-WindowMaker_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WindowMaker_Makefile_in,v
retrieving revision 1.6
diff -u -u -r1.6 patch-WindowMaker_Makefile_in
--- patches/patch-WindowMaker_Makefile_in 20 May 2010 10:58:08 -0000
1.6
+++ patches/patch-WindowMaker_Makefile_in 28 Jan 2014 15:45:21 -0000
@@ -1,12 +1,21 @@
-$OpenBSD: patch-WindowMaker_Makefile_in,v 1.6 2010/05/20 10:58:08 espie Exp $
---- WindowMaker/Makefile.in.orig Sun Jun 19 05:23:01 2005
-+++ WindowMaker/Makefile.in Thu May 20 12:50:56 2010
-@@ -116,7 +116,7 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps
-
- prefsdatadir = $(pkgdatadir)
-
--prefsdata_DATA = README README.themes autostart.sh exitscript.sh
menu menu.bg menu.ca menu.cz menu.da menu.de
menu.el menu.es menu.fi menu.fr menu.gl
menu.he menu.hr menu.hu menu.it menu.ja
menu.ko menu.nl menu.no menu.pl menu.pt
menu.ro menu.ru menu.se menu.sk menu.sl
menu.tr menu.zh_CN menu.zh_TW plmenu plmenu.bg
plmenu.da plmenu.de plmenu.es plmenu.fi plmenu.fr
plmenu.hr plmenu.it plmenu.ja plmenu.ko plmenu.pl
plmenu.ro plmenu.sk plmenu.zh_CN plmenu.zh_TW wmmacros
xtree.dat
-+prefsdata_DATA = README README.themes autostart.sh exitscript.sh
menu menu.bg menu.ca menu.cs menu.da menu.de
menu.el menu.es menu.fi menu.fr menu.gl
menu.he menu.hr menu.hu menu.it menu.ja
menu.ko menu.nl menu.no menu.pl menu.pt
menu.ro menu.ru menu.sv menu.sk menu.sl
menu.tr menu.zh_CN menu.zh_TW plmenu plmenu.bg
plmenu.da plmenu.de plmenu.es plmenu.fi plmenu.fr
plmenu.hr plmenu.it plmenu.ja plmenu.ko plmenu.pl
plmenu.ro plmenu.sk plmenu.zh_CN plmenu.zh_TW wmmacros
xtree.dat
-
-
- EXTRA_DIST = $(prefsdata_DATA) mkMakefile
+$OpenBSD$
+--- WindowMaker/Makefile.in.orig Fri Sep 13 01:00:17 2013
++++ WindowMaker/Makefile.in Sun Jan 26 13:26:44 2014
+@@ -286,7 +286,7 @@ prefsdata_DATA = \
+ menu\
+ menu.bg\
+ menu.ca\
+- menu.cz\
++ menu.cs\
+ menu.da\
+ menu.de\
+ menu.el\
+@@ -306,7 +306,7 @@ prefsdata_DATA = \
+ menu.pt\
+ menu.ro\
+ menu.ru\
+- menu.se\
++ menu.sv\
+ menu.sk\
+ menu.sl\
+ menu.tr\
Index: patches/patch-WindowMaker_menu
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WindowMaker_menu,v
retrieving revision 1.3
diff -u -u -r1.3 patch-WindowMaker_menu
--- patches/patch-WindowMaker_menu 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WindowMaker_menu 28 Jan 2014 15:45:21 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-WindowMaker_menu,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WindowMaker/menu.orig Sat Oct 23 05:47:52 2004
-+++ WindowMaker/menu Mon Oct 31 18:40:37 2005
+$OpenBSD$
+--- WindowMaker/menu.orig Sat Jan 25 23:29:12 2014
++++ WindowMaker/menu Sat Jan 25 23:29:37 2014
@@ -208,7 +208,7 @@
"Background" END
"Save Theme" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
Index: patches/patch-WindowMaker_plmenu
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-WindowMaker_plmenu,v
retrieving revision 1.3
diff -u -u -r1.3 patch-WindowMaker_plmenu
--- patches/patch-WindowMaker_plmenu 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WindowMaker_plmenu 28 Jan 2014 15:45:21 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-WindowMaker_plmenu,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WindowMaker/plmenu.orig Sat Oct 23 05:49:23 2004
-+++ WindowMaker/plmenu Mon Oct 31 18:41:14 2005
+$OpenBSD$
+--- WindowMaker/plmenu.orig Sat Jan 25 23:30:00 2014
++++ WindowMaker/plmenu Sat Jan 25 23:30:17 2014
@@ -93,7 +93,7 @@
- ),
- ("Save Theme", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
- ("Save IconSet", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-- ("Preferences Utility", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+ ("Preferences Utility", EXEC, "#wprefsdir#/WPrefs")
- ),
- ("Session",
- ("Save Session", SAVE_SESSION),
+ ),
+ ("Save Theme", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+ ("Save IconSet", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+- ("Preferences Utility", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++ ("Preferences Utility", EXEC, "#wprefsdir#/WPrefs")
+ ),
+ ("Session",
+ ("Save Session", SAVE_SESSION),
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-configure,v
retrieving revision 1.3
diff -u -u -r1.3 patch-configure
--- patches/patch-configure 27 Dec 2005 23:12:24 -0000 1.3
+++ patches/patch-configure 28 Jan 2014 15:45:21 -0000
@@ -1,45 +1,27 @@
-$OpenBSD: patch-configure,v 1.3 2005/12/27 23:12:24 naddy Exp $
---- configure.orig Sun Jun 19 05:23:02 2005
-+++ configure Tue Dec 27 22:18:30 2005
-@@ -21237,7 +21237,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--{int x; asm volatile("movl %%eax, %%ebx\n"::
-+{int x; asm volatile("pushal\n movl %%eax, %%ebx\n popal\n"::
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}
- ;
-@@ -21301,7 +21301,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--asm ("movq %mm0, %mm1");
-+asm ("movq (%ebx), %mm1");
- ;
- return 0;
- }
-@@ -21489,13 +21489,13 @@ echo "${ECHO_T}$ac_cv_func_gettext" >&6
- if test $ac_cv_func_gettext = yes; then
+$OpenBSD$
+--- configure.orig Sat Jan 25 23:08:24 2014
++++ configure Sat Jan 25 23:11:53 2014
+@@ -12883,13 +12883,13 @@ ac_fn_c_check_func "$LINENO" "gettext"
"ac_cv_func_get
+ if test "x$ac_cv_func_gettext" = x""yes; then :
HAVEGETTEXT="yes"
else
-- echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
--echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
+-$as_echo_n "checking for gettext in -lintl... " >&6; }
+ echo "$as_me:$LINENO: checking for gettext in -lintl -liconv" >&5
+echo $ECHO_N "checking for gettext in -lintl -liconv... $ECHO_C" >&6
- if test "${ac_cv_lib_intl_gettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_gettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-+LIBS="-lintl -liconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21553,7 +21553,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
- echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
- if test $ac_cv_lib_intl_gettext = yes; then
++LIBS="-lintl -liconv $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -12920,7 +12920,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
+ $as_echo "$ac_cv_lib_intl_gettext" >&6; }
+ if test "x$ac_cv_lib_intl_gettext" = x""yes; then :
- INTLIBS="-lintl" HAVEGETTEXT="yes"
+ INTLIBS="-lintl -liconv" HAVEGETTEXT="yes"
else
Index: patches/patch-src_actions_c
===================================================================
RCS file: patches/patch-src_actions_c
diff -N patches/patch-src_actions_c
--- patches/patch-src_actions_c 19 Sep 2013 20:43:54 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$OpenBSD: patch-src_actions_c,v 1.5 2013/09/19 20:43:54 sthen Exp $
-
-1. Fix periodic focus bug
-From: Pedro Gimeno <parig...@formauri.es>
-Date: Mon, 19 May 2008 17:52:00 -0300
-http://repo.or.cz/w/wmaker-crm.git/commitdiff/c91bb1ba1360006c568db37438779e525868cf17
-
-2. Bugfix: java menu problem after resize, maximize
-From: Ambrus Szabo <don...@donamo.hu>
-Date: Tue, 5 Apr 2011 12:36:11 +0200
-http://repo.or.cz/w/wmaker-crm.git/commit/7490b14bf0573283cd11eea3b1b6392c6f38e2dd
-
---- src/actions.c.orig Sun Jul 3 18:25:14 2005
-+++ src/actions.c Thu Sep 19 21:43:05 2013
-@@ -78,6 +78,15 @@ static struct {
- #define SHADE_STEPS shadePars[(int)wPreferences.shade_speed].steps
- #define SHADE_DELAY shadePars[(int)wPreferences.shade_speed].delay
-
-+static int
-+compareTimes(Time t1, Time t2)
-+{
-+ Time diff;
-+ if (t1 == t2)
-+ return 0;
-+ diff = t1 - t2;
-+ return (diff < 60000) ? 1 : -1;
-+}
-
- /*
- *----------------------------------------------------------------------
-@@ -99,11 +108,11 @@ wSetFocusTo(WScreen *scr, WWindow *wwin)
-
- WWindow *old_focused;
- WWindow *focused=scr->focused_window;
-- int timestamp=LastTimestamp;
-+ Time timestamp=LastTimestamp;
- WApplication *oapp=NULL, *napp=NULL;
- int wasfocused;
-
-- if (scr->flags.ignore_focus_events || LastFocusChange > timestamp)
-+ if (scr->flags.ignore_focus_events || compareTimes(LastFocusChange,
timestamp) > 0)
- return;
-
- if (!old_scr)
-@@ -463,8 +472,8 @@ wMaximizeWindow(WWindow *wwin, int directions)
- &new_width, &new_height);
-
- wWindowConfigure(wwin, new_x, new_y, new_width, new_height);
-+ wWindowSynthConfigureNotify(wwin);
-
--
- WMPostNotificationName(WMNChangedState, wwin, "maximize");
-
- wSoundPlay(WSOUND_MAXIMIZE);
-@@ -494,6 +503,7 @@ wUnmaximizeWindow(WWindow *wwin)
-
- wwin->flags.maximized = 0;
- wWindowConfigure(wwin, x, y, w, h);
-+ wWindowSynthConfigureNotify(wwin);
-
- WMPostNotificationName(WMNChangedState, wwin, "maximize");
-
Index: patches/patch-src_dock_c
===================================================================
RCS file: patches/patch-src_dock_c
diff -N patches/patch-src_dock_c
--- patches/patch-src_dock_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_dock_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/dock.c.orig Sat Oct 23 05:10:40 2004
-+++ src/dock.c Thu May 20 12:50:56 2010
-@@ -2977,7 +2977,7 @@ execCommand(WAppIcon *btn, char *command, WSavedState
-
- wtokensplit(cmdline, &argv, &argc);
-
-- if (argv==NULL) {
-+ if (!argc) {
- if (cmdline)
- wfree(cmdline);
- if (state)
Index: patches/patch-src_main_c
===================================================================
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- patches/patch-src_main_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_main_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/main.c.orig Mon Oct 25 03:32:51 2004
-+++ src/main.c Thu May 20 12:50:56 2010
-@@ -331,6 +331,7 @@ ExecuteShellCommand(WScreen *scr, char *command)
- * forked by wmaker.
- *---------------------------------------------------------------------------
- */
-+#if 0
- void
- StartLogShell(WScreen *scr)
- {
-@@ -403,7 +404,7 @@ StartLogShell(WScreen *scr)
- LogStdErr = err_fd[0];
- }
- }
--
-+#endif
-
- /*
- *---------------------------------------------------------------------
Index: patches/patch-src_moveres_c
===================================================================
RCS file: patches/patch-src_moveres_c
diff -N patches/patch-src_moveres_c
--- patches/patch-src_moveres_c 19 Sep 2013 20:43:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_moveres_c,v 1.2 2013/09/19 20:43:54 sthen Exp $
-
-Bugfix: java menu problem after resize, maximize
-From: Ambrus Szabo <don...@donamo.hu>
-Date: Tue, 5 Apr 2011 12:36:11 +0200
-http://repo.or.cz/w/wmaker-crm.git/commit/7490b14bf0573283cd11eea3b1b6392c6f38e2dd
-
---- src/moveres.c.orig Sun Oct 24 20:36:09 2004
-+++ src/moveres.c Thu Sep 19 21:43:05 2013
-@@ -2190,6 +2190,7 @@ wMouseResizeWindow(WWindow *wwin, XEvent *ev)
- wwin->flags.user_changed_height = 1;
-
- wWindowConfigure(wwin, fx, fy, fw, fh - vert_border);
-+ wWindowSynthConfigureNotify(wwin);
- }
- #ifdef DEBUG
- puts("End resize window");
Index: patches/patch-src_session_c
===================================================================
RCS file: patches/patch-src_session_c
diff -N patches/patch-src_session_c
--- patches/patch-src_session_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_session_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/session.c.orig Fri Mar 11 22:35:38 2005
-+++ src/session.c Thu May 20 12:50:56 2010
-@@ -381,7 +381,7 @@ execCommand(WScreen *scr, char *command, char *host)
-
- wtokensplit(command, &argv, &argc);
-
-- if (argv==NULL) {
-+ if (!argc) {
- return 0;
- }
-
Index: patches/patch-src_wmspec_c
===================================================================
RCS file: patches/patch-src_wmspec_c
diff -N patches/patch-src_wmspec_c
--- patches/patch-src_wmspec_c 20 May 2010 10:58:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-$OpenBSD: patch-src_wmspec_c,v 1.3 2010/05/20 10:58:08 espie Exp $
---- src/wmspec.c.orig Sun May 15 18:41:09 2005
-+++ src/wmspec.c Thu May 20 12:50:56 2010
-@@ -322,14 +322,14 @@ setSupportedHints(WScreen *scr)
- void
- wNETWMUpdateDesktop(WScreen *scr)
- {
-- CARD32 *views, sizes[2];
-+ long *views, sizes[2];
- int count, i;
-
- if (scr->workspace_count==0)
- return;
-
- count = scr->workspace_count * 2;
-- views = wmalloc(sizeof(CARD32) * count);
-+ views = wmalloc(sizeof(long) * count);
- /*memset(views, 0, sizeof(CARD32) * count);*/
-
- #ifdef VIRTUAL_DESKTOP
-@@ -487,7 +487,7 @@ updateIconImage(WScreen *scr, WWindow *wwin)
- static void
- updateShowDesktop(WScreen * scr, Bool show)
- {
-- CARD32 foo;
-+ long foo;
-
- foo = (show == True);
- XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
-@@ -660,7 +660,7 @@ wNETWMUpdateActions(WWindow *wwin, Bool del)
- void
- wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
- {
-- CARD32 *area;
-+ long *area;
- int count, i;
-
- /* XXX: not Xinerama compatible,
-@@ -670,7 +670,7 @@ wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
- return;
-
- count = scr->workspace_count * 4;
-- area = wmalloc(sizeof(CARD32) * count);
-+ area = wmalloc(sizeof(long) * count);
- for (i=0; i<scr->workspace_count; i++) {
- area[4*i + 0] = usableArea.x1;
- area[4*i + 1] = usableArea.y1;
-@@ -793,7 +793,7 @@ updateClientListStacking(WScreen *scr, WWindow *wwin_e
- static void
- updateWorkspaceCount(WScreen *scr) /* changeable */
- {
-- CARD32 count;
-+ long count;
-
- count = scr->workspace_count;
-
-@@ -805,7 +805,7 @@ updateWorkspaceCount(WScreen *scr) /* changeable */
- static void
- updateCurrentWorkspace(WScreen *scr) /* changeable */
- {
-- CARD32 count;
-+ long count;
-
- count = scr->current_workspace;
-
-@@ -852,7 +852,7 @@ updateFocusHint(WScreen *scr, WWindow *wwin) /* change
- static void
- updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
- {
-- CARD32 l;
-+ long l;
-
- if (del) {
- XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
Index: patches/patch-util_wmaker_inst_in
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-util_wmaker_inst_in,v
retrieving revision 1.5
diff -u -u -r1.5 patch-util_wmaker_inst_in
--- patches/patch-util_wmaker_inst_in 15 Feb 2009 20:12:17 -0000 1.5
+++ patches/patch-util_wmaker_inst_in 28 Jan 2014 15:45:21 -0000
@@ -1,29 +1,24 @@
-$OpenBSD: patch-util_wmaker_inst_in,v 1.5 2009/02/15 20:12:17 wilfried Exp $
---- util/wmaker.inst.in.orig Fri Apr 8 13:24:14 2005
-+++ util/wmaker.inst.in Sun Feb 15 20:31:10 2009
-@@ -22,6 +22,7 @@ fi
+$OpenBSD$
+--- util/wmaker.inst.in.orig Sat Jan 25 23:37:56 2014
++++ util/wmaker.inst.in Sat Jan 25 23:39:59 2014
+@@ -19,6 +19,7 @@ LOCALE="${LC_ALL-${LC_MESSAGES-$LANG}}"
# directory where system wide configuration is stored
GLOBALDIR="#pkgdatadir#"
GLOBALDEFDIR="#sysconfdir#"
+WPREFSDIR="#bindir#"
- USERDIR=$HOME
+ USERDIR="$HOME"
-@@ -81,14 +82,17 @@ copy() {
- source=$GLOBALDIR/plmenu
- fi
- sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
-+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $GSDIR/Defaults/WMRootMenu
+@@ -64,10 +65,12 @@ copy() {
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
-+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $target
++ -e "s:#wprefsdir#:$WPREFSDIR:g" \
+ "$source" > "$target"
else
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
-e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $target
+ "$source" > "$target"
fi
fi
Index: patches/patch-wrlib_Makefile_in
===================================================================
RCS file: patches/patch-wrlib_Makefile_in
diff -N patches/patch-wrlib_Makefile_in
--- patches/patch-wrlib_Makefile_in 27 Dec 2005 23:12:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-wrlib_Makefile_in,v 1.2 2005/12/27 23:12:24 naddy Exp $
---- wrlib/Makefile.in.orig Sun Jun 19 05:23:01 2005
-+++ wrlib/Makefile.in Tue Dec 27 22:18:30 2005
-@@ -112,7 +112,7 @@ supported_locales = @supported_locales@
- wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
-
--SUBDIRS = . tests
-+SUBDIRS = .
-
- AUTOMAKE_OPTIONS = no-dependencies
-
Index: patches/patch-wrlib_gif_c
===================================================================
RCS file: /cvs/ports/x11/windowmaker/patches/patch-wrlib_gif_c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-wrlib_gif_c
--- patches/patch-wrlib_gif_c 25 Sep 2013 07:58:51 -0000 1.1
+++ patches/patch-wrlib_gif_c 28 Jan 2014 15:45:21 -0000
@@ -1,36 +1,33 @@
-$OpenBSD: patch-wrlib_gif_c,v 1.1 2013/09/25 07:58:51 sthen Exp $
-
-handle giflib 5.0+
-
---- wrlib/gif.c.orig Tue Oct 12 12:21:01 2004
-+++ wrlib/gif.c Thu Sep 19 14:59:11 2013
-@@ -49,6 +49,7 @@ RLoadGIF(RContext *context, char *file, int index)
- GifPixelType *buffer = NULL;
- int i, j, k;
- int width, height;
-+ int giferr = 0;
- GifRecordType recType;
- ColorMapObject *colormap;
- unsigned char rmap[256];
-@@ -61,10 +62,10 @@ RLoadGIF(RContext *context, char *file, int index)
- /* default error message */
- RErrorCode = RERR_BADINDEX;
+$OpenBSD$
+--- wrlib/gif.c.orig Sat Jan 25 23:42:18 2014
++++ wrlib/gif.c Sat Jan 25 23:43:35 2014
+@@ -47,6 +47,7 @@ RImage *RLoadGIF(const char *file, int index)
+ GifPixelType *buffer = NULL;
+ int i, j, k;
+ int width, height;
++ int giferr = 0;
+ GifRecordType recType;
+ ColorMapObject *colormap;
+ unsigned char rmap[256];
+@@ -59,10 +60,10 @@ RImage *RLoadGIF(const char *file, int index)
+ /* default error message */
+ RErrorCode = RERR_BADINDEX;
-- gif = DGifOpenFileName(file);
-+ gif = DGifOpenFileName(file, &giferr);
+- gif = DGifOpenFileName(file);
++ gif = DGifOpenFileName(file, &giferr);
- if (!gif) {
-- switch (GifLastError()) {
-+ switch (giferr) {
- case D_GIF_ERR_OPEN_FAILED:
- RErrorCode = RERR_OPEN;
- break;
-@@ -202,7 +203,7 @@ RLoadGIF(RContext *context, char *file, int index)
- /* yuck! */
- goto did_not_get_any_errors;
- giferr:
-- switch (GifLastError()) {
-+ switch (gif->Error) {
- case D_GIF_ERR_OPEN_FAILED:
- RErrorCode = RERR_OPEN;
- break;
+ if (!gif) {
+- switch (GifLastError()) {
++ switch (giferr) {
+ case D_GIF_ERR_OPEN_FAILED:
+ RErrorCode = RERR_OPEN;
+ break;
+@@ -199,7 +200,7 @@ RImage *RLoadGIF(const char *file, int index)
+ /* yuck! */
+ goto did_not_get_any_errors;
+ giferr:
+- switch (GifLastError()) {
++ switch (gif->Error) {
+ case D_GIF_ERR_OPEN_FAILED:
+ RErrorCode = RERR_OPEN;
+ break;
Index: patches/patch-wrlib_png_c
===================================================================
RCS file: patches/patch-wrlib_png_c
diff -N patches/patch-wrlib_png_c
--- patches/patch-wrlib_png_c 8 Jul 2011 20:38:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-wrlib_png_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
-
-Fix build with png-1.5.
-
---- wrlib/png.c.orig Tue Jul 5 22:30:42 2011
-+++ wrlib/png.c Tue Jul 5 22:31:03 2011
-@@ -97,7 +97,7 @@ RLoadPNG(RContext *context, char *file, int index)
- }
-
- RErrorCode = RERR_INTERNAL;
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- fclose(f);
- png_destroy_read_struct(&png, &pinfo, &einfo);
- if (image)
Index: patches/patch-wrlib_x86_specific_c
===================================================================
RCS file: patches/patch-wrlib_x86_specific_c
diff -N patches/patch-wrlib_x86_specific_c
--- patches/patch-wrlib_x86_specific_c 20 May 2010 10:58:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-$OpenBSD: patch-wrlib_x86_specific_c,v 1.1 2010/05/20 10:58:08 espie Exp $
---- wrlib/x86_specific.c.orig Sun Oct 31 02:44:01 2004
-+++ wrlib/x86_specific.c Thu May 20 12:50:56 2010
-@@ -98,15 +98,23 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-+
- short *tmp_err;
- short *tmp_nerr;
- int x;
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- // pack dr, dg and db into mm6
- "movl %7, %%eax \n\t"
-@@ -290,7 +298,7 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
-
- ".Enda: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -309,17 +317,18 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x) // %26
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
-@@ -342,8 +351,15 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-
- short *tmp_err;
- short *tmp_nerr;
-@@ -354,7 +370,7 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- "movl %13, %%eax \n\t" // eax = width
- "movl %%eax, %%ebx \n\t"
-@@ -424,7 +440,7 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
-
- ".Endc: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -443,19 +459,20 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x), // %26
- "m" (w1), // %27
- "m" (w2) // %28
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
Index: pkg/PLIST-lang
===================================================================
RCS file: /cvs/ports/x11/windowmaker/pkg/PLIST-lang,v
retrieving revision 1.5
diff -u -u -r1.5 PLIST-lang
--- pkg/PLIST-lang 27 Dec 2005 23:12:24 -0000 1.5
+++ pkg/PLIST-lang 28 Jan 2014 15:45:21 -0000
@@ -59,9 +59,11 @@
share/locale/de/LC_MESSAGES/WINGs.mo
share/locale/de/LC_MESSAGES/WPrefs.mo
share/locale/de/LC_MESSAGES/WindowMaker.mo
+share/locale/de/LC_MESSAGES/wmgenmenu.mo
share/locale/el/LC_MESSAGES/WindowMaker.mo
share/locale/es/LC_MESSAGES/WPrefs.mo
share/locale/es/LC_MESSAGES/WindowMaker.mo
+share/locale/es/LC_MESSAGES/wmgenmenu.mo
share/locale/et/LC_MESSAGES/WPrefs.mo
share/locale/et/LC_MESSAGES/WindowMaker.mo
share/locale/fi/LC_MESSAGES/WPrefs.mo
@@ -69,6 +71,7 @@
share/locale/fr/LC_MESSAGES/WINGs.mo
share/locale/fr/LC_MESSAGES/WPrefs.mo
share/locale/fr/LC_MESSAGES/WindowMaker.mo
+share/locale/fr/LC_MESSAGES/wmgenmenu.mo
share/locale/gl/LC_MESSAGES/WindowMaker.mo
share/locale/hr/LC_MESSAGES/WPrefs.mo
share/locale/hr/LC_MESSAGES/WindowMaker.mo
@@ -88,6 +91,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: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/windowmaker/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -u -r1.2 PLIST-main
--- pkg/PLIST-main 22 Aug 2013 23:03:21 -0000 1.2
+++ pkg/PLIST-main 28 Jan 2014 15:45:21 -0000
@@ -19,39 +19,73 @@
@bin bin/wmagnify
@bin bin/wmaker
bin/wmaker.inst
+@bin bin/wmgenmenu
+@bin bin/wmmenugen
@bin bin/wmsetbg
-@bin bin/wmsetup
@bin bin/wxcopy
@bin bin/wxpaste
include/WINGs/
include/WINGs/WINGs.h
include/WINGs/WINGsP.h
include/WINGs/WUtil.h
-include/WINGs/proplist-compat.h
-include/WINGs/wtabledelegates.h
-include/WINGs/wtableview.h
include/WMaker.h
include/wraster.h
-lib/libExtraWINGs.a
lib/libWINGs.a
+lib/libWINGs.la
+@lib lib/libWINGs.so.${LIBWINGs_VERSION}
lib/libWMaker.a
+lib/libWMaker.la
+@lib lib/libWMaker.so.${LIBWMaker_VERSION}
lib/libWUtil.a
+lib/libWUtil.la
+@lib lib/libWUtil.so.${LIBWUtil_VERSION}
lib/libwraster.a
lib/libwraster.la
@lib lib/libwraster.so.${LIBwraster_VERSION}
lib/pkgconfig/
lib/pkgconfig/WINGs.pc
-lib/pkgconfig/wmlib.pc
lib/pkgconfig/wrlib.pc
+man/cs/
+man/cs/man1/
+@man man/cs/man1/geticonset.1x
+@man man/cs/man1/getstyle.1x
+@man man/cs/man1/seticons.1x
+@man man/cs/man1/setstyle.1x
+@man man/cs/man1/wdwrite.1x
+@man man/cs/man1/wmaker.1x
+@man man/cs/man1/wmsetbg.1x
+@man man/cs/man1/wxcopy.1x
+@man man/cs/man1/wxpaste.1x
+@man man/man1/WPrefs.1x
+@man man/man1/WindowMaker.1x
+@man man/man1/get-wings-flags.1
+@man man/man1/get-wraster-flags.1
+@man man/man1/get-wutil-flags.1
@man man/man1/geticonset.1x
@man man/man1/getstyle.1x
@man man/man1/seticons.1x
@man man/man1/setstyle.1x
+@man man/man1/wdread.1
@man man/man1/wdwrite.1x
+@man man/man1/wmagnify.1x
@man man/man1/wmaker.1x
+@man man/man1/wmgenmenu.1
+@man man/man1/wmmenugen.1
@man man/man1/wmsetbg.1x
@man man/man1/wxcopy.1x
@man man/man1/wxpaste.1x
+@man man/man8/upgrade-windowmaker-defaults.8
+man/ru/
+man/ru/man1/
+@man man/ru/man1/geticonset.1x
+@man man/ru/man1/getstyle.1x
+@man man/ru/man1/seticons.1x
+@man man/ru/man1/setstyle.1x
+@man man/ru/man1/wdwrite.1x
+@man man/ru/man1/wmaker.1x
+@man man/ru/man1/wmsetbg.1x
+@man man/ru/man1/wxcopy.1x
+@man man/ru/man1/wxpaste.1x
man/sk/
man/sk/man1/
@man man/sk/man1/geticonset.1x
@@ -79,7 +113,9 @@
share/WPrefs/tiff/configs.tiff
share/WPrefs/tiff/cycleworkspaces.tiff
share/WPrefs/tiff/dock.tiff
+share/WPrefs/tiff/dockclipdrawersection.tiff
share/WPrefs/tiff/dontlinkworkspaces.tiff
+share/WPrefs/tiff/drawer.tiff
share/WPrefs/tiff/ergonomic.tiff
share/WPrefs/tiff/expert.tiff
share/WPrefs/tiff/fonts.tiff
@@ -91,6 +127,7 @@
share/WPrefs/tiff/menualign2.tiff
share/WPrefs/tiff/menuprefs.tiff
share/WPrefs/tiff/menus.tiff
+share/WPrefs/tiff/miscprefs2.tiff
share/WPrefs/tiff/moreanim.tiff
share/WPrefs/tiff/mousesettings.tiff
share/WPrefs/tiff/mousespeed.tiff
@@ -98,9 +135,12 @@
share/WPrefs/tiff/msty2.tiff
share/WPrefs/tiff/msty3.tiff
share/WPrefs/tiff/newstyle.tiff
+share/WPrefs/tiff/nextstyle.tiff
share/WPrefs/tiff/nonopaque.tiff
+share/WPrefs/tiff/noopaqueresize.tiff
share/WPrefs/tiff/oldstyle.tiff
share/WPrefs/tiff/opaque.tiff
+share/WPrefs/tiff/opaqueresize.tiff
share/WPrefs/tiff/paths.tiff
share/WPrefs/tiff/smooth.tiff
share/WPrefs/tiff/sound.tiff
@@ -116,6 +156,7 @@
share/WPrefs/tiff/speed4s.tiff
share/WPrefs/tiff/tdel.tiff
share/WPrefs/tiff/tedit.tiff
+share/WPrefs/tiff/temp.tiff
share/WPrefs/tiff/textr.tiff
share/WPrefs/tiff/theme.tiff
share/WPrefs/tiff/timer0.tiff
@@ -145,7 +186,8 @@
share/WindowMaker/Icons/
share/WindowMaker/Icons/BitchX.tiff
share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/DefaultAppIcon.tiff
+share/WindowMaker/Icons/Drawer.png
+share/WindowMaker/Icons/Ear.png
share/WindowMaker/Icons/Ftp.png
share/WindowMaker/Icons/GNUstep.tiff
share/WindowMaker/Icons/GNUstep.xpm
@@ -158,10 +200,13 @@
share/WindowMaker/Icons/GreenWilber.png
share/WindowMaker/Icons/ICQ.png
share/WindowMaker/Icons/Jabber.png
+share/WindowMaker/Icons/Magnify.tiff
+share/WindowMaker/Icons/Magnify.xpm
+share/WindowMaker/Icons/Mouth.png
share/WindowMaker/Icons/Mozilla.png
-share/WindowMaker/Icons/Netscape.png
share/WindowMaker/Icons/Pen.png
share/WindowMaker/Icons/Pencil.png
+share/WindowMaker/Icons/README
share/WindowMaker/Icons/Real.png
share/WindowMaker/Icons/Shell.png
share/WindowMaker/Icons/Speaker.png
@@ -171,6 +216,7 @@
share/WindowMaker/Icons/TerminalGNUstep.xpm
share/WindowMaker/Icons/TerminalLinux.tiff
share/WindowMaker/Icons/TerminalLinux.xpm
+share/WindowMaker/Icons/Wine.png
share/WindowMaker/Icons/XChat.png
share/WindowMaker/Icons/clip.tiff
share/WindowMaker/Icons/clip.xpm
@@ -194,8 +240,6 @@
share/WindowMaker/Icons/real.xpm
share/WindowMaker/Icons/sgiterm.tiff
share/WindowMaker/Icons/sgiterm.xpm
-share/WindowMaker/Icons/sound.tiff
-share/WindowMaker/Icons/sound.xpm
share/WindowMaker/Icons/staroffice2.tiff
share/WindowMaker/Icons/staroffice2.xpm
share/WindowMaker/Icons/timer.tiff
@@ -254,16 +298,18 @@
share/WindowMaker/Styles/Traditional.style
share/WindowMaker/Styles/VioletBlue.style
share/WindowMaker/Themes/
+share/WindowMaker/Themes/Blau.style
share/WindowMaker/Themes/Default.style
share/WindowMaker/Themes/OpenStep.style
share/WindowMaker/Themes/Pastel.style
share/WindowMaker/Themes/SteelBlueSilk.style
+share/WindowMaker/appearance.menu
share/WindowMaker/autostart.sh
+share/WindowMaker/background.menu
share/WindowMaker/exitscript.sh
share/WindowMaker/menu
share/WindowMaker/plmenu
share/WindowMaker/wmmacros
-share/WindowMaker/xtree.dat
share/examples/WindowMaker/
@sample ${SYSCONFDIR}/WindowMaker/
share/examples/WindowMaker/WMGLOBAL
