Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/wmx wm/wmx: Update to Version 8
details: https://anonhg.NetBSD.org/pkgsrc/rev/cffe4f278502
branches: trunk
changeset: 428498:cffe4f278502
user: nikita <nikita%pkgsrc.org@localhost>
date: Tue Apr 28 15:28:57 2020 +0000
description:
wm/wmx: Update to Version 8
diffstat:
wm/wmx/Makefile | 3 +-
wm/wmx/Makefile.common | 11 +++++++--
wm/wmx/distinfo | 26 ++++++++++------------
wm/wmx/patches/patch-Border.C | 24 +++++++++++++++++++++
wm/wmx/patches/patch-Client.C | 14 ++++++++++++
wm/wmx/patches/patch-Config.h | 31 ++++++++++++++++++++++++++++
wm/wmx/patches/patch-Config.h~ | 31 ++++++++++++++++++++++++++++
wm/wmx/patches/patch-General.h | 13 +++++++++++
wm/wmx/patches/patch-Makefile.in | 15 +++++++++++++
wm/wmx/patches/patch-Manager.C | 17 +++++++++++++++
wm/wmx/patches/patch-Rotated.C | 12 ++++++++++
wm/wmx/patches/patch-aa | 44 ----------------------------------------
wm/wmx/patches/patch-ab | 13 -----------
wm/wmx/patches/patch-ac | 24 ---------------------
wm/wmx/patches/patch-ad | 13 -----------
wm/wmx/patches/patch-ae | 12 ----------
wm/wmx/patches/patch-af | 13 -----------
wm/wmx/patches/patch-ag | 16 --------------
wm/wmx/patches/patch-ah | 13 -----------
wm/wmx/patches/patch-ai | 32 -----------------------------
20 files changed, 178 insertions(+), 199 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/Makefile
--- a/wm/wmx/Makefile Tue Apr 28 15:25:57 2020 +0000
+++ b/wm/wmx/Makefile Tue Apr 28 15:28:57 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 12:42:25 asau Exp $
+# $NetBSD: Makefile,v 1.15 2020/04/28 15:28:57 nikita Exp $
PKGNAME= wmx-${WMX_VERS}
-PKGREVISION= 3
COMMENT= Another X11 window manager based on wm2
.include "../../wm/wmx/Makefile.common"
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/Makefile.common
--- a/wm/wmx/Makefile.common Tue Apr 28 15:25:57 2020 +0000
+++ b/wm/wmx/Makefile.common Tue Apr 28 15:28:57 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.26 2020/01/26 17:32:20 rillig Exp $
+# $NetBSD: Makefile.common,v 1.27 2020/04/28 15:28:57 nikita Exp $
#
# used by wm/wmx/Makefile
# used by wm/wmx-gnome/Makefile
-DISTNAME= wmx-6
-WMX_VERS= 6.0
+DISTNAME= wmx-8
+WMX_VERS= 8.0
CATEGORIES+= x11 wm
MASTER_SITES= http://www.all-day-breakfast.com/wmx/
@@ -15,6 +15,7 @@
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
BUILD_TARGET= depend all
DISTINFO_FILE= ${.CURDIR}/../../wm/wmx/distinfo
@@ -33,6 +34,10 @@
BUILDLINK_DEPMETHOD.libXt+= build
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/distinfo
--- a/wm/wmx/distinfo Tue Apr 28 15:25:57 2020 +0000
+++ b/wm/wmx/distinfo Tue Apr 28 15:28:57 2020 +0000
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.13 2015/11/02 23:42:56 agc Exp $
+$NetBSD: distinfo,v 1.14 2020/04/28 15:28:57 nikita Exp $
-SHA1 (wmx-6.tar.gz) = 89563c8c2af1d3ffbee06197928123fd03ae9c54
-RMD160 (wmx-6.tar.gz) = 871c0de0ddd30ed90cc8f7eae287fa62177142c4
-SHA512 (wmx-6.tar.gz) = eee03c4ee532d6a7335468da7c0ce6fc91d504917f5dd1047d6eb3c7c90ac9c1db427b3635bc59dc289442a9457e682faa14e2e7dae3901952a73545d417edf5
-Size (wmx-6.tar.gz) = 86515 bytes
-SHA1 (patch-aa) = 991b6cacbcf23569b52233b3fcc394457aa2181e
-SHA1 (patch-ab) = 2f210b6965248be688a640472fb018d62e5197d0
-SHA1 (patch-ac) = 5921c882abd6769b2adf4fe26bb965982c9a5356
-SHA1 (patch-ad) = b4b66989ecfe0dc535abae38ddbbc271200d0c19
-SHA1 (patch-ae) = 20f155c556fd06d2cf721ab0620a0c5334b6ace4
-SHA1 (patch-af) = 84faece4f23af6d51aa8a87a28da2f5056101113
-SHA1 (patch-ag) = 6b69f800da04ec83fcf40ae6b00ebacdfec193f8
-SHA1 (patch-ah) = 10fdca5e6aeb823cb5291c65ca41344c05e882ed
-SHA1 (patch-ai) = 2247d741c96c93a3140142bd797f1d2ad0fff94c
+SHA1 (wmx-8.tar.gz) = 0b5b5ea9c2939e37c99086793e079577829de692
+RMD160 (wmx-8.tar.gz) = 268ffa0010e81b74a9d539f3c1f64f2dd1493c97
+SHA512 (wmx-8.tar.gz) = 48626c9eead163fea81760d30cfffa67a79a653db236e3238118fee3849de35633efe8eb8aa79c982aaa7c6c59cc517128374d02daccc775434af9e55951f305
+Size (wmx-8.tar.gz) = 140329 bytes
+SHA1 (patch-Border.C) = c89d13ee60cb79332ce8ef993f6ff77322bfdeea
+SHA1 (patch-Client.C) = 81153be1295d8af6145ff4e98d6b12a4cff3821b
+SHA1 (patch-Config.h) = 04520e5826f4ec85b7cf449650b22c91da87351f
+SHA1 (patch-General.h) = 9f8f5ba16b3b3ba18a58a9b99bb53774819a20fb
+SHA1 (patch-Makefile.in) = a6e9aedb0a9ec9edc120e21aa1169637d4b2fbdb
+SHA1 (patch-Manager.C) = 3c081ac6b009b14103b385dd45dc3e6ca5b9fd45
+SHA1 (patch-Rotated.C) = 8fde717080dfcf78bcded94864487f46a43e0058
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Border.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Border.C Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-Border.C,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Border.C.orig 2014-11-16 19:34:19.000000000 +0000
++++ Border.C
+@@ -306,7 +306,7 @@ void Border::initialiseStatics(WindowMan
+ strcpy (pixMapPath, home);
+ strcat (pixMapPath, "/");
+ strcat (pixMapPath, CONFIG_COMMAND_MENU);
+- strcat (pixMapPath, "/border.xpm");
++ strcat (pixMapPath, "/background.xpm");
+
+ // look for background pixmap file in
+ // the users .wmx directory. It is *not*
+@@ -354,9 +354,8 @@ void Border::initialiseStatics(WindowMan
+ m_backgroundPixmap = None;
+ break;
+ }
+- } else
++ }
+ #endif
+- m_backgroundPixmap = None;
+ }
+ }
+
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Client.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Client.C Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-Client.C,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Client.C.orig 2014-11-16 19:34:19.000000000 +0000
++++ Client.C
+@@ -6,9 +6,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+
+-#if I18N
+ #include <X11/Xmu/Atoms.h>
+-#endif
+
+ // needed this to be able to use CARD32
+ #include <X11/Xmd.h>
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Config.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Config.h Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-Config.h,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Config.h.orig 2020-04-28 17:06:07.665643251 +0200
++++ Config.h 2020-04-28 17:10:09.868288671 +0200
+@@ -79,7 +79,7 @@
+
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
++#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+@@ -94,7 +94,7 @@
+ // middle-button menu
+ #define CONFIG_COMMAND_MENU ".wmx"
+ // only used if COMMAND_MENU is not found; ignored if invalid directory:
+-#define CONFIG_SYSTEM_COMMAND_MENU "/usr/local/lib/wmx/menu"
++#define CONFIG_SYSTEM_COMMAND_MENU PREFIX "/etc/wmx/menu"
+ // append screennumber to COMMAND_MENU directory;
+ // use non screen style as fallback
+ #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
+@@ -419,7 +419,9 @@
+ // command menu, and the middle mouse button (button2)
+ // acts like the left mouse normally does (list of windows)
+
++#ifndef CONFIG_GNOME_BUTTON_COMPLIANCE
+ #define CONFIG_GNOME_BUTTON_COMPLIANCE False
++#endif
+
+ #endif
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Config.h~
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Config.h~ Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-Config.h~,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Config.h.orig 2020-04-28 17:06:07.665643251 +0200
++++ Config.h 2020-04-28 17:10:09.868288671 +0200
+@@ -79,7 +79,7 @@
+
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
++#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+@@ -94,7 +94,7 @@
+ // middle-button menu
+ #define CONFIG_COMMAND_MENU ".wmx"
+ // only used if COMMAND_MENU is not found; ignored if invalid directory:
+-#define CONFIG_SYSTEM_COMMAND_MENU "/usr/local/lib/wmx/menu"
++#define CONFIG_SYSTEM_COMMAND_MENU PREFIX "/etc/wmx/menu"
+ // append screennumber to COMMAND_MENU directory;
+ // use non screen style as fallback
+ #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
+@@ -419,7 +419,9 @@
+ // command menu, and the middle mouse button (button2)
+ // acts like the left mouse normally does (list of windows)
+
++#ifndef CONFIG_GNOME_BUTTON_COMPLIANCE
+ #define CONFIG_GNOME_BUTTON_COMPLIANCE False
++#endif
+
+ #endif
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-General.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-General.h Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-General.h,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- General.h.orig 2014-11-16 19:34:19.000000000 +0000
++++ General.h
+@@ -12,7 +12,7 @@
+ #undef _POSIX_SOURCE
+ #endif
+
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ #define _POSIX_SOURCE 1
+ #endif
+
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Makefile.in Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Makefile.in.orig 2014-11-16 19:34:19.000000000 +0000
++++ Makefile.in
+@@ -12,9 +12,9 @@ LDFLAGS=@LDFLAGS@
+
+ # If your X includes are not in /usr/include/X11, add their location
+ # as a -I option here (excluding the X11 bit). If you're using I18N
+ # and Xlocale, please add -DX_LOCALE.
+ #CFLAGS = -g -O2 -I/usr/include -I/usr/openwin/include
+-CXXFLAGS=@CXXFLAGS@ @XFT_CFLAGS@ @FT_CFLAGS@ @FC_CFLAGS@ -Wall
++CXXFLAGS=@CXXFLAGS@ @XFT_CFLAGS@ @FT_CFLAGS@ @FC_CFLAGS@ -Wall -DPREFIX=\"${PREFIX}\"
+
+ OBJECTS = Border.o Buttons.o Channel.o Client.o Config.o Events.o Main.o Manager.o Menu.o Rotated.o Session.o
+
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Manager.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Manager.C Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-Manager.C,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Manager.C.orig 2014-11-16 19:34:19.000000000 +0000
++++ Manager.C
+@@ -65,6 +65,12 @@ Boolean ignoreBadWindowErrors;
+
+ implementPList(ClientList, Client);
+
++#ifdef __OpenBSD__
++extern "C" {
++ int snprintf(char *, size_t, const char *, ...);
++}
++#endif
++
+ #if CONFIG_GROUPS != False
+ implementPList(ListList, ClientList);
+ #endif
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-Rotated.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/wmx/patches/patch-Rotated.C Tue Apr 28 15:28:57 2020 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-Rotated.C,v 1.1 2020/04/28 15:28:57 nikita Exp $
+
+--- Rotated.C.orig 2014-11-16 19:34:19.000000000 +0000
++++ Rotated.C
+@@ -232,6 +232,7 @@ void XRotUnloadFont(Display *dpy, int sc
+ int ichar;
+
+ XFreeFontSet(dpy, rotfont->xfontset);
++ XFreeFont(dpy, rotfont->xfontstruct);
+
+ /* rotfont should never be referenced again ... */
+ free((char *)rotfont->name);
diff -r 8aaaf351260f -r cffe4f278502 wm/wmx/patches/patch-aa
--- a/wm/wmx/patches/patch-aa Tue Apr 28 15:25:57 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/05/05 16:13:15 fredb Exp $
-
---- Config.h.orig Wed May 24 10:48:59 2000
-+++ Config.h
-@@ -75,8 +75,8 @@
-
- // What to run to get a new window (from the "New" menu option)
- #define CONFIG_NEW_WINDOW_LABEL "New"
--//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
--#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
-+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
- #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
- // or, for example,
- //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
-@@ -91,7 +91,7 @@
- // middle-button menu
- #define CONFIG_COMMAND_MENU ".wmx"
- // only used if COMMAND_MENU is not found; ignored if invalid directory:
--#define CONFIG_SYSTEM_COMMAND_MENU "/usr/local/lib/wmx/menu"
-+#define CONFIG_SYSTEM_COMMAND_MENU PREFIX "/etc/wmx/menu"
- // append screennumber to COMMAND_MENU directory;
- // use non screen style as fallback
- #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
-@@ -373,7 +373,9 @@
- // that you are not currently on, some strange things happen.
- // (Patch due to Henri Naccache <henri%asu.edu@localhost>)
-
Home |
Main Index |
Thread Index |
Old Index