Update to openbox-3.5.2.
Bump SHARED_LIBS (checked with abi-compliance-checker).
Fix LIB_DEPENDS and WANTLIB.
Merge pkg/PFRAG.shared into pkg/PLIST.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 Makefile
--- Makefile 31 May 2013 15:35:14 -0000 1.70
+++ Makefile 8 Oct 2013 07:48:34 -0000
@@ -2,11 +2,10 @@
COMMENT = small, fast & usable window manager
-V = 3.5.0
+V = 3.5.2
DISTNAME = openbox-${V}
-REVISION = 3
-SHARED_LIBS += obt 0.0 # 0.1
-SHARED_LIBS += obrender 10.0 # 27.1
+SHARED_LIBS += obrender 11.0 # 29.1
+SHARED_LIBS += obt 1.0 # 2.1
CATEGORIES = x11
@@ -18,11 +17,13 @@ MAINTAINER = Benoit Lecocq <benoit@openb
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ICE Imlib2 SM X11 X11-xcb Xau Xcursor Xext Xfixes Xft
-WANTLIB += Xinerama Xrandr Xrender c expat ffi fontconfig freetype
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 harfbuzz
-WANTLIB += m pango-1.0 pangoft2-1.0 pangoxft-1.0
-WANTLIB += pcre pthread startup-notification-1 xcb xcb-aux xml2
-WANTLIB += z
+WANTLIB += Xinerama Xrandr Xrender c cairo croco-0.6 expat ffi
+WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangoxft-1.0
+WANTLIB += pcre pixman-1 png pthread pthread-stubs rsvg-2
+WANTLIB += startup-notification-1 xcb xcb-aux xcb-render xcb-shm
+WANTLIB += xml2 z
MASTER_SITES = ${HOMEPAGE}dist/openbox/
@@ -34,7 +35,8 @@ RUN_DEPENDS = devel/py-xdg \
LIB_DEPENDS += devel/pango \
devel/startup-notification \
graphics/imlib2 \
- textproc/libxml
+ textproc/libxml \
+ x11/gnome/librsvg
FAKE_FLAGS = sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/openbox/distinfo,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 distinfo
--- distinfo 23 Oct 2012 14:30:56 -0000 1.31
+++ distinfo 8 Oct 2013 07:48:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (openbox-3.5.0.tar.gz) = b6kAFlMLOqYQLiVAeUYZd0OTmFMfsj5+wHb/LBQP6go=
-SIZE (openbox-3.5.0.tar.gz) = 911834
+SHA256 (openbox-3.5.2.tar.gz) = Eo+07xH4P27bFoXPwE9EoWpTIggvxRn518rIT8ZYrzM=
+SIZE (openbox-3.5.2.tar.gz) = 972751
Index: patches/patch-obrender_test_c
===================================================================
RCS file: patches/patch-obrender_test_c
diff -N patches/patch-obrender_test_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-obrender_test_c 8 Oct 2013 07:48:34 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
+Author: Ian Zimmerman <i...@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);
Index: patches/patch-obt_xml_c
===================================================================
RCS file: /cvs/ports/x11/openbox/patches/patch-obt_xml_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-obt_xml_c
--- patches/patch-obt_xml_c 29 May 2012 15:52:08 -0000 1.1
+++ patches/patch-obt_xml_c 8 Oct 2013 07:48:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-obt_xml_c,v 1.1 2012/05/29 15:52:08 fgsch Exp $
---- obt/xml.c.orig Tue May 29 01:49:56 2012
-+++ obt/xml.c Tue May 29 01:51:19 2012
-@@ -129,6 +129,8 @@ static gboolean load_file(ObtXmlInst *i,
+--- obt/xml.c.orig Mon Aug 12 03:33:24 2013
++++ obt/xml.c Mon Oct 7 18:29:46 2013
+@@ -146,6 +146,8 @@ static gboolean load_file(ObtXmlInst *i,
if (!domain && !filename) /* given a full path to the file */
path = g_strdup(it->data);
Index: patches/patch-openbox_client_c
===================================================================
RCS file: patches/patch-openbox_client_c
diff -N patches/patch-openbox_client_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-openbox_client_c 8 Oct 2013 07:48:34 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
+Author: Ian Zimmerman <i...@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);
+
Index: patches/patch-openbox_menuframe_c
===================================================================
RCS file: patches/patch-openbox_menuframe_c
diff -N patches/patch-openbox_menuframe_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-openbox_menuframe_c 8 Oct 2013 07:48:34 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+commit 0afb5b28c63651c1e598bbd4d88c60ac0b478567
+Author: Tom Sires <tsi...@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 =
Index: patches/patch-openbox_moveresize_c
===================================================================
RCS file: /cvs/ports/x11/openbox/patches/patch-openbox_moveresize_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-openbox_moveresize_c
--- patches/patch-openbox_moveresize_c 23 Oct 2012 14:30:56 -0000 1.1
+++ patches/patch-openbox_moveresize_c 8 Oct 2013 07:48:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-openbox_moveresize_c,v 1.1 2012/10/23 14:30:56 gonzalo Exp $
---- openbox/moveresize.c.orig Wed Oct 10 17:27:34 2012
-+++ openbox/moveresize.c Wed Oct 10 17:29:12 2012
-@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
+--- openbox/moveresize.c.orig Mon Aug 12 03:33:24 2013
++++ openbox/moveresize.c Mon Oct 7 18:29:46 2013
+@@ -330,6 +330,16 @@ void moveresize_end(gboolean cancel)
#endif
}
Index: patches/patch-openbox_screen_c
===================================================================
RCS file: patches/patch-openbox_screen_c
diff -N patches/patch-openbox_screen_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-openbox_screen_c 8 Oct 2013 07:48:34 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+commit 9750e5cea8d8cdab2b8b988a8c5d6392b0dbeae8
+Author: Ian Zimmerman <i...@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
+
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 2 Nov 2011 19:12:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2011/11/02 19:12:01 jasper Exp $
-@lib lib/libobrender.so.${LIBobrender_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- pkg/PLIST 11 Nov 2011 10:59:22 -0000 1.27
+++ pkg/PLIST 8 Oct 2013 07:48:34 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.27 2011/11/11 10:59:22 benoit Exp $
-%%SHARED%%
@bin bin/gdm-control
@bin bin/gnome-panel-control
@bin bin/obxprop
@@ -33,6 +32,7 @@ include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
lib/libobrender.a
lib/libobrender.la
+@lib lib/libobrender.so.${LIBobrender_VERSION}
lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
@@ -76,9 +76,15 @@ share/examples/openbox/xbm/max_toggled.x
share/examples/openbox/xbm/shade.xbm
share/examples/openbox/xbm/shade_toggled.xbm
share/gnome/
+share/gnome-session/
+share/gnome-session/sessions/
+share/gnome-session/sessions/openbox-gnome-fallback.session
+share/gnome-session/sessions/openbox-gnome.session
share/gnome/wm-properties/
share/gnome/wm-properties/openbox.desktop
+share/locale/af/LC_MESSAGES/openbox.mo
share/locale/ar/LC_MESSAGES/openbox.mo
+share/locale/be/LC_MESSAGES/openbox.mo
share/locale/bn_IN/LC_MESSAGES/openbox.mo
share/locale/ca/LC_MESSAGES/openbox.mo
share/locale/cs/LC_MESSAGES/openbox.mo
@@ -91,8 +97,10 @@ 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/he/LC_MESSAGES/openbox.mo
share/locale/hr/LC_MESSAGES/openbox.mo
share/locale/hu/LC_MESSAGES/openbox.mo
+share/locale/ia/LC_MESSAGES/openbox.mo
share/locale/it/LC_MESSAGES/openbox.mo
share/locale/ja/LC_MESSAGES/openbox.mo
share/locale/lt/LC_MESSAGES/openbox.mo
@@ -102,6 +110,7 @@ share/locale/no/LC_MESSAGES/openbox.mo
share/locale/pl/LC_MESSAGES/openbox.mo
share/locale/pt/LC_MESSAGES/openbox.mo
share/locale/pt_BR/LC_MESSAGES/openbox.mo
+share/locale/ro/LC_MESSAGES/openbox.mo
share/locale/ru/LC_MESSAGES/openbox.mo
share/locale/sk/LC_MESSAGES/openbox.mo
share/locale/sr/LC_MESSAGES/openbox.mo
