cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oroborus: update to 2.0.20, fix the build with -fno-common

Browse Source 
Also tested by Ryan Freeman, who had a similar diff.

"fine with me" sthen@
This commit is contained in:
cwen 2021-02-18 22:01:17 +00:00
parent f730fe13f1
commit 09519a09a0
7 changed files with 310 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
x11/oroborus/Makefile
View File

@ -1,21 +1,26 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:51:18 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2021/02/18 22:01:17 cwen Exp $
COMMENT= minimalistic X11 window manager
COMMENT = minimalistic X11 window manager
CATEGORIES= x11
DISTNAME= oroborus-2.0.12
DISTFILES= oroborus_2.0.12-1.tar.gz
REVISION= 0
MASTER_SITES= http://www.mguillaud.net/ports/oroborus/ \
http://matt.peterson.org/FreeBSD/ports/
HOMEPAGE= http://www.oroborus.org/
DISTNAME = oroborus_2.0.20
PKGNAME = ${DISTNAME:S/_/-/}
# GPL
PERMIT_PACKAGE= Yes
WANTLIB= ICE SM X11 Xext Xpm c
CATEGORIES = x11
CONFIGURE_STYLE=gnu
USE_GMAKE= Yes
SEPARATE_BUILD= Yes
# GPLv2
PERMIT_PACKAGE = Yes
WANTLIB += ICE SM X11 Xext Xpm c
MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/o/oroborus/} \
https://distfiles.gentoo.org/distfiles/
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
WRKDIST = ${WRKDIR}/${PKGNAME}
.include <bsd.port.mk>

4
x11/oroborus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (oroborus_2.0.12-1.tar.gz) = da6P0CzvF4e5o0iPudlw/iAyjbpb6pvLBy1ZgmRe8LE=
SIZE (oroborus_2.0.12-1.tar.gz) = 236581
SHA256 (oroborus_2.0.20.tar.gz) = UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=
SIZE (oroborus_2.0.20.tar.gz) = 335099

16
x11/oroborus/patches/patch-src_hints_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_hints_c,v 1.1 2021/02/18 22:01:17 cwen Exp $
Fix the build with -fno-common
Index: src/hints.c
--- src/hints.c.orig
+++ src/hints.c
@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer,
win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
gnome_panel_desktop_area;
Atom net_atoms[NET_ATOM_COUNT];
-Display *dpy;
+extern Display *dpy;
void
initHints (Display * d)

16
x11/oroborus/patches/patch-src_keyboard_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_keyboard_c,v 1.1 2021/02/18 22:01:17 cwen Exp $
Fix the build with -fno-common
Index: src/keyboard.c
--- src/keyboard.c.orig
+++ src/keyboard.c
@@ -35,6 +35,8 @@
#include <stdio.h>
#endif
+int NumLockMask, CapsLockMask, ScrollLockMask;
+
void
parseKeyString (Display * dpy, MyKey * key, char *str)
{

16
x11/oroborus/patches/patch-src_keyboard_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_keyboard_h,v 1.1 2021/02/18 22:01:17 cwen Exp $
Fix the build with -fno-common
Index: src/keyboard.h
--- src/keyboard.h.orig
+++ src/keyboard.h
@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
void ungrabKeys (Display *, Window);
void init_keyboard (Display * dpy);
-int NumLockMask, CapsLockMask, ScrollLockMask;
+extern int NumLockMask, CapsLockMask, ScrollLockMask;
#endif /* __KEYBOARD_H */

13
x11/oroborus/patches/patch-src_oroborus_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_oroborus_c,v 1.1 2021/02/18 22:01:17 cwen Exp $
Index: src/oroborus.c
--- src/oroborus.c.orig
+++ src/oroborus.c
@@ -29,6 +29,7 @@
#include <X11/extensions/shape.h>
#include <X11/Xlocale.h>
#include <X11/xpm.h>
+#include <signal.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

229
x11/oroborus/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/18 15:54:56 naddy Exp $
bin/oroborus
@comment $OpenBSD: PLIST,v 1.2 2021/02/18 22:01:17 cwen Exp $
@bin bin/oroborus
@man man/man1/oroborus.1
@man man/man5/oroborusrc.5
share/oroborus/
@ -14,6 +14,120 @@ share/oroborus/schemes/red
share/oroborus/schemes/rose
share/oroborus/schemes/windows
share/oroborus/themes/
share/oroborus/themes/Elberg_Blue/
share/oroborus/themes/Elberg_Blue/bottom-active.xpm
share/oroborus/themes/Elberg_Blue/bottom-inactive.xpm
share/oroborus/themes/Elberg_Blue/bottom-left-active.xpm
share/oroborus/themes/Elberg_Blue/bottom-left-inactive.xpm
share/oroborus/themes/Elberg_Blue/bottom-right-active.xpm
share/oroborus/themes/Elberg_Blue/bottom-right-inactive.xpm
share/oroborus/themes/Elberg_Blue/close-active.xpm
share/oroborus/themes/Elberg_Blue/close-inactive.xpm
share/oroborus/themes/Elberg_Blue/close-pressed.xpm
share/oroborus/themes/Elberg_Blue/hide-active.xpm
share/oroborus/themes/Elberg_Blue/hide-inactive.xpm
share/oroborus/themes/Elberg_Blue/hide-pressed.xpm
share/oroborus/themes/Elberg_Blue/left-active.xpm
share/oroborus/themes/Elberg_Blue/left-inactive.xpm
share/oroborus/themes/Elberg_Blue/maximize-active.xpm
share/oroborus/themes/Elberg_Blue/maximize-inactive.xpm
share/oroborus/themes/Elberg_Blue/maximize-pressed.xpm
share/oroborus/themes/Elberg_Blue/right-active.xpm
share/oroborus/themes/Elberg_Blue/right-inactive.xpm
share/oroborus/themes/Elberg_Blue/shade-active.xpm
share/oroborus/themes/Elberg_Blue/shade-inactive.xpm
share/oroborus/themes/Elberg_Blue/shade-pressed.xpm
share/oroborus/themes/Elberg_Blue/themerc
share/oroborus/themes/Elberg_Blue/title-1-active.xpm
share/oroborus/themes/Elberg_Blue/title-1-inactive.xpm
share/oroborus/themes/Elberg_Blue/title-2-active.xpm
share/oroborus/themes/Elberg_Blue/title-2-inactive.xpm
share/oroborus/themes/Elberg_Blue/title-3-active.xpm
share/oroborus/themes/Elberg_Blue/title-3-inactive.xpm
share/oroborus/themes/Elberg_Blue/title-4-active.xpm
share/oroborus/themes/Elberg_Blue/title-4-inactive.xpm
share/oroborus/themes/Elberg_Blue/title-5-active.xpm
share/oroborus/themes/Elberg_Blue/title-5-inactive.xpm
share/oroborus/themes/Elberg_Blue/top-left-active.xpm
share/oroborus/themes/Elberg_Blue/top-left-inactive.xpm
share/oroborus/themes/Elberg_Blue/top-right-active.xpm
share/oroborus/themes/Elberg_Blue/top-right-inactive.xpm
share/oroborus/themes/Elberg_Green/
share/oroborus/themes/Elberg_Green/bottom-active.xpm
share/oroborus/themes/Elberg_Green/bottom-inactive.xpm
share/oroborus/themes/Elberg_Green/bottom-left-active.xpm
share/oroborus/themes/Elberg_Green/bottom-left-inactive.xpm
share/oroborus/themes/Elberg_Green/bottom-right-active.xpm
share/oroborus/themes/Elberg_Green/bottom-right-inactive.xpm
share/oroborus/themes/Elberg_Green/close-active.xpm
share/oroborus/themes/Elberg_Green/close-inactive.xpm
share/oroborus/themes/Elberg_Green/close-pressed.xpm
share/oroborus/themes/Elberg_Green/hide-active.xpm
share/oroborus/themes/Elberg_Green/hide-inactive.xpm
share/oroborus/themes/Elberg_Green/hide-pressed.xpm
share/oroborus/themes/Elberg_Green/left-active.xpm
share/oroborus/themes/Elberg_Green/left-inactive.xpm
share/oroborus/themes/Elberg_Green/maximize-active.xpm
share/oroborus/themes/Elberg_Green/maximize-inactive.xpm
share/oroborus/themes/Elberg_Green/maximize-pressed.xpm
share/oroborus/themes/Elberg_Green/right-active.xpm
share/oroborus/themes/Elberg_Green/right-inactive.xpm
share/oroborus/themes/Elberg_Green/shade-active.xpm
share/oroborus/themes/Elberg_Green/shade-inactive.xpm
share/oroborus/themes/Elberg_Green/shade-pressed.xpm
share/oroborus/themes/Elberg_Green/themerc
share/oroborus/themes/Elberg_Green/title-1-active.xpm
share/oroborus/themes/Elberg_Green/title-1-inactive.xpm
share/oroborus/themes/Elberg_Green/title-2-active.xpm
share/oroborus/themes/Elberg_Green/title-2-inactive.xpm
share/oroborus/themes/Elberg_Green/title-3-active.xpm
share/oroborus/themes/Elberg_Green/title-3-inactive.xpm
share/oroborus/themes/Elberg_Green/title-4-active.xpm
share/oroborus/themes/Elberg_Green/title-4-inactive.xpm
share/oroborus/themes/Elberg_Green/title-5-active.xpm
share/oroborus/themes/Elberg_Green/title-5-inactive.xpm
share/oroborus/themes/Elberg_Green/top-left-active.xpm
share/oroborus/themes/Elberg_Green/top-left-inactive.xpm
share/oroborus/themes/Elberg_Green/top-right-active.xpm
share/oroborus/themes/Elberg_Green/top-right-inactive.xpm
share/oroborus/themes/Elberg_Red/
share/oroborus/themes/Elberg_Red/bottom-active.xpm
share/oroborus/themes/Elberg_Red/bottom-inactive.xpm
share/oroborus/themes/Elberg_Red/bottom-left-active.xpm
share/oroborus/themes/Elberg_Red/bottom-left-inactive.xpm
share/oroborus/themes/Elberg_Red/bottom-right-active.xpm
share/oroborus/themes/Elberg_Red/bottom-right-inactive.xpm
share/oroborus/themes/Elberg_Red/close-active.xpm
share/oroborus/themes/Elberg_Red/close-inactive.xpm
share/oroborus/themes/Elberg_Red/close-pressed.xpm
share/oroborus/themes/Elberg_Red/hide-active.xpm
share/oroborus/themes/Elberg_Red/hide-inactive.xpm
share/oroborus/themes/Elberg_Red/hide-pressed.xpm
share/oroborus/themes/Elberg_Red/left-active.xpm
share/oroborus/themes/Elberg_Red/left-inactive.xpm
share/oroborus/themes/Elberg_Red/maximize-active.xpm
share/oroborus/themes/Elberg_Red/maximize-inactive.xpm
share/oroborus/themes/Elberg_Red/maximize-pressed.xpm
share/oroborus/themes/Elberg_Red/right-active.xpm
share/oroborus/themes/Elberg_Red/right-inactive.xpm
share/oroborus/themes/Elberg_Red/shade-active.xpm
share/oroborus/themes/Elberg_Red/shade-inactive.xpm
share/oroborus/themes/Elberg_Red/shade-pressed.xpm
share/oroborus/themes/Elberg_Red/themerc
share/oroborus/themes/Elberg_Red/title-1-active.xpm
share/oroborus/themes/Elberg_Red/title-1-inactive.xpm
share/oroborus/themes/Elberg_Red/title-2-active.xpm
share/oroborus/themes/Elberg_Red/title-2-inactive.xpm
share/oroborus/themes/Elberg_Red/title-3-active.xpm
share/oroborus/themes/Elberg_Red/title-3-inactive.xpm
share/oroborus/themes/Elberg_Red/title-4-active.xpm
share/oroborus/themes/Elberg_Red/title-4-inactive.xpm
share/oroborus/themes/Elberg_Red/title-5-active.xpm
share/oroborus/themes/Elberg_Red/title-5-inactive.xpm
share/oroborus/themes/Elberg_Red/top-left-active.xpm
share/oroborus/themes/Elberg_Red/top-left-inactive.xpm
share/oroborus/themes/Elberg_Red/top-right-active.xpm
share/oroborus/themes/Elberg_Red/top-right-inactive.xpm
share/oroborus/themes/QNX/
share/oroborus/themes/QNX/bottom-active.xpm
share/oroborus/themes/QNX/bottom-inactive.xpm
@ -122,6 +236,44 @@ share/oroborus/themes/beos/top-left-active.xpm
share/oroborus/themes/beos/top-left-inactive.xpm
share/oroborus/themes/beos/top-right-active.xpm
share/oroborus/themes/beos/top-right-inactive.xpm
share/oroborus/themes/bluecurve/
share/oroborus/themes/bluecurve/bottom-active.xpm
share/oroborus/themes/bluecurve/bottom-inactive.xpm
share/oroborus/themes/bluecurve/bottom-left-active.xpm
share/oroborus/themes/bluecurve/bottom-left-inactive.xpm
share/oroborus/themes/bluecurve/bottom-right-active.xpm
share/oroborus/themes/bluecurve/bottom-right-inactive.xpm
share/oroborus/themes/bluecurve/close-active.xpm
share/oroborus/themes/bluecurve/close-inactive.xpm
share/oroborus/themes/bluecurve/close-pressed.xpm
share/oroborus/themes/bluecurve/hide-active.xpm
share/oroborus/themes/bluecurve/hide-inactive.xpm
share/oroborus/themes/bluecurve/hide-pressed.xpm
share/oroborus/themes/bluecurve/left-active.xpm
share/oroborus/themes/bluecurve/left-inactive.xpm
share/oroborus/themes/bluecurve/maximize-active.xpm
share/oroborus/themes/bluecurve/maximize-inactive.xpm
share/oroborus/themes/bluecurve/maximize-pressed.xpm
share/oroborus/themes/bluecurve/right-active.xpm
share/oroborus/themes/bluecurve/right-inactive.xpm
share/oroborus/themes/bluecurve/shade-active.xpm
share/oroborus/themes/bluecurve/shade-inactive.xpm
share/oroborus/themes/bluecurve/shade-pressed.xpm
share/oroborus/themes/bluecurve/themerc
share/oroborus/themes/bluecurve/title-1-active.xpm
share/oroborus/themes/bluecurve/title-1-inactive.xpm
share/oroborus/themes/bluecurve/title-2-active.xpm
share/oroborus/themes/bluecurve/title-2-inactive.xpm
share/oroborus/themes/bluecurve/title-3-active.xpm
share/oroborus/themes/bluecurve/title-3-inactive.xpm
share/oroborus/themes/bluecurve/title-4-active.xpm
share/oroborus/themes/bluecurve/title-4-inactive.xpm
share/oroborus/themes/bluecurve/title-5-active.xpm
share/oroborus/themes/bluecurve/title-5-inactive.xpm
share/oroborus/themes/bluecurve/top-left-active.xpm
share/oroborus/themes/bluecurve/top-left-inactive.xpm
share/oroborus/themes/bluecurve/top-right-active.xpm
share/oroborus/themes/bluecurve/top-right-inactive.xpm
share/oroborus/themes/cruxish/
share/oroborus/themes/cruxish/bottom-active.xpm
share/oroborus/themes/cruxish/bottom-inactive.xpm
@ -160,6 +312,44 @@ share/oroborus/themes/cruxish/top-left-active.xpm
share/oroborus/themes/cruxish/top-left-inactive.xpm
share/oroborus/themes/cruxish/top-right-active.xpm
share/oroborus/themes/cruxish/top-right-inactive.xpm
share/oroborus/themes/defold/
share/oroborus/themes/defold/bottom-active.xpm
share/oroborus/themes/defold/bottom-inactive.xpm
share/oroborus/themes/defold/bottom-left-active.xpm
share/oroborus/themes/defold/bottom-left-inactive.xpm
share/oroborus/themes/defold/bottom-right-active.xpm
share/oroborus/themes/defold/bottom-right-inactive.xpm
share/oroborus/themes/defold/close-active.xpm
share/oroborus/themes/defold/close-inactive.xpm
share/oroborus/themes/defold/close-pressed.xpm
share/oroborus/themes/defold/hide-active.xpm
share/oroborus/themes/defold/hide-inactive.xpm
share/oroborus/themes/defold/hide-pressed.xpm
share/oroborus/themes/defold/left-active.xpm
share/oroborus/themes/defold/left-inactive.xpm
share/oroborus/themes/defold/maximize-active.xpm
share/oroborus/themes/defold/maximize-inactive.xpm
share/oroborus/themes/defold/maximize-pressed.xpm
share/oroborus/themes/defold/right-active.xpm
share/oroborus/themes/defold/right-inactive.xpm
share/oroborus/themes/defold/shade-active.xpm
share/oroborus/themes/defold/shade-inactive.xpm
share/oroborus/themes/defold/shade-pressed.xpm
share/oroborus/themes/defold/themerc
share/oroborus/themes/defold/title-1-active.xpm
share/oroborus/themes/defold/title-1-inactive.xpm
share/oroborus/themes/defold/title-2-active.xpm
share/oroborus/themes/defold/title-2-inactive.xpm
share/oroborus/themes/defold/title-3-active.xpm
share/oroborus/themes/defold/title-3-inactive.xpm
share/oroborus/themes/defold/title-4-active.xpm
share/oroborus/themes/defold/title-4-inactive.xpm
share/oroborus/themes/defold/title-5-active.xpm
share/oroborus/themes/defold/title-5-inactive.xpm
share/oroborus/themes/defold/top-left-active.xpm
share/oroborus/themes/defold/top-left-inactive.xpm
share/oroborus/themes/defold/top-right-active.xpm
share/oroborus/themes/defold/top-right-inactive.xpm
share/oroborus/themes/e017/
share/oroborus/themes/e017/bottom-active.xpm
share/oroborus/themes/e017/bottom-inactive.xpm
@ -239,6 +429,41 @@ share/oroborus/themes/gorillaworm/top-left-active.xpm
share/oroborus/themes/gorillaworm/top-left-inactive.xpm
share/oroborus/themes/gorillaworm/top-right-active.xpm
share/oroborus/themes/gorillaworm/top-right-inactive.xpm
share/oroborus/themes/mkultra/
share/oroborus/themes/mkultra/bottom-active.xpm
share/oroborus/themes/mkultra/bottom-inactive.xpm
share/oroborus/themes/mkultra/bottom-left-active.xpm
share/oroborus/themes/mkultra/bottom-left-inactive.xpm
share/oroborus/themes/mkultra/bottom-right-active.xpm
share/oroborus/themes/mkultra/bottom-right-inactive.xpm
share/oroborus/themes/mkultra/close-active.xpm
share/oroborus/themes/mkultra/close-inactive.xpm
share/oroborus/themes/mkultra/close-pressed.xpm
share/oroborus/themes/mkultra/hide-active.xpm
share/oroborus/themes/mkultra/hide-inactive.xpm
share/oroborus/themes/mkultra/hide-pressed.xpm
share/oroborus/themes/mkultra/left-active.xpm
share/oroborus/themes/mkultra/left-inactive.xpm
share/oroborus/themes/mkultra/maximize-active.xpm
share/oroborus/themes/mkultra/maximize-inactive.xpm
share/oroborus/themes/mkultra/maximize-pressed.xpm
share/oroborus/themes/mkultra/right-active.xpm
share/oroborus/themes/mkultra/right-inactive.xpm
share/oroborus/themes/mkultra/themerc
share/oroborus/themes/mkultra/title-1-active.xpm
share/oroborus/themes/mkultra/title-1-inactive.xpm
share/oroborus/themes/mkultra/title-2-active.xpm
share/oroborus/themes/mkultra/title-2-inactive.xpm
share/oroborus/themes/mkultra/title-3-active.xpm
share/oroborus/themes/mkultra/title-3-inactive.xpm
share/oroborus/themes/mkultra/title-4-active.xpm
share/oroborus/themes/mkultra/title-4-inactive.xpm
share/oroborus/themes/mkultra/title-5-active.xpm
share/oroborus/themes/mkultra/title-5-inactive.xpm
share/oroborus/themes/mkultra/top-left-active.xpm
share/oroborus/themes/mkultra/top-left-inactive.xpm
share/oroborus/themes/mkultra/top-right-active.xpm
share/oroborus/themes/mkultra/top-right-inactive.xpm
share/oroborus/themes/next/
share/oroborus/themes/next/bottom-active.xpm
share/oroborus/themes/next/bottom-inactive.xpm