Update to openbox-3.6.1

ok benoit@ (MAINTAINER)
This commit is contained in:
dcoppa 2015-09-25 09:49:52 +00:00
parent 4aef5be4b1
commit 0331d97835
7 changed files with 12 additions and 98 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.73 2015/04/21 18:51:26 sthen Exp $
# $OpenBSD: Makefile,v 1.74 2015/09/25 09:49:52 dcoppa Exp $
COMMENT = small, fast & usable window manager
V = 3.5.2
REVISION = 1
V = 3.6.1
DISTNAME = openbox-${V}
SHARED_LIBS += obrender 11.0 # 29.1
SHARED_LIBS += obt 1.0 # 2.1
SHARED_LIBS += obrender 12.0 # 32.0
SHARED_LIBS += obt 1.1 # 2.2
CATEGORIES = x11

View File

@ -1,2 +1,2 @@
SHA256 (openbox-3.5.2.tar.gz) = Eo+07xH4P27bFoXPwE9EoWpTIggvxRn518rIT8ZYrzM=
SIZE (openbox-3.5.2.tar.gz) = 972751
SHA256 (openbox-3.6.1.tar.gz) = i0rAdgAYx3wARPqwak8MUQuofq6TTZmDsQh4SDvefvc=
SIZE (openbox-3.6.1.tar.gz) = 962665

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-obrender_test_c,v 1.1 2013/10/08 11:18:57 dcoppa Exp $
commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
Author: Ian Zimmerman <itz@buug.org>
Date: Sat Aug 17 15:13:05 2013 -0700
Fix gcc warnings
--- obrender/test.c.orig Mon Aug 12 03:33:24 2013
+++ obrender/test.c Tue Oct 8 07:44:53 2013
@@ -46,7 +46,6 @@ gint main()
RrAppearance *look;
int done;
- Window root;
XEvent report;
gint h = 500, w = 500;
@@ -64,7 +63,6 @@ gint main()
0); /* attributes */
XMapWindow(ob_display, win);
XSelectInput(ob_display, win, ExposureMask | StructureNotifyMask);
- root = RootWindow (ob_display, DefaultScreen (ob_display));
inst = RrInstanceNew(ob_display, ob_screen);
look = RrAppearanceNew(inst, 0);

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-openbox_client_c,v 1.1 2013/10/08 11:18:57 dcoppa Exp $
commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
Author: Ian Zimmerman <itz@buug.org>
Date: Sat Aug 17 15:13:05 2013 -0700
Fix gcc warnings
--- openbox/client.c.orig Mon Aug 12 03:33:24 2013
+++ openbox/client.c Tue Oct 8 07:44:53 2013
@@ -218,7 +218,7 @@ void client_manage(Window window, ObPrompt *prompt)
Time launch_time;
guint32 user_time;
gboolean obplaced;
- gulong ignore_start;
+ gulong ignore_start = FALSE;
ob_debug("Managing window: 0x%lx", window);

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-openbox_menuframe_c,v 1.1 2013/10/08 11:18:58 dcoppa Exp $
commit 0afb5b28c63651c1e598bbd4d88c60ac0b478567
Author: Tom Sires <tsires@uno.edu>
Date: Tue Aug 27 08:02:31 2013 -0500
Fix a typo causing submenuShowDelay to be ignored (Bug 6019)
--- openbox/menuframe.c.orig Mon Aug 12 03:33:24 2013
+++ openbox/menuframe.c Tue Oct 8 07:39:35 2013
@@ -1242,9 +1242,9 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryF
if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
/* only show if the submenu isn't already showing */
if (oldchild_entry != self->selected) {
- if (immediate || config_submenu_hide_delay == 0)
+ if (immediate || config_submenu_show_delay == 0)
menu_entry_frame_show_submenu(self->selected);
- else if (config_submenu_hide_delay > 0) {
+ else if (config_submenu_show_delay > 0) {
if (submenu_show_timer)
g_source_remove(submenu_show_timer);
submenu_show_timer =

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-openbox_screen_c,v 1.1 2013/10/08 11:18:58 dcoppa Exp $
commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
Author: Ian Zimmerman <itz@buug.org>
Date: Sat Aug 17 15:13:05 2013 -0700
Fix gcc warnings
--- openbox/screen.c.orig Mon Aug 12 03:33:24 2013
+++ openbox/screen.c Tue Oct 8 07:44:53 2013
@@ -1327,8 +1327,9 @@ typedef struct {
static void get_xinerama_screens(Rect **xin_areas, guint *nxin)
{
guint i;
- gint n, l, r, t, b;
+ gint l, r, t, b;
#ifdef XINERAMA
+ gint n;
XineramaScreenInfo *info;
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.28 2013/10/08 11:18:58 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.29 2015/09/25 09:49:52 dcoppa Exp $
@bin bin/gdm-control
@bin bin/gnome-panel-control
@bin bin/obxprop
@ -36,8 +36,8 @@ lib/libobrender.la
lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-${API_V}.pc
lib/pkgconfig/obt-${API_V}.pc
lib/pkgconfig/obrender-3.5.pc
lib/pkgconfig/obt-3.5.pc
libexec/openbox-autostart
libexec/openbox-xdg-autostart
@man man/man1/obxprop.1
@ -97,6 +97,9 @@ share/locale/et/LC_MESSAGES/openbox.mo
share/locale/eu/LC_MESSAGES/openbox.mo
share/locale/fi/LC_MESSAGES/openbox.mo
share/locale/fr/LC_MESSAGES/openbox.mo
share/locale/gl_ES/
share/locale/gl_ES/LC_MESSAGES/
share/locale/gl_ES/LC_MESSAGES/openbox.mo
share/locale/he/LC_MESSAGES/openbox.mo
share/locale/hr/LC_MESSAGES/openbox.mo
share/locale/hu/LC_MESSAGES/openbox.mo