Your message dated Fri, 26 May 2006 12:17:23 +0900
with message-id <[EMAIL PROTECTED]>
and subject line Closing amaterus fixed bugs by NMU
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: amaterus
Severity: normal
Tags: patch
When building 'amaterus' on amd64 with gcc-4.0,
I get the following error:
gcc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/include/gnome-xml
-DXTERM=\"/usr/bin/x-terminal-emulator\" -g -O2 -Wall -Wcast-align
-Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith
-Wshadow -c wmbasewindow.c
wmbasewindow.c: In function 'wm_basewindow_anyevent_filter':
wmbasewindow.c:175: error: invalid lvalue in assignment
wmbasewindow.c:178: error: invalid lvalue in assignment
wmbasewindow.c:186: error: invalid lvalue in assignment
wmbasewindow.c:189: error: invalid lvalue in assignment
make[3]: *** [wmbasewindow.o] Error 1
make[3]: Leaving directory `/amaterus-0.34.1/src'
With the attached patch 'amaterus' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmbasewindow.c ./src/wmbasewindow.c
--- ../tmp-orig/amaterus-0.34.1/src/wmbasewindow.c 2000-07-25
11:03:52.000000000 +0200
+++ ./src/wmbasewindow.c 2005-01-05 22:20:02.391098040 +0100
@@ -172,10 +172,10 @@
xevent->xconfigurerequest.height,
xevent->xconfigurerequest.value_mask);
if(xevent->xconfigurerequest.value_mask & CWX) {
- WM_CLIENT_X(data) = xevent->xconfigurerequest.x;
+ ((WmClient *)data)->x = xevent->xconfigurerequest.x;
}
if(xevent->xconfigurerequest.value_mask & CWY) {
- WM_CLIENT_Y(data) = xevent->xconfigurerequest.y;
+ ((WmClient *)data)->y = xevent->xconfigurerequest.y;
}
if(xevent->xconfigurerequest.value_mask & (CWX | CWY)) {
XMoveWindow(GDK_DISPLAY(),
@@ -183,10 +183,10 @@
WM_CLIENT_X(data), WM_CLIENT_Y(data));
}
if(xevent->xconfigurerequest.value_mask & CWWidth) {
- WM_CLIENT_WIDTH(data) = xevent->xconfigurerequest.width;
+ ((WmClient *)data)->width = xevent->xconfigurerequest.width;
}
if(xevent->xconfigurerequest.value_mask & CWHeight) {
- WM_CLIENT_HEIGHT(data) = xevent->xconfigurerequest.height;
+ ((WmClient *)data)->height = xevent->xconfigurerequest.height;
}
if(xevent->xconfigurerequest.value_mask & (CWWidth | CWHeight)) {
gtk_widget_set_usize(data,
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmclient.c ./src/wmclient.c
--- ../tmp-orig/amaterus-0.34.1/src/wmclient.c 2000-11-11 18:05:36.000000000
+0100
+++ ./src/wmclient.c 2005-01-05 22:36:16.025083176 +0100
@@ -517,7 +517,7 @@
wm_message("WmClient[%x]: unmap event\n", WM_CLIENT_XWINDOW(widget));
gtk_widget_hide(gtk_widget_get_toplevel(widget));
if(WM_CLIENT_STATE(widget) != IconicState) {
- WM_CLIENT_STATE(widget) = WithdrawnState;
+ ((WmClient*)widget)->state = WithdrawnState;
wm_client_set_WMState(widget, WithdrawnState);
} else {
wm_client_set_WMState(widget, IconicState);
@@ -531,7 +531,7 @@
gtk_widget_show(widget);
wm_client_set_WMState(widget, NormalState);
- WM_CLIENT_STATE(widget) = NormalState;
+ ((WmClient*)widget)->state = NormalState;
gtk_widget_set_uposition(gtk_widget_get_toplevel(widget),
WM_CLIENT_X(widget), WM_CLIENT_Y(widget));
gtk_widget_show(gtk_widget_get_toplevel(widget));
@@ -657,8 +657,8 @@
dw = width - WM_CLIENT_WIDTH (widget);
dh = height - WM_CLIENT_HEIGHT(widget);
- WM_CLIENT_WIDTH (widget) = width;
- WM_CLIENT_HEIGHT(widget) = height;
+ ((WmClient*)widget)->width = width;
+ ((WmClient*)widget)->height = height;
/* gdk_window_resize(gtk_widget_get_toplevel(widget)->window, */
/* gtk_widget_get_toplevel(widget)->allocation.width+dw, */
/* gtk_widget_get_toplevel(widget)->allocation.height+dh); */
@@ -696,8 +696,8 @@
default:
dy = 0;
}
- WM_CLIENT_X(widget) += dx;
- WM_CLIENT_Y(widget) += dy;
+ ((WmClient*)widget)->x += dx;
+ ((WmClient*)widget)->y += dy;
x = WM_CLIENT_X(widget);
y = WM_CLIENT_Y(widget);
if(0){
@@ -725,8 +725,8 @@
static void wm_client_move_signal(GtkWidget *widget, gint x, gint y,
gpointer pointer)
{
- WM_CLIENT_X(widget) = x;
- WM_CLIENT_Y(widget) = y;
+ ((WmClient*)widget)->x = x;
+ ((WmClient*)widget)->y = y;
/* °ÜÆ°¤Ï¿Æ¥¦¥¤¥ó¥É¥¦ */
gdk_window_move(gtk_widget_get_toplevel(GTK_WIDGET(widget))->window, x, y);
@@ -763,10 +763,10 @@
wm_message("WmClient: set_geometry (%d, %d) %d x %d\n",
x, y, width, height);
- WM_CLIENT_X(client) = x;
- WM_CLIENT_Y(client) = y;
- WM_CLIENT_WIDTH(client) = width;
- WM_CLIENT_HEIGHT(client) = height;
+ ((WmClient*)client)->x = x;
+ ((WmClient*)client)->y = y;
+ ((WmClient*)client)->width = width;
+ ((WmClient*)client)->height = height;
}
static void wm_client_set_properties(WmClient *client)
@@ -795,24 +795,24 @@
if(XGetWMNormalHints(GDK_DISPLAY(),
WM_CLIENT_XWINDOW(client), &sh, &s) == 0) {
wm_message("WmClient: set properties Error\n");
- WM_CLIENT_SIZE_FLAG(client) = 0;
- WM_CLIENT_W_INC(client) = 1;
- WM_CLIENT_H_INC(client) = 1;
- WM_CLIENT_W_BASE(client)= 0;
- WM_CLIENT_H_BASE(client)= 0;
+ ((WmClient*)client)->size_flags = 0;
+ ((WmClient*)client)->width_inc = 1;
+ ((WmClient*)client)->height_inc = 1;
+ ((WmClient*)client)->base_width = 0;
+ ((WmClient*)client)->base_height = 0;
} else {
- WM_CLIENT_SIZE_FLAG(client) = sh.flags;
- WM_CLIENT_W_INC(client) = (sh.flags & PResizeInc) ? sh.width_inc : 1;
- WM_CLIENT_H_INC(client) = (sh.flags & PResizeInc) ? sh.height_inc : 1;
- WM_CLIENT_W_BASE(client)= (sh.flags & PBaseSize) ? sh.base_width : 0;
- WM_CLIENT_H_BASE(client)= (sh.flags & PBaseSize) ? sh.base_height : 0;
- WM_CLIENT_W_MIN(client) =
+ ((WmClient*)client)->size_flags = sh.flags;
+ ((WmClient*)client)->width_inc = (sh.flags & PResizeInc) ? sh.width_inc
: 1;
+ ((WmClient*)client)->height_inc = (sh.flags & PResizeInc) ?
sh.height_inc : 1;
+ ((WmClient*)client)->base_width = (sh.flags & PBaseSize) ?
sh.base_width : 0;
+ ((WmClient*)client)->base_height = (sh.flags & PBaseSize) ?
sh.base_height : 0;
+ ((WmClient*)client)->min_width =
(sh.flags & PMinSize) ? sh.min_width : WM_CLIENT_W_BASE(client);
- WM_CLIENT_W_MAX(client) =
+ ((WmClient*)client)->max_width =
(sh.flags & PMaxSize) ? sh.max_width : -1;
- WM_CLIENT_H_MIN(client) =
+ ((WmClient*)client)->min_height =
(sh.flags & PMinSize) ? sh.min_height : WM_CLIENT_H_BASE(client);
- WM_CLIENT_H_MAX(client) =
+ ((WmClient*)client)->max_height =
(sh.flags & PMaxSize) ? sh.max_height : -1;
}
}
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmdrag.c ./src/wmdrag.c
--- ../tmp-orig/amaterus-0.34.1/src/wmdrag.c 2000-02-02 05:55:38.000000000
+0100
+++ ./src/wmdrag.c 2005-01-05 22:29:59.195370000 +0100
@@ -35,10 +35,10 @@
while(list) {
/* WmClient ¤Î´Ø¿ô¤Ë¤¹¤Ù¤ */
- WM_CLIENT_X_PREV(list->data) = WM_CLIENT_X(list->data);
- WM_CLIENT_Y_PREV(list->data) = WM_CLIENT_Y(list->data);
- WM_CLIENT_W_PREV(list->data) = WM_CLIENT_WIDTH(list->data);
- WM_CLIENT_H_PREV(list->data) = WM_CLIENT_HEIGHT(list->data);
+ ((WmClient*)list->data)->priviousX = WM_CLIENT_X(list->data);
+ ((WmClient*)list->data)->priviousY = WM_CLIENT_Y(list->data);
+ ((WmClient*)list->data)->priviousWidth = WM_CLIENT_WIDTH(list->data);
+ ((WmClient*)list->data)->priviousHeight = WM_CLIENT_HEIGHT(list->data);
list = list->next;
}
}
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmiconify.c ./src/wmiconify.c
--- ../tmp-orig/amaterus-0.34.1/src/wmiconify.c 2000-03-03 19:39:08.000000000
+0100
+++ ./src/wmiconify.c 2005-01-05 22:29:33.003351792 +0100
@@ -32,7 +32,7 @@
WM_CLIENT_Y(WM_CLIENT(widget)));
gtk_widget_show(icon);
gtk_widget_hide(widget);
- WM_CLIENT_STATE(widget) = IconicState;
+ ((WmClient*)widget)->state = IconicState;
}
GtkWidget *wm_iconify_button_new(GtkWidget *client)
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmmain.c ./src/wmmain.c
--- ../tmp-orig/amaterus-0.34.1/src/wmmain.c 2000-11-12 00:41:54.000000000
+0100
+++ ./src/wmmain.c 2005-01-05 22:27:23.229080480 +0100
@@ -209,7 +209,7 @@
for(clients = wm_main_client_widgets(); clients; clients = clients->next) {
window = wm_window_border_add(clients->data);
gtk_widget_show(window);
- WM_CLIENT_STATE(clients->data) = NormalState;
+ ((WmClient*)clients->data)->state = NormalState;
if(wm_prop_get_WMState(clients->data) == IconicState) {
wm_client_iconify(clients->data);
diff -urN ../tmp-orig/amaterus-0.34.1/src/wmroot.c ./src/wmroot.c
--- ../tmp-orig/amaterus-0.34.1/src/wmroot.c 2000-07-26 16:47:40.000000000
+0200
+++ ./src/wmroot.c 2005-01-05 22:26:51.224945848 +0100
@@ -227,10 +227,10 @@
* Î㤨¤Ð Withdrawn ¾õÂÖ. (¤½¤ì°Ê³°¤Ë¤â¤¢¤ë¤Î¤«¤Ê?)
*/
if(xevent->xconfigurerequest.value_mask & CWX) {
- WM_CLIENT_X(client) = xevent->xconfigurerequest.x;
+ ((WmClient*)client)->x = xevent->xconfigurerequest.x;
}
if(xevent->xconfigurerequest.value_mask & CWY) {
- WM_CLIENT_Y(client) = xevent->xconfigurerequest.y;
+ ((WmClient*)client)->y = xevent->xconfigurerequest.y;
}
if(xevent->xconfigurerequest.value_mask & (CWX | CWY)) {
XMoveWindow(GDK_DISPLAY(),
@@ -238,10 +238,10 @@
WM_CLIENT_X(client), WM_CLIENT_Y(client));
}
if(xevent->xconfigurerequest.value_mask & CWWidth) {
- WM_CLIENT_WIDTH(client) = xevent->xconfigurerequest.width;
+ ((WmClient*)client)->width = xevent->xconfigurerequest.width;
}
if(xevent->xconfigurerequest.value_mask & CWHeight) {
- WM_CLIENT_HEIGHT(client) = xevent->xconfigurerequest.height;
+ ((WmClient*)client)->height = xevent->xconfigurerequest.height;
}
if(xevent->xconfigurerequest.value_mask & (CWWidth | CWHeight)) {
gtk_widget_set_usize(client,
@@ -279,7 +279,7 @@
WM_CLIENT_X(client), WM_CLIENT_Y(client));
gtk_widget_show(gtk_widget_get_toplevel(client));
wm_client_set_WMState(client, NormalState);
- WM_CLIENT_STATE(client) = NormalState;
+ ((WmClient*)client)->state = NormalState;
return_value = GDK_FILTER_REMOVE;
break;
--- End Message ---
--- Begin Message ---
Those bugs were fixed in 0.34.1-7.1 in NMU by Marc 'HE' Brockschmidt.
--- End Message ---
