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

- update to openbox-3.4.0

Browse Source 
- take maintainership

for more info, have a look at:
http://icculus.org/openbox/index.php/Help:Upgrading_to_3.4

brad also sent a similar diff
ok jasper@
This commit is contained in:
ajacoutot 2007-06-08 18:41:39 +00:00
parent 647b139ecf
commit 1bb7444646
7 changed files with 139 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
x11/openbox/Makefile
View File

@ -1,18 +1,21 @@
# $OpenBSD: Makefile,v 1.31 2006/12/16 12:22:36 espie Exp $
# $OpenBSD: Makefile,v 1.32 2007/06/08 18:41:39 ajacoutot Exp $
COMMENT= "small, fast & usable window manager"
COMMENT= small, fast & usable window manager
DISTNAME= openbox-3.3.1
SHARED_LIBS= obparser 3.0 \
obrender 3.0
DISTNAME= openbox-3.4.0
SHARED_LIBS+= obparser 4.0 # .13.0
SHARED_LIBS+= obrender 4.0 # .13.0
CATEGORIES= x11
MASTER_SITES= http://offload1.icculus.org/openbox/releases/
HOMEPAGE= http://icculus.org/openbox/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
MODULES= devel/gettext
LIB_DEPENDS+= pango-1.0,pangoxft-1.0,pangoft2-1.0::devel/pango \
xml2.>=6::textproc/libxml
xml2.>=6::textproc/libxml \
startup-notification-1.>=1::devel/startup-notification
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -21,15 +24,11 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xft Xinerama Xrandr Xrender c \
fontconfig freetype m z glib-2.0 gmodule-2.0 \
gobject-2.0
gobject-2.0 Xau Xcursor Xdmcp Xfixes expat
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
post-install:
${INSTALL_DATA} ${WRKSRC}/data/*.xml ${PREFIX}/share/openbox
.include <bsd.port.mk>

10
x11/openbox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openbox-3.3.1.tar.gz) = bcJdX7/11id1k7iZdPlQ2A==
RMD160 (openbox-3.3.1.tar.gz) = t5bYB8F2Yc/1BrZB8SEFaqFGyNk=
SHA1 (openbox-3.3.1.tar.gz) = BSTL8qOWRZ0gaRXmsbaIRDze2Js=
SHA256 (openbox-3.3.1.tar.gz) = pwt7yMKEJ9/zUKoXiC1pFrZ4/RLREZ5MOtS4bzNx8DM=
SIZE (openbox-3.3.1.tar.gz) = 603402
MD5 (openbox-3.4.0.tar.gz) = IWsKuTUgw2u53ca5vWptcQ==
RMD160 (openbox-3.4.0.tar.gz) = ZE5FVq4o8GPhKwjUIiwb0tuzvfU=
SHA1 (openbox-3.4.0.tar.gz) = bydHlTqu7beIyHKaSNn9vV9AnrI=
SHA256 (openbox-3.4.0.tar.gz) = r5Xl/FyH2yhjV6Z/lSX3gSLzAD6tCrDQSw3cq+jfNWQ=
SIZE (openbox-3.4.0.tar.gz) = 720599

31
x11/openbox/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/06/08 18:41:39 ajacoutot Exp $
--- Makefile.in.orig Tue Jun 5 18:06:37 2007
+++ Makefile.in Thu Jun 7 09:15:32 2007
@@ -790,11 +790,6 @@ dist_noinst_DATA = \
tests/urgent.c
dist_doc_DATA = \
- COMPLIANCE \
- README \
- AUTHORS \
- CHANGELOG \
- COPYING \
data/rc.xsd \
data/menu.xsd \
doc/rc-mouse-focus.xml
@@ -2118,12 +2113,12 @@ uninstall-dist_pixmapDATA:
done
install-dist_rcDATA: $(dist_rc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@list='$(dist_rc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
- $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
done
uninstall-dist_rcDATA:

18
x11/openbox/patches/patch-openbox-menuframe_c
View File

@ -1,18 +0,0 @@
--- 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);
}

27
x11/openbox/patches/patch-render-font_c
View File

@ -1,27 +0,0 @@
--- 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);

24
x11/openbox/patches/patch-render-gradient_c
View File

@ -1,24 +0,0 @@
--- 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 */

165
x11/openbox/pkg/PLIST
View File

@ -1,21 +1,24 @@
@comment $OpenBSD: PLIST,v 1.12 2006/10/26 21:40:26 jasper Exp $
@comment $OpenBSD: PLIST,v 1.13 2007/06/08 18:41:39 ajacoutot Exp $
%%SHARED%%
bin/gnome-panel-control
bin/kdetrayproxy
bin/openbox
bin/openbox-gnome-session
bin/openbox-kde-session
bin/openbox-session
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
include/openbox/3.3/openbox/version.h
include/openbox/3.4/
include/openbox/3.4/openbox/
include/openbox/3.4/openbox/color.h
include/openbox/3.4/openbox/font.h
include/openbox/3.4/openbox/geom.h
include/openbox/3.4/openbox/gradient.h
include/openbox/3.4/openbox/image.h
include/openbox/3.4/openbox/instance.h
include/openbox/3.4/openbox/mask.h
include/openbox/3.4/openbox/parse.h
include/openbox/3.4/openbox/render.h
include/openbox/3.4/openbox/theme.h
include/openbox/3.4/openbox/version.h
lib/libobparser.a
lib/libobparser.la
lib/libobrender.a
@ -23,37 +26,85 @@ lib/libobrender.la
lib/pkgconfig/
lib/pkgconfig/obparser-3.0.pc
lib/pkgconfig/obrender-3.0.pc
@man man/man1/openbox-gnome-session.1
@man man/man1/openbox-kde-session.1
@man man/man1/openbox-session.1
@man man/man1/openbox.1
share/doc/openbox/
@sample ${SYSCONFDIR}/xdg/openbox/
share/doc/openbox/autostart.sh
share/doc/openbox/menu.xml
@sample ${SYSCONFDIR}/xdg/openbox/menu.xml
share/doc/openbox/menu.xsd
share/doc/openbox/rc-mouse-focus.xml
share/doc/openbox/rc.xml
@sample ${SYSCONFDIR}/xdg/openbox/rc.xml
share/doc/openbox/rc.xsd
share/doc/openbox/xbm/
share/doc/openbox/xbm/bullet.xbm
share/doc/openbox/xbm/close.xbm
share/doc/openbox/xbm/desk.xbm
share/doc/openbox/xbm/desk_toggled.xbm
share/doc/openbox/xbm/iconify.xbm
share/doc/openbox/xbm/max.xbm
share/doc/openbox/xbm/max_toggled.xbm
share/doc/openbox/xbm/shade.xbm
share/doc/openbox/xbm/shade_toggled.xbm
share/gnome/
share/gnome/wm-properties/
share/gnome/wm-properties/openbox.desktop
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/openbox.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/openbox.mo
share/locale/ca/LC_MESSAGES/openbox.mo
share/locale/cs/LC_MESSAGES/openbox.mo
share/locale/de/LC_MESSAGES/openbox.mo
share/locale/en@boldquot/LC_MESSAGES/openbox.mo
share/locale/en@quot/LC_MESSAGES/openbox.mo
share/locale/es/LC_MESSAGES/openbox.mo
share/locale/et/LC_MESSAGES/openbox.mo
share/locale/fi/LC_MESSAGES/openbox.mo
share/locale/fr/LC_MESSAGES/openbox.mo
share/locale/hr/LC_MESSAGES/openbox.mo
share/locale/ja/LC_MESSAGES/openbox.mo
share/locale/it/LC_MESSAGES/openbox.mo
share/locale/nl/LC_MESSAGES/openbox.mo
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/ru/LC_MESSAGES/openbox.mo
share/locale/sk/LC_MESSAGES/openbox.mo
share/locale/sv/LC_MESSAGES/openbox.mo
share/locale/zh_CN/LC_MESSAGES/openbox.mo
share/locale/zh_TW/LC_MESSAGES/openbox.mo
share/openbox/
@sample ${SYSCONFDIR}/xdg/openbox/
share/openbox/menu.xml
@sample ${SYSCONFDIR}/xdg/openbox/menu.xml
share/openbox/menu.xsd
share/openbox/rc.xml
@sample ${SYSCONFDIR}/xdg/openbox/rc.xml
share/openbox/rc.xsd
share/openbox/themeupdate.py
share/pixmaps/
share/pixmaps/openbox.png
share/themes/
share/themes/Artwiz-boxed/
share/themes/Artwiz-boxed/openbox-3/
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_pressed.xbm
share/themes/Bear2/openbox-3/max.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/Clearlooks/
share/themes/Clearlooks-Olive/
share/themes/Clearlooks-Olive/openbox-3/
share/themes/Clearlooks-Olive/openbox-3/themerc
share/themes/Clearlooks/openbox-3/
share/themes/Clearlooks/openbox-3/themerc
share/themes/Mikachu/
share/themes/Mikachu/openbox-3/
share/themes/Mikachu/openbox-3/bullet.xbm
@ -67,57 +118,27 @@ 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_hover.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/shade_hover.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%%
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/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/themerc
share/xsessions/
share/xsessions/openbox-gnome.desktop
share/xsessions/openbox-kde.desktop
share/xsessions/openbox.desktop