pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add FrankenWM 1.0.22, packaged by pin
Module Name: pkgsrc-wip
Committed By: Maya Rashish <maya%NetBSD.org@localhost>
Pushed By: coypu
Date: Thu Jul 23 11:55:59 2020 +0300
Changeset: f5837720b64a3b2fed1fddbd1ba3a46f669f6a40
Added Files:
frankenwm/DESCR
frankenwm/Makefile
frankenwm/PLIST
frankenwm/distinfo
frankenwm/patches/patch-Makefile
frankenwm/patches/patch-frankenwm.c
Log Message:
Add FrankenWM 1.0.22, packaged by pin
Changes since pin version:
Use pkgconfig instead of replacing hard-coded /usr/X11R6 with
${X11BASE}.
This would be better if we had defined X11BASE to something so it could be
built outside of pkgsrc/netbsd, but pkgconfig is even better.
Fix compiler warnings. Don't do a weird include mid-file and don't
redefine parts of Xlib.h.
---
"monsterwm's bastard child" or "not the wm your desktop needs, but the one
it deserves".
FrankenWM is a dynamic tiling WM (comparable to dwm or Awesome), featuring the
v-stack, b-stack, grid, fibonacci, dualstack, equal and monocle layouts out of
the box. If you want to, you can add gaps between the windows as well.
It was once based on monsterwm but has undergone many greater changes including
adding pieces from other WMs (hence the name) and porting all sorts of stuff
from Xlib to XCB. Many of the original monsterwm patches have been ported as
well.
All settings must be set at compile time by editing `config.h` and it does not
feature a status bar (but supports leaving preconfigured space for one).
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f5837720b64a3b2fed1fddbd1ba3a46f669f6a40
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
frankenwm/DESCR | 14 +++++++++++++
frankenwm/Makefile | 28 ++++++++++++++++++++++++++
frankenwm/PLIST | 3 +++
frankenwm/distinfo | 8 ++++++++
frankenwm/patches/patch-Makefile | 19 ++++++++++++++++++
frankenwm/patches/patch-frankenwm.c | 40 +++++++++++++++++++++++++++++++++++++
6 files changed, 112 insertions(+)
diffs:
diff --git a/frankenwm/DESCR b/frankenwm/DESCR
new file mode 100644
index 0000000000..9f1aabae37
--- /dev/null
+++ b/frankenwm/DESCR
@@ -0,0 +1,14 @@
+FrankenWM
+"monsterwm's bastard child" or "not the wm your desktop needs, but the one
+it deserves".
+FrankenWM is a dynamic tiling WM (comparable to dwm or Awesome), featuring the
+v-stack, b-stack, grid, fibonacci, dualstack, equal and monocle layouts out of
+the box. If you want to, you can add gaps between the windows as well.
+
+It was once based on monsterwm but has undergone many greater changes including
+adding pieces from other WMs (hence the name) and porting all sorts of stuff
+from Xlib to XCB. Many of the original monsterwm patches have been ported as
+well.
+
+All settings must be set at compile time by editing `config.h` and it does not
+feature a status bar (but supports leaving preconfigured space for one).
diff --git a/frankenwm/Makefile b/frankenwm/Makefile
new file mode 100644
index 0000000000..7b948a221f
--- /dev/null
+++ b/frankenwm/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD$
+
+DISTNAME= FrankenWM-1.0.22
+PKGNAME= frankenwm-1.0.22
+CATEGORIES= wm
+MASTER_SITES= ${MASTER_SITE_GITHUB:=sulami/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= pin%NetBSD.org@localhost
+HOMEPAGE= https://github.com/sulami/FrankenWM/
+COMMENT= Dynamic tiling window manager
+LICENSE= mit
+
+WRKSRC= ${WRKDIR}/FrankenWM-1.0.22
+USE_TOOLS+= pkg-config gmake
+USE_LANGUAGES= c99
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+MAKE_ENV+= MANPREFIX=${PREFIX}/${PKGMANDIR}
+
+DEPENDS+= dmenu-[0-9]*:../../x11/dmenu
+
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/frankenwm/PLIST b/frankenwm/PLIST
new file mode 100644
index 0000000000..2fe0bd8694
--- /dev/null
+++ b/frankenwm/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/frankenwm
+man/man1/frankenwm.1
diff --git a/frankenwm/distinfo b/frankenwm/distinfo
new file mode 100644
index 0000000000..222cd40c9d
--- /dev/null
+++ b/frankenwm/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (FrankenWM-1.0.22.tar.gz) = 4fe6bf6ba9e726696ff92fe40e80d98c1dbf43a3
+RMD160 (FrankenWM-1.0.22.tar.gz) = 8574b5ec4308fde772ba0d8d8c7ab223b075dd44
+SHA512 (FrankenWM-1.0.22.tar.gz) = bea5cbc94b34f3d55c7b9721906b7599fe3e8cfb93ce5f4727fc2f699db716eaa419865d611e4a68e9a63916b2c3a41196653d660b8672149e085d4c51d1cf83
+Size (FrankenWM-1.0.22.tar.gz) = 35588 bytes
+SHA1 (patch-Makefile) = 3ce05d6fe097aa80efbd2447c62dc7ab8bc35f73
+SHA1 (patch-frankenwm.c) = 4af49a8aef3694b5b8beb20a2849617ce5d174ac
diff --git a/frankenwm/patches/patch-Makefile b/frankenwm/patches/patch-Makefile
new file mode 100644
index 0000000000..762acbe301
--- /dev/null
+++ b/frankenwm/patches/patch-Makefile
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Allow custom man location
+Allow discovery of x11-base
+
+--- Makefile.orig 2020-05-21 08:59:23.000000000 +0000
++++ Makefile
+@@ -2,9 +2,9 @@ WMNAME = frankenwm
+
+ PREFIX ?= /usr/local
+ BINDIR ?= ${PREFIX}/bin
+-MANPREFIX = ${PREFIX}/share/man
++MANPREFIX ?= ${PREFIX}/share/man
+
+-INCS = -I. -I${PREFIX}/include -I/usr/X11R6/include
++INCS = -I. `pkg-config --cflags xcb xcb-aux xcb-icccm xcb-keysyms xcb-ewmh`
+ LIBS = -lc -lX11 `pkg-config --libs xcb xcb-aux xcb-icccm xcb-keysyms xcb-ewmh`
+
+ CFLAGS += -std=c99 -pedantic -Wall -Wextra ${INCS} ${CPPFLAGS}
diff --git a/frankenwm/patches/patch-frankenwm.c b/frankenwm/patches/patch-frankenwm.c
new file mode 100644
index 0000000000..4649b42a93
--- /dev/null
+++ b/frankenwm/patches/patch-frankenwm.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+Move include into a reasonable place.
+Don't re-define things that are already in Xlib.h
+
+--- frankenwm.c.orig 2020-05-21 08:59:23.000000000 +0000
++++ frankenwm.c
+@@ -10,6 +10,7 @@
+ #include <signal.h>
+ #include <regex.h>
+ #include <sys/wait.h>
++#include <X11/Xlib.h>
+ #include <X11/keysym.h>
+ #include <xcb/xcb.h>
+ #include <xcb/xcb_atom.h>
+@@ -27,16 +28,6 @@
+ # define DEBUGP(x, ...);
+ #endif
+
+-/* upstream compatility */
+-#define True true
+-#define False false
+-#define Mod1Mask XCB_MOD_MASK_1
+-#define Mod4Mask XCB_MOD_MASK_4
+-#define ShiftMask XCB_MOD_MASK_SHIFT
+-#define ControlMask XCB_MOD_MASK_CONTROL
+-#define Button1 XCB_BUTTON_INDEX_1
+-#define Button2 XCB_BUTTON_INDEX_2
+-#define Button3 XCB_BUTTON_INDEX_3
+ #define XCB_MOVE_RESIZE XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT
+ #define XCB_MOVE XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
+ #define XCB_RESIZE XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT
+@@ -3582,7 +3573,6 @@ void xerror(xcb_generic_event_t *e)
+
+ static void ungrab_focus(void)
+ {
+-#include <X11/Xlib.h>
+ Display * dpy;
+
+
Home |
Main Index |
Thread Index |
Old Index