FreeBSD Bugzilla – Attachment 78961 Details for
Bug 113499
[ patch ] x11-wm/openbox: update to 3.4.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
openbox340.diff
openbox340.diff (text/plain), 12.71 KB, created by
Roman Bogorodskiy
on 2007-06-09 19:00:07 UTC
(
hide
)
Description:
openbox340.diff
Filename:
MIME Type:
Creator:
Roman Bogorodskiy
Created:
2007-06-09 19:00:07 UTC
Size:
12.71 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/x11-wm/openbox/Makefile,v >retrieving revision 1.76 >diff -u -r1.76 Makefile >--- Makefile 19 May 2007 20:32:46 -0000 1.76 >+++ Makefile 9 Jun 2007 17:48:04 -0000 >@@ -7,8 +7,7 @@ > # > > PORTNAME= openbox >-PORTVERSION= 3.3.1 >-PORTREVISION= 1 >+PORTVERSION= 3.4.0 > CATEGORIES= x11-wm > MASTER_SITES= http://offload1.icculus.org/openbox/releases/ > >@@ -19,11 +18,15 @@ > > GNU_CONFIGURE= yes > USE_GMAKE= yes >-USE_GNOME= glib20 libxml2 >+USE_GNOME= glib20 libxml2 ltverhack >+USE_AUTOTOOLS= libtool:15 > USE_X_PREFIX= yes > USE_LDCONFIG= yes > CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" >+CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" >+MAN1= openbox.1 openbox-session.1 \ >+ openbox-gnome-session.1 openbox-kde-session.1 > > .if !defined(WITHOUT_NLS) > USE_GETTEXT= yes >Index: distinfo >=================================================================== >RCS file: /home/ncvs/ports/x11-wm/openbox/distinfo,v >retrieving revision 1.42 >diff -u -r1.42 distinfo >--- distinfo 20 Sep 2006 20:01:47 -0000 1.42 >+++ distinfo 9 Jun 2007 17:48:04 -0000 >@@ -1,3 +1,3 @@ >-MD5 (openbox-3.3.1.tar.gz) = 6dc25d5fbff5d6277593b89974f950d8 >-SHA256 (openbox-3.3.1.tar.gz) = a70b7bc8c28427dff350aa17882d6916b678fd12d1119e4c3ad4b86f3371f033 >-SIZE (openbox-3.3.1.tar.gz) = 603402 >+MD5 (openbox-3.4.0.tar.gz) = 216b0ab93520c36bb9ddc6b9bd6a6d71 >+SHA256 (openbox-3.4.0.tar.gz) = af95e5fc5c87db286357a67f9525f78122f3003ead0ab0d04b0ddcabe8df3564 >+SIZE (openbox-3.4.0.tar.gz) = 720599 >Index: pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/x11-wm/openbox/pkg-plist,v >retrieving revision 1.20 >diff -u -r1.20 pkg-plist >--- pkg-plist 20 Sep 2006 20:01:47 -0000 1.20 >+++ pkg-plist 9 Jun 2007 17:48:04 -0000 >@@ -1,34 +1,37 @@ > bin/gnome-panel-control >-bin/kdetrayproxy > bin/openbox >+bin/openbox-gnome-session >+bin/openbox-kde-session >+bin/openbox-session >+etc/xdg/openbox/autostart.sh > etc/xdg/openbox/menu.xml > etc/xdg/openbox/rc.xml >-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/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/libobparser.so >-lib/libobparser.so.4 >+lib/libobparser.so.12 > lib/libobrender.a > lib/libobrender.la > lib/libobrender.so >-lib/libobrender.so.4 >+lib/libobrender.so.12 > libdata/pkgconfig/obparser-3.0.pc > libdata/pkgconfig/obrender-3.0.pc > share/gnome/wm-properties/openbox.desktop >-%%DATADIR%%/menu.xsd >-%%DATADIR%%/rc.xsd >-%%DATADIR%%/themeupdate.py > share/pixmaps/openbox.png >+share/themes/Artwiz-boxed/openbox-3/themerc >+share/themes/Clearlooks/openbox-3/themerc >+share/themes/Clearlooks-Olive/openbox-3/themerc > share/themes/Mikachu/openbox-3/bullet.xbm > share/themes/Mikachu/openbox-3/close.xbm > share/themes/Mikachu/openbox-3/desk.xbm >@@ -38,90 +41,109 @@ > 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/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/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/openbox-3/themerc >-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 >+share/themes/Orang/openbox-3/themerc >+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/max.xbm >+share/themes/Syscrash/openbox-3/themerc >+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/xsessions/openbox.desktop >+share/xsessions/openbox-gnome.desktop >+share/xsessions/openbox-kde.desktop >+%%DOCSDIR%%/COMPLIANCE >+%%DOCSDIR%%/README >+%%DOCSDIR%%/AUTHORS >+%%DOCSDIR%%/CHANGELOG >+%%DOCSDIR%%/COPYING >+%%DOCSDIR%%/rc.xsd >+%%DOCSDIR%%/menu.xsd >+%%DOCSDIR%%/rc-mouse-focus.xml >+%%DOCSDIR%%/xbm/bullet.xbm >+%%DOCSDIR%%/xbm/close.xbm >+%%DOCSDIR%%/xbm/desk_toggled.xbm >+%%DOCSDIR%%/xbm/desk.xbm >+%%DOCSDIR%%/xbm/iconify.xbm >+%%DOCSDIR%%/xbm/max_toggled.xbm >+%%DOCSDIR%%/xbm/max.xbm >+%%DOCSDIR%%/xbm/shade_toggled.xbm >+%%DOCSDIR%%/xbm/shade.xbm >+%%NLS%%share/locale/ar/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/bn_IN/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/ca/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/cr/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/cs/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/de/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/es/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/et/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/fi/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/fr/LC_MESSAGES/openbox.mo >-%%NLS%%share/locale/hr/LC_MESSAGES/openbox.mo >-%%NLS%%share/locale/ja/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/it/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/nl/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/no/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/pl/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/pt/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/pt_BR/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/ru/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/sk/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/sv/LC_MESSAGES/openbox.mo >+%%NLS%%share/locale/zh_CN/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/zh_TW/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/en@quot/LC_MESSAGES/openbox.mo > %%NLS%%share/locale/en@boldquot/LC_MESSAGES/openbox.mo >+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/bn_IN > %%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES > %%NLS%%@dirrmtry share/locale/en@quot > %%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES > %%NLS%%@dirrmtry share/locale/en@boldquot >-@dirrm share/themes/syscrash/openbox-3 >-@dirrm share/themes/syscrash >-@dirrm share/themes/orang/openbox-3 >-@dirrm share/themes/orang >-@dirrm share/themes/bear2/openbox-3 >-@dirrm share/themes/bear2 >-@dirrm share/themes/artwiz-boxed/openbox-3 >-@dirrm share/themes/artwiz-boxed >-@dirrm share/themes/Natura/openbox-3 >-@dirrm share/themes/Natura >+@dirrm %%DOCSDIR%%/xbm >+@dirrm %%DOCSDIR%% >+@dirrm share/themes/Artwiz-boxed/openbox-3 >+@dirrm share/themes/Artwiz-boxed >+@dirrm share/themes/Bear2/openbox-3 >+@dirrm share/themes/Bear2 >+@dirrm share/themes/Clearlooks/openbox-3 >+@dirrm share/themes/Clearlooks >+@dirrm share/themes/Clearlooks-Olive/openbox-3 >+@dirrm share/themes/Clearlooks-Olive > @dirrm share/themes/Mikachu/openbox-3 > @dirrm share/themes/Mikachu >+@dirrm share/themes/Natura/openbox-3 >+@dirrm share/themes/Natura >+@dirrm share/themes/Orang/openbox-3 >+@dirrm share/themes/Orang >+@dirrm share/themes/Syscrash/openbox-3 >+@dirrm share/themes/Syscrash > @dirrmtry share/themes >-@dirrm %%DATADIR%% >+@comment @dirrm %%DATADIR%% > @dirrmtry share/gnome/wm-properties > @dirrmtry share/gnome > @dirrmtry libdata/pkgconfig >-@dirrm include/openbox/3.3/openbox >-@dirrm include/openbox/3.3 >+@dirrm include/openbox/3.4/openbox >+@dirrm include/openbox/3.4 > @dirrm include/openbox > @dirrm etc/xdg/openbox >-@dirrmtry etc/xdg >+@dirrm etc/xdg >+@dirrmtry share/xsessions >Index: files/patch-openbox-menuframe.c >=================================================================== >RCS file: files/patch-openbox-menuframe.c >diff -N files/patch-openbox-menuframe.c >--- files/patch-openbox-menuframe.c 13 Sep 2006 18:14:36 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,18 +0,0 @@ >---- openbox/menuframe.c.orig Tue Sep 12 21:24:28 2006 >-+++ openbox/menuframe.c Tue Sep 12 21:24: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: files/patch-render-font.c >=================================================================== >RCS file: files/patch-render-font.c >diff -N files/patch-render-font.c >--- files/patch-render-font.c 13 Sep 2006 18:14:36 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,26 +0,0 @@ >---- render/font.c.orig Sat Aug 26 22:15:51 2006 >-+++ render/font.c Tue Sep 12 21:14:46 2006 >-@@ -92,6 +92,8 @@ >- #ifdef USE_PANGO >- guchar *tmp_string = NULL; >- gint tmp_int; >-+ gchar *locale, *p; >-+ PangoFontMetrics *metrics; >- #endif /* USE_PANGO */ >- >- if (!(pat = XftNameParse(fontstring))) >-@@ -135,13 +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 = >-+ metrics = >- pango_context_get_metrics(context, out->pango_font_description, >- pango_language_from_string(locale)); >- out->pango_ascent = pango_font_metrics_get_ascent(metrics); >Index: files/patch-render-gradient.c >=================================================================== >RCS file: files/patch-render-gradient.c >diff -N files/patch-render-gradient.c >--- files/patch-render-gradient.c 13 Sep 2006 18:14:36 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,23 +0,0 @@ >---- render/gradient.c.orig Sat Aug 26 22:15:51 2006 >-+++ render/gradient.c Tue Sep 12 21:14:46 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 */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 113499
: 78961