On Tue, Oct 17, 2006 at 10:55:27AM -0600, Anton Karpov wrote:
> Jasper Lievisse Adriaanse wrote:
> >Is it just me, or is your PLIST wrong? Can you try this one?
> >http://humppa.nl/~jasper/openbox.diff
> >
> >
> Ah, it's okay. Your patch is for 3.3.1 and mine is for 3.3. Sorry, I
> didn't check the latest version of openbox.
hi,
here's a better diff.
- it updates openbox to 3.3.1,
- removes some unneeded libs, (startup-notification support is
disabled because it doesn't work well),
- remove NO_REGRESS.
works fine on amd64, i386, macppc and sparc.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 18 Sep 2006 12:19:41 -0000 1.29
+++ Makefile 17 Oct 2006 13:42:38 -0000
@@ -2,8 +2,7 @@
COMMENT= "small, fast & usable window manager"
-DISTNAME= openbox-3.3-rc2
-PKGNAME= openbox-3.3.rc2p0
+DISTNAME= openbox-3.3.1
SHARED_LIBS= obparser 3.0 \
obrender 3.0
CATEGORIES= x11
@@ -13,8 +12,7 @@
MODULES= devel/gettext
LIB_DEPENDS+= pango-1.0,pangoxft-1.0,pangoft2-1.0::devel/pango \
- xml2.>=6::textproc/libxml \
- startup-notification-1::devel/startup-notification
+ xml2.>=6::textproc/libxml
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
# GPL
@@ -22,7 +20,7 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 Xext Xft Xinerama Xrandr Xrender Xxf86vm c \
+WANTLIB= ICE SM X11 Xext Xft Xinerama Xrandr Xrender c \
fontconfig freetype m z glib-2.0 gmodule-2.0 \
gobject-2.0
@@ -31,8 +29,6 @@
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
-
-NO_REGRESS= Yes
post-install:
${INSTALL_DATA} ${WRKSRC}/data/*.xml ${PREFIX}/share/openbox
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/openbox/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 14 May 2006 00:26:13 -0000 1.13
+++ distinfo 17 Oct 2006 13:42:38 -0000
@@ -1,4 +1,4 @@
-MD5 (openbox-3.3-rc2.tar.gz) = 1ff100d27cc1f47dadebb884a696dac3
-RMD160 (openbox-3.3-rc2.tar.gz) = d12f6bda7145975754626e4c421baaa2ea25d07f
-SHA1 (openbox-3.3-rc2.tar.gz) = 6d41005bb5709b1f5d948277f30c9b5077514734
-SIZE (openbox-3.3-rc2.tar.gz) = 585486
+MD5 (openbox-3.3.1.tar.gz) = 6dc25d5fbff5d6277593b89974f950d8
+RMD160 (openbox-3.3.1.tar.gz) = b796d807c17661cff506b641f121056aa146c8d9
+SHA1 (openbox-3.3.1.tar.gz) = 0524cbf2a396459d206915e6b1b688443cded89b
+SIZE (openbox-3.3.1.tar.gz) = 603402
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 17 Oct 2006 13:42:38 -0000
@@ -0,0 +1,18 @@
+--- openbox/menuframe.c.orig Tue Oct 17 15:34:53 2006
++++ openbox/menuframe.c Tue Oct 17 15:35:50 2006
+@@ -675,12 +675,14 @@
+
+ void menu_frame_hide_all()
+ {
++ GList *it;
++
+ if (config_submenu_show_delay) {
+ /* remove any submenu open requests */
+ ob_main_loop_timeout_remove(ob_main_loop,
+ menu_entry_frame_submenu_timeout);
+ }
+- GList *it = g_list_last(menu_frame_visible);
++ it = g_list_last(menu_frame_visible);
+ if (it)
+ menu_frame_hide(it->data);
+ }
Index: patches/patch-render-font_c
===================================================================
RCS file: patches/patch-render-font_c
diff -N patches/patch-render-font_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-render-font_c 17 Oct 2006 13:42:38 -0000
@@ -0,0 +1,27 @@
+--- render/font.c.orig Tue Oct 17 14:36:32 2006
++++ render/font.c Tue Oct 17 14:44:29 2006
+@@ -90,6 +90,8 @@
+ FcResult res;
+ gint tint;
+ #ifdef USE_PANGO
++ PangoFontMetrics *metrics;
++ gchar *locale, *p;
+ guchar *tmp_string = NULL;
+ gint tmp_int;
+ #endif /* USE_PANGO */
+@@ -135,14 +137,12 @@
+ }
+
+ /* based on gtkmain.c gtk_get_default_language() */
+- gchar *locale, *p;
+ locale = g_strdup(setlocale(LC_CTYPE, NULL));
+ if ((p = strchr(locale, '.')))
+ *p = '\0';
+ if ((p = strchr(locale, '@')))
+ *p = '\0';
+- PangoFontMetrics *metrics =
+- pango_context_get_metrics(context, out->pango_font_description,
++ metrics = pango_context_get_metrics(context, out->pango_font_description,
+ pango_language_from_string(locale));
+ out->pango_ascent = pango_font_metrics_get_ascent(metrics);
+ out->pango_descent = pango_font_metrics_get_descent(metrics);
Index: patches/patch-render-gradient_c
===================================================================
RCS file: patches/patch-render-gradient_c
diff -N patches/patch-render-gradient_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-render-gradient_c 17 Oct 2006 13:42:38 -0000
@@ -0,0 +1,24 @@
+--- render/gradient.c.orig Tue Oct 17 15:29:19 2006
++++ render/gradient.c Tue Oct 17 15:29:50 2006
+@@ -371,6 +371,9 @@
+ RrPixel32 current;
+ RrColor *primary_light, *secondary_light;
+
++ VARS(y1);
++ VARS(y3);
++
+ r = sf->primary->r;
+ r += r >> 2;
+ g = sf->primary->g;
+@@ -393,10 +396,8 @@
+ if (b > 0xFF) b = 0xFF;
+ secondary_light = RrColorNew(a->inst, r, g, b);
+
+- VARS(y1);
+ SETUP(y1, primary_light, sf->primary, (h / 2) -1);
+-
+- VARS(y3);
++
+ SETUP(y3, sf->secondary, secondary_light, (h / 2) -1);
+
+ for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/openbox/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR 12 Nov 2003 03:48:32 -0000 1.2
+++ pkg/DESCR 17 Oct 2006 13:42:38 -0000
@@ -1,13 +1,12 @@
-Openbox is a standards compliant, fast, light-weight, extensible
-window manager.
+Openbox is a standards compliant, fast, light-weight, extensible window
+manager.
-Openbox works with your applications, and makes your desktop easier
-to manage. This is because the approach to its development was the
-opposite of what seems to be the general case for window managers.
-Openbox was written first to comply with standards and to work
-properly. Only when that was in place did the team turn to the
-visual interface.
+Openbox works with your applications, and makes your desktop easier to
+manage. This is because the approach to its development was the opposite
+of what seems to be the general case for window managers. Openbox was
+written first to comply with standards and to work properly. Only when
+that was in place did the team turn to the visual interface.
-Openbox is fully functional as a stand-alone working environment,
-or can be used as a drop-in replacement for the default window
-manager in the GNOME or KDE desktop environments.
+Openbox is fully functional as a stand-alone working environment, or can
+be used as a drop-in replacement for the default window manager in the
+GNOME or KDE desktop environments.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST 14 May 2006 00:26:13 -0000 1.11
+++ pkg/PLIST 17 Oct 2006 13:42:38 -0000
@@ -5,6 +5,13 @@
include/openbox/
include/openbox/3.3/
include/openbox/3.3/openbox/
+include/openbox/3.3/openbox/color.h
+include/openbox/3.3/openbox/font.h
+include/openbox/3.3/openbox/geom.h
+include/openbox/3.3/openbox/gradient.h
+include/openbox/3.3/openbox/image.h
+include/openbox/3.3/openbox/instance.h
+include/openbox/3.3/openbox/mask.h
include/openbox/3.3/openbox/parse.h
include/openbox/3.3/openbox/render.h
include/openbox/3.3/openbox/theme.h
@@ -19,40 +26,22 @@
share/gnome/
share/gnome/wm-properties/
share/gnome/wm-properties/openbox.desktop
-share/locale/
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/openbox.mo
-share/locale/[EMAIL PROTECTED]/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/openbox.mo
share/locale/[EMAIL PROTECTED]/LC_MESSAGES/openbox.mo
-share/locale/[EMAIL PROTECTED]/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
share/locale/[EMAIL PROTECTED]/LC_MESSAGES/openbox.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/openbox.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/openbox.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/openbox.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
+share/locale/hr/LC_MESSAGES/openbox.mo
share/locale/ja/LC_MESSAGES/openbox.mo
-share/locale/no/
-share/locale/no/LC_MESSAGES/
share/locale/no/LC_MESSAGES/openbox.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/openbox.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
+share/locale/pt/LC_MESSAGES/openbox.mo
share/locale/ru/LC_MESSAGES/openbox.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
+share/locale/sk/LC_MESSAGES/openbox.mo
share/locale/sv/LC_MESSAGES/openbox.mo
+share/locale/zh_TW/LC_MESSAGES/openbox.mo
share/openbox/
@sample ${SYSCONFDIR}/xdg/openbox/
share/openbox/menu.xml
@@ -65,37 +54,70 @@
share/pixmaps/
share/pixmaps/openbox.png
share/themes/
-share/themes/Allegro/
-share/themes/Allegro/openbox-3/
-share/themes/Allegro/openbox-3/bullet.xbm
-share/themes/Allegro/openbox-3/themerc
-share/themes/Artwiz/
-share/themes/Artwiz/openbox-3/
-share/themes/Artwiz/openbox-3/themerc
-share/themes/Blah41/
-share/themes/Blah41/openbox-3/
-share/themes/Blah41/openbox-3/themerc
-share/themes/Om4Ob/
-share/themes/Om4Ob/openbox-3/
-share/themes/Om4Ob/openbox-3/close.xbm
-share/themes/Om4Ob/openbox-3/close_hover.xbm
-share/themes/Om4Ob/openbox-3/desk.xbm
-share/themes/Om4Ob/openbox-3/desk_hover.xbm
-share/themes/Om4Ob/openbox-3/desk_toggled.xbm
-share/themes/Om4Ob/openbox-3/iconify.xbm
-share/themes/Om4Ob/openbox-3/iconify_hover.xbm
-share/themes/Om4Ob/openbox-3/iconify_pressed.xbm
-share/themes/Om4Ob/openbox-3/max.xbm
-share/themes/Om4Ob/openbox-3/max_disabled.xbm
-share/themes/Om4Ob/openbox-3/max_hover.xbm
-share/themes/Om4Ob/openbox-3/max_pressed.xbm
-share/themes/Om4Ob/openbox-3/max_toggled.xbm
-share/themes/Om4Ob/openbox-3/shade.xbm
-share/themes/Om4Ob/openbox-3/shade_disabled.xbm
-share/themes/Om4Ob/openbox-3/shade_hover.xbm
-share/themes/Om4Ob/openbox-3/shade_toggled.xbm
-share/themes/Om4Ob/openbox-3/themerc
-share/themes/TheBear/
-share/themes/TheBear/openbox-3/
-share/themes/TheBear/openbox-3/themerc
+share/themes/Mikachu/
+share/themes/Mikachu/openbox-3/
+share/themes/Mikachu/openbox-3/bullet.xbm
+share/themes/Mikachu/openbox-3/close.xbm
+share/themes/Mikachu/openbox-3/desk.xbm
+share/themes/Mikachu/openbox-3/iconify.xbm
+share/themes/Mikachu/openbox-3/max.xbm
+share/themes/Mikachu/openbox-3/themerc
+share/themes/Natura/
+share/themes/Natura/openbox-3/
+share/themes/Natura/openbox-3/close.xbm
+share/themes/Natura/openbox-3/close_hover.xbm
+share/themes/Natura/openbox-3/desk.xbm
+share/themes/Natura/openbox-3/desk_toggled.xbm
+share/themes/Natura/openbox-3/iconify.xbm
+share/themes/Natura/openbox-3/iconify_disabled.xbm
+share/themes/Natura/openbox-3/iconify_hover.xbm
+share/themes/Natura/openbox-3/max.xbm
+share/themes/Natura/openbox-3/max_disabled.xbm
+share/themes/Natura/openbox-3/max_hover.xbm
+share/themes/Natura/openbox-3/max_toggled.xbm
+share/themes/Natura/openbox-3/shade.xbm
+share/themes/Natura/openbox-3/themerc
+share/themes/artwiz-boxed/
+share/themes/artwiz-boxed/openbox-3/
+share/themes/artwiz-boxed/openbox-3/bullet.xbm
+share/themes/artwiz-boxed/openbox-3/close.xbm
+share/themes/artwiz-boxed/openbox-3/desk.xbm
+share/themes/artwiz-boxed/openbox-3/desk_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/iconify.xbm
+share/themes/artwiz-boxed/openbox-3/max.xbm
+share/themes/artwiz-boxed/openbox-3/max_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/themerc
+share/themes/bear2/
+share/themes/bear2/openbox-3/
+share/themes/bear2/openbox-3/close.xbm
+share/themes/bear2/openbox-3/close_pressed.xbm
+share/themes/bear2/openbox-3/desk.xbm
+share/themes/bear2/openbox-3/desk_toggled.xbm
+share/themes/bear2/openbox-3/iconify.xbm
+share/themes/bear2/openbox-3/iconify_disabled.xbm
+share/themes/bear2/openbox-3/iconify_pressed.xbm
+share/themes/bear2/openbox-3/max.xbm
+share/themes/bear2/openbox-3/max_disabled.xbm
+share/themes/bear2/openbox-3/max_pressed.xbm
+share/themes/bear2/openbox-3/max_toggled.xbm
+share/themes/bear2/openbox-3/shade.xbm
+share/themes/bear2/openbox-3/shade_pressed.xbm
+share/themes/bear2/openbox-3/themerc
+share/themes/orang/
+share/themes/orang/openbox-3/
+share/themes/orang/openbox-3/themerc
+share/themes/syscrash/
+share/themes/syscrash/openbox-3/
+share/themes/syscrash/openbox-3/bullet.xbm
+share/themes/syscrash/openbox-3/close.xbm
+share/themes/syscrash/openbox-3/close_disabled.xbm
+share/themes/syscrash/openbox-3/desk.xbm
+share/themes/syscrash/openbox-3/desk_toggled.xbm
+share/themes/syscrash/openbox-3/iconify.xbm
+share/themes/syscrash/openbox-3/max.xbm
+share/themes/syscrash/openbox-3/max_disabled.xbm
+share/themes/syscrash/openbox-3/max_pressed.xbm
+share/themes/syscrash/openbox-3/max_toggled.xbm
+share/themes/syscrash/openbox-3/shade.xbm
+share/themes/syscrash/openbox-3/themerc
%%SHARED%%
--
Humppa is a serious thing!
NedBSD: http://nedbsd.nl
