View | Details | Raw Unified | Return to bug 113499
Collapse All | Expand All

(-)Makefile (-3 / +6 lines)
Lines 7-14 Link Here
7
#
7
#
8
8
9
PORTNAME=	openbox
9
PORTNAME=	openbox
10
PORTVERSION=	3.3.1
10
PORTVERSION=	3.4.0
11
PORTREVISION=	1
12
CATEGORIES=	x11-wm
11
CATEGORIES=	x11-wm
13
MASTER_SITES=	http://offload1.icculus.org/openbox/releases/
12
MASTER_SITES=	http://offload1.icculus.org/openbox/releases/
14
13
Lines 19-29 Link Here
19
18
20
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
21
USE_GMAKE=	yes
20
USE_GMAKE=	yes
22
USE_GNOME=	glib20 libxml2
21
USE_GNOME=	glib20 libxml2 ltverhack
22
USE_AUTOTOOLS=	libtool:15
23
USE_X_PREFIX=	yes
23
USE_X_PREFIX=	yes
24
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
25
CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
25
CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
26
		LDFLAGS="-L${LOCALBASE}/lib"
26
		LDFLAGS="-L${LOCALBASE}/lib"
27
CONFIGURE_ARGS+=	--mandir="${PREFIX}/man/"
28
MAN1=		openbox.1 openbox-session.1 \
29
		openbox-gnome-session.1 openbox-kde-session.1
27
30
28
.if !defined(WITHOUT_NLS)
31
.if !defined(WITHOUT_NLS)
29
USE_GETTEXT=	yes
32
USE_GETTEXT=	yes
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (openbox-3.3.1.tar.gz) = 6dc25d5fbff5d6277593b89974f950d8
1
MD5 (openbox-3.4.0.tar.gz) = 216b0ab93520c36bb9ddc6b9bd6a6d71
2
SHA256 (openbox-3.3.1.tar.gz) = a70b7bc8c28427dff350aa17882d6916b678fd12d1119e4c3ad4b86f3371f033
2
SHA256 (openbox-3.4.0.tar.gz) = af95e5fc5c87db286357a67f9525f78122f3003ead0ab0d04b0ddcabe8df3564
3
SIZE (openbox-3.3.1.tar.gz) = 603402
3
SIZE (openbox-3.4.0.tar.gz) = 720599
(-)pkg-plist (-70 / +92 lines)
Lines 1-34 Link Here
1
bin/gnome-panel-control
1
bin/gnome-panel-control
2
bin/kdetrayproxy
3
bin/openbox
2
bin/openbox
3
bin/openbox-gnome-session
4
bin/openbox-kde-session
5
bin/openbox-session
6
etc/xdg/openbox/autostart.sh
4
etc/xdg/openbox/menu.xml
7
etc/xdg/openbox/menu.xml
5
etc/xdg/openbox/rc.xml
8
etc/xdg/openbox/rc.xml
6
include/openbox/3.3/openbox/color.h
9
include/openbox/3.4/openbox/color.h
7
include/openbox/3.3/openbox/font.h
10
include/openbox/3.4/openbox/font.h
8
include/openbox/3.3/openbox/geom.h
11
include/openbox/3.4/openbox/geom.h
9
include/openbox/3.3/openbox/gradient.h
12
include/openbox/3.4/openbox/gradient.h
10
include/openbox/3.3/openbox/image.h
13
include/openbox/3.4/openbox/image.h
11
include/openbox/3.3/openbox/instance.h
14
include/openbox/3.4/openbox/instance.h
12
include/openbox/3.3/openbox/mask.h
15
include/openbox/3.4/openbox/mask.h
13
include/openbox/3.3/openbox/parse.h
16
include/openbox/3.4/openbox/parse.h
14
include/openbox/3.3/openbox/render.h
17
include/openbox/3.4/openbox/render.h
15
include/openbox/3.3/openbox/theme.h
18
include/openbox/3.4/openbox/theme.h
16
include/openbox/3.3/openbox/version.h
19
include/openbox/3.4/openbox/version.h
17
lib/libobparser.a
20
lib/libobparser.a
18
lib/libobparser.la
21
lib/libobparser.la
19
lib/libobparser.so
22
lib/libobparser.so
20
lib/libobparser.so.4
23
lib/libobparser.so.12
21
lib/libobrender.a
24
lib/libobrender.a
22
lib/libobrender.la
25
lib/libobrender.la
23
lib/libobrender.so
26
lib/libobrender.so
24
lib/libobrender.so.4
27
lib/libobrender.so.12
25
libdata/pkgconfig/obparser-3.0.pc
28
libdata/pkgconfig/obparser-3.0.pc
26
libdata/pkgconfig/obrender-3.0.pc
29
libdata/pkgconfig/obrender-3.0.pc
27
share/gnome/wm-properties/openbox.desktop
30
share/gnome/wm-properties/openbox.desktop
28
%%DATADIR%%/menu.xsd
29
%%DATADIR%%/rc.xsd
30
%%DATADIR%%/themeupdate.py
31
share/pixmaps/openbox.png
31
share/pixmaps/openbox.png
32
share/themes/Artwiz-boxed/openbox-3/themerc
33
share/themes/Clearlooks/openbox-3/themerc
34
share/themes/Clearlooks-Olive/openbox-3/themerc
32
share/themes/Mikachu/openbox-3/bullet.xbm
35
share/themes/Mikachu/openbox-3/bullet.xbm
33
share/themes/Mikachu/openbox-3/close.xbm
36
share/themes/Mikachu/openbox-3/close.xbm
34
share/themes/Mikachu/openbox-3/desk.xbm
37
share/themes/Mikachu/openbox-3/desk.xbm
Lines 38-127 Link Here
38
share/themes/Natura/openbox-3/close.xbm
41
share/themes/Natura/openbox-3/close.xbm
39
share/themes/Natura/openbox-3/close_hover.xbm
42
share/themes/Natura/openbox-3/close_hover.xbm
40
share/themes/Natura/openbox-3/desk.xbm
43
share/themes/Natura/openbox-3/desk.xbm
44
share/themes/Natura/openbox-3/desk_hover.xbm
41
share/themes/Natura/openbox-3/desk_toggled.xbm
45
share/themes/Natura/openbox-3/desk_toggled.xbm
42
share/themes/Natura/openbox-3/iconify.xbm
46
share/themes/Natura/openbox-3/iconify.xbm
43
share/themes/Natura/openbox-3/iconify_disabled.xbm
44
share/themes/Natura/openbox-3/iconify_hover.xbm
47
share/themes/Natura/openbox-3/iconify_hover.xbm
45
share/themes/Natura/openbox-3/max.xbm
48
share/themes/Natura/openbox-3/max.xbm
46
share/themes/Natura/openbox-3/max_disabled.xbm
47
share/themes/Natura/openbox-3/max_hover.xbm
49
share/themes/Natura/openbox-3/max_hover.xbm
48
share/themes/Natura/openbox-3/max_toggled.xbm
50
share/themes/Natura/openbox-3/max_toggled.xbm
49
share/themes/Natura/openbox-3/shade.xbm
51
share/themes/Natura/openbox-3/shade.xbm
52
share/themes/Natura/openbox-3/shade_hover.xbm
50
share/themes/Natura/openbox-3/themerc
53
share/themes/Natura/openbox-3/themerc
51
share/themes/artwiz-boxed/openbox-3/bullet.xbm
54
share/themes/Orang/openbox-3/themerc
52
share/themes/artwiz-boxed/openbox-3/close.xbm
55
share/themes/Syscrash/openbox-3/max_disabled.xbm
53
share/themes/artwiz-boxed/openbox-3/desk.xbm
56
share/themes/Syscrash/openbox-3/max_pressed.xbm
54
share/themes/artwiz-boxed/openbox-3/desk_toggled.xbm
57
share/themes/Syscrash/openbox-3/max_toggled.xbm
55
share/themes/artwiz-boxed/openbox-3/iconify.xbm
58
share/themes/Syscrash/openbox-3/max.xbm
56
share/themes/artwiz-boxed/openbox-3/max.xbm
59
share/themes/Syscrash/openbox-3/themerc
57
share/themes/artwiz-boxed/openbox-3/max_toggled.xbm
60
share/themes/Bear2/openbox-3/close.xbm
58
share/themes/artwiz-boxed/openbox-3/themerc
61
share/themes/Bear2/openbox-3/close_pressed.xbm
59
share/themes/bear2/openbox-3/close.xbm
62
share/themes/Bear2/openbox-3/desk.xbm
60
share/themes/bear2/openbox-3/close_pressed.xbm
63
share/themes/Bear2/openbox-3/desk_toggled.xbm
61
share/themes/bear2/openbox-3/desk.xbm
64
share/themes/Bear2/openbox-3/iconify.xbm
62
share/themes/bear2/openbox-3/desk_toggled.xbm
65
share/themes/Bear2/openbox-3/iconify_pressed.xbm
63
share/themes/bear2/openbox-3/iconify.xbm
66
share/themes/Bear2/openbox-3/max.xbm
64
share/themes/bear2/openbox-3/iconify_disabled.xbm
67
share/themes/Bear2/openbox-3/max_pressed.xbm
65
share/themes/bear2/openbox-3/iconify_pressed.xbm
68
share/themes/Bear2/openbox-3/max_toggled.xbm
66
share/themes/bear2/openbox-3/max.xbm
69
share/themes/Bear2/openbox-3/shade.xbm
67
share/themes/bear2/openbox-3/max_disabled.xbm
70
share/themes/Bear2/openbox-3/shade_pressed.xbm
68
share/themes/bear2/openbox-3/max_pressed.xbm
71
share/themes/Bear2/openbox-3/themerc
69
share/themes/bear2/openbox-3/max_toggled.xbm
72
share/xsessions/openbox.desktop
70
share/themes/bear2/openbox-3/shade.xbm
73
share/xsessions/openbox-gnome.desktop
71
share/themes/bear2/openbox-3/shade_pressed.xbm
74
share/xsessions/openbox-kde.desktop
72
share/themes/bear2/openbox-3/themerc
75
%%DOCSDIR%%/COMPLIANCE
73
share/themes/orang/openbox-3/themerc
76
%%DOCSDIR%%/README
74
share/themes/syscrash/openbox-3/bullet.xbm
77
%%DOCSDIR%%/AUTHORS
75
share/themes/syscrash/openbox-3/close.xbm
78
%%DOCSDIR%%/CHANGELOG
76
share/themes/syscrash/openbox-3/close_disabled.xbm
79
%%DOCSDIR%%/COPYING
77
share/themes/syscrash/openbox-3/desk.xbm
80
%%DOCSDIR%%/rc.xsd
78
share/themes/syscrash/openbox-3/desk_toggled.xbm
81
%%DOCSDIR%%/menu.xsd
79
share/themes/syscrash/openbox-3/iconify.xbm
82
%%DOCSDIR%%/rc-mouse-focus.xml
80
share/themes/syscrash/openbox-3/max.xbm
83
%%DOCSDIR%%/xbm/bullet.xbm
81
share/themes/syscrash/openbox-3/max_disabled.xbm
84
%%DOCSDIR%%/xbm/close.xbm
82
share/themes/syscrash/openbox-3/max_pressed.xbm
85
%%DOCSDIR%%/xbm/desk_toggled.xbm
83
share/themes/syscrash/openbox-3/max_toggled.xbm
86
%%DOCSDIR%%/xbm/desk.xbm
84
share/themes/syscrash/openbox-3/shade.xbm
87
%%DOCSDIR%%/xbm/iconify.xbm
85
share/themes/syscrash/openbox-3/themerc
88
%%DOCSDIR%%/xbm/max_toggled.xbm
89
%%DOCSDIR%%/xbm/max.xbm
90
%%DOCSDIR%%/xbm/shade_toggled.xbm
91
%%DOCSDIR%%/xbm/shade.xbm
92
%%NLS%%share/locale/ar/LC_MESSAGES/openbox.mo
93
%%NLS%%share/locale/bn_IN/LC_MESSAGES/openbox.mo
86
%%NLS%%share/locale/ca/LC_MESSAGES/openbox.mo
94
%%NLS%%share/locale/ca/LC_MESSAGES/openbox.mo
95
%%NLS%%share/locale/cr/LC_MESSAGES/openbox.mo
96
%%NLS%%share/locale/cs/LC_MESSAGES/openbox.mo
87
%%NLS%%share/locale/de/LC_MESSAGES/openbox.mo
97
%%NLS%%share/locale/de/LC_MESSAGES/openbox.mo
88
%%NLS%%share/locale/es/LC_MESSAGES/openbox.mo
98
%%NLS%%share/locale/es/LC_MESSAGES/openbox.mo
99
%%NLS%%share/locale/et/LC_MESSAGES/openbox.mo
89
%%NLS%%share/locale/fi/LC_MESSAGES/openbox.mo
100
%%NLS%%share/locale/fi/LC_MESSAGES/openbox.mo
90
%%NLS%%share/locale/fr/LC_MESSAGES/openbox.mo
101
%%NLS%%share/locale/fr/LC_MESSAGES/openbox.mo
91
%%NLS%%share/locale/hr/LC_MESSAGES/openbox.mo
102
%%NLS%%share/locale/it/LC_MESSAGES/openbox.mo
92
%%NLS%%share/locale/ja/LC_MESSAGES/openbox.mo
103
%%NLS%%share/locale/nl/LC_MESSAGES/openbox.mo
93
%%NLS%%share/locale/no/LC_MESSAGES/openbox.mo
104
%%NLS%%share/locale/no/LC_MESSAGES/openbox.mo
94
%%NLS%%share/locale/pl/LC_MESSAGES/openbox.mo
105
%%NLS%%share/locale/pl/LC_MESSAGES/openbox.mo
95
%%NLS%%share/locale/pt/LC_MESSAGES/openbox.mo
106
%%NLS%%share/locale/pt/LC_MESSAGES/openbox.mo
107
%%NLS%%share/locale/pt_BR/LC_MESSAGES/openbox.mo
96
%%NLS%%share/locale/ru/LC_MESSAGES/openbox.mo
108
%%NLS%%share/locale/ru/LC_MESSAGES/openbox.mo
97
%%NLS%%share/locale/sk/LC_MESSAGES/openbox.mo
109
%%NLS%%share/locale/sk/LC_MESSAGES/openbox.mo
98
%%NLS%%share/locale/sv/LC_MESSAGES/openbox.mo
110
%%NLS%%share/locale/sv/LC_MESSAGES/openbox.mo
111
%%NLS%%share/locale/zh_CN/LC_MESSAGES/openbox.mo
99
%%NLS%%share/locale/zh_TW/LC_MESSAGES/openbox.mo
112
%%NLS%%share/locale/zh_TW/LC_MESSAGES/openbox.mo
100
%%NLS%%share/locale/en@quot/LC_MESSAGES/openbox.mo
113
%%NLS%%share/locale/en@quot/LC_MESSAGES/openbox.mo
101
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/openbox.mo
114
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/openbox.mo
115
%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
116
%%NLS%%@dirrmtry share/locale/bn_IN
102
%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
117
%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
103
%%NLS%%@dirrmtry share/locale/en@quot
118
%%NLS%%@dirrmtry share/locale/en@quot
104
%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
119
%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
105
%%NLS%%@dirrmtry share/locale/en@boldquot
120
%%NLS%%@dirrmtry share/locale/en@boldquot
106
@dirrm share/themes/syscrash/openbox-3
121
@dirrm %%DOCSDIR%%/xbm
107
@dirrm share/themes/syscrash
122
@dirrm %%DOCSDIR%%
108
@dirrm share/themes/orang/openbox-3
123
@dirrm share/themes/Artwiz-boxed/openbox-3
109
@dirrm share/themes/orang
124
@dirrm share/themes/Artwiz-boxed
110
@dirrm share/themes/bear2/openbox-3
125
@dirrm share/themes/Bear2/openbox-3
111
@dirrm share/themes/bear2
126
@dirrm share/themes/Bear2
112
@dirrm share/themes/artwiz-boxed/openbox-3
127
@dirrm share/themes/Clearlooks/openbox-3
113
@dirrm share/themes/artwiz-boxed
128
@dirrm share/themes/Clearlooks
114
@dirrm share/themes/Natura/openbox-3
129
@dirrm share/themes/Clearlooks-Olive/openbox-3
115
@dirrm share/themes/Natura
130
@dirrm share/themes/Clearlooks-Olive
116
@dirrm share/themes/Mikachu/openbox-3
131
@dirrm share/themes/Mikachu/openbox-3
117
@dirrm share/themes/Mikachu
132
@dirrm share/themes/Mikachu
133
@dirrm share/themes/Natura/openbox-3
134
@dirrm share/themes/Natura
135
@dirrm share/themes/Orang/openbox-3
136
@dirrm share/themes/Orang
137
@dirrm share/themes/Syscrash/openbox-3
138
@dirrm share/themes/Syscrash
118
@dirrmtry share/themes
139
@dirrmtry share/themes
119
@dirrm %%DATADIR%%
140
@comment @dirrm %%DATADIR%%
120
@dirrmtry share/gnome/wm-properties
141
@dirrmtry share/gnome/wm-properties
121
@dirrmtry share/gnome
142
@dirrmtry share/gnome
122
@dirrmtry libdata/pkgconfig
143
@dirrmtry libdata/pkgconfig
123
@dirrm include/openbox/3.3/openbox
144
@dirrm include/openbox/3.4/openbox
124
@dirrm include/openbox/3.3
145
@dirrm include/openbox/3.4
125
@dirrm include/openbox
146
@dirrm include/openbox
126
@dirrm etc/xdg/openbox
147
@dirrm etc/xdg/openbox
127
@dirrmtry etc/xdg
148
@dirrm etc/xdg
149
@dirrmtry share/xsessions
(-)files/patch-openbox-menuframe.c (-18 lines)
Removed Link Here
1
--- openbox/menuframe.c.orig	Tue Sep 12 21:24:28 2006
2
+++ openbox/menuframe.c	Tue Sep 12 21:24:50 2006
3
@@ -675,12 +675,14 @@
4
 
5
 void menu_frame_hide_all()
6
 {
7
+    GList *it;
8
+
9
     if (config_submenu_show_delay) {
10
         /* remove any submenu open requests */
11
         ob_main_loop_timeout_remove(ob_main_loop,
12
                                     menu_entry_frame_submenu_timeout);
13
     }
14
-    GList *it = g_list_last(menu_frame_visible);
15
+    it = g_list_last(menu_frame_visible);
16
     if (it) 
17
         menu_frame_hide(it->data);
18
 }
(-)files/patch-render-font.c (-26 lines)
Removed Link Here
1
--- render/font.c.orig	Sat Aug 26 22:15:51 2006
2
+++ render/font.c	Tue Sep 12 21:14:46 2006
3
@@ -92,6 +92,8 @@
4
 #ifdef USE_PANGO
5
     guchar *tmp_string = NULL;
6
     gint tmp_int;
7
+    gchar *locale, *p;
8
+    PangoFontMetrics *metrics;
9
 #endif /* USE_PANGO */
10
 
11
     if (!(pat = XftNameParse(fontstring)))
12
@@ -135,13 +137,12 @@
13
     }
14
 
15
     /* based on gtkmain.c gtk_get_default_language() */
16
-    gchar *locale, *p;
17
     locale = g_strdup(setlocale(LC_CTYPE, NULL));
18
     if ((p = strchr(locale, '.')))
19
         *p = '\0';
20
     if ((p = strchr(locale, '@')))
21
         *p = '\0';
22
-    PangoFontMetrics *metrics = 
23
+    metrics = 
24
         pango_context_get_metrics(context, out->pango_font_description,
25
                                   pango_language_from_string(locale));
26
     out->pango_ascent = pango_font_metrics_get_ascent(metrics);
(-)files/patch-render-gradient.c (-23 lines)
Removed Link Here
1
--- render/gradient.c.orig	Sat Aug 26 22:15:51 2006
2
+++ render/gradient.c	Tue Sep 12 21:14:46 2006
3
@@ -371,6 +371,9 @@
4
     RrPixel32 current;
5
     RrColor *primary_light, *secondary_light;
6
 
7
+    VARS(y1);
8
+    VARS(y3);
9
+
10
     r = sf->primary->r;
11
     r += r >> 2;
12
     g = sf->primary->g;
13
@@ -393,10 +396,8 @@
14
     if (b > 0xFF) b = 0xFF;
15
     secondary_light = RrColorNew(a->inst, r, g, b);
16
 
17
-    VARS(y1);
18
     SETUP(y1, primary_light, sf->primary, (h / 2) -1);
19
   
20
-    VARS(y3);
21
     SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
22
 
23
     for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */

Return to bug 113499