summaryrefslogtreecommitdiff
path: root/wm/windowmaker
diff options
context:
space:
mode:
authorsekiya <sekiya@pkgsrc.org>2005-01-04 14:29:19 +0000
committersekiya <sekiya@pkgsrc.org>2005-01-04 14:29:19 +0000
commit004fb52bd037886c02883fc8228c91b94ed845ca (patch)
tree4d5b0d8109eca1a52011e65096e5f9bbff1fcd18 /wm/windowmaker
parent66273b2f3c188d24a639765a4f4ad702fe9f4cf2 (diff)
downloadpkgsrc-004fb52bd037886c02883fc8228c91b94ed845ca.tar.gz
64-bit fixes. Based on Xning Lee's patchset sent to port-amd64@; changed the
unsigned int -> long transformation to unsigned int -> unsigned long, just in case.
Diffstat (limited to 'wm/windowmaker')
-rw-r--r--wm/windowmaker/distinfo5
-rw-r--r--wm/windowmaker/patches/patch-ag34
-rw-r--r--wm/windowmaker/patches/patch-al19
3 files changed, 51 insertions, 7 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index e6fb4534e51..cdd8462ebaa 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/11/25 13:12:52 adam Exp $
+$NetBSD: distinfo,v 1.23 2005/01/04 14:29:19 sekiya Exp $
SHA1 (WindowMaker-0.91.0.tar.bz2) = 14fb553943b5cbfaaa867d28405b910e73d3b509
Size (WindowMaker-0.91.0.tar.bz2) = 2198266 bytes
@@ -8,8 +8,9 @@ SHA1 (patch-ac) = 7dfc20cd0b1e8638afb920bf631b44d918e59ac6
SHA1 (patch-ad) = 183b529289bbcb8dd7590296e546c166aef8da0a
SHA1 (patch-ae) = 70f21b44a45fad4b2bf48af75820a22ed1e4e857
SHA1 (patch-af) = dc749bbbea0c0e8d5b42d7d1be76b60b3af794b2
-SHA1 (patch-ag) = 84326d25c3e3d3305aeb58e8caf7a49565a1bd7c
+SHA1 (patch-ag) = 7a67f76434f61e43faa2dc434f5ee41d94b8ad55
SHA1 (patch-ah) = b391a48f723c62335448007a89c6958a7d922d86
SHA1 (patch-ai) = 03ef51a9dcc6d5b23f325231ea2d71fc0f13706f
SHA1 (patch-aj) = 69fd44e4fb526a0b3d61ff8c6d958da38178dca7
SHA1 (patch-ak) = bef271b75dd9164eaea04635b8c2bf48d50f7168
+SHA1 (patch-al) = a5341dcd7d59ea16bbcc7929cf205c6e5523642f
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
index f87f232129e..61cd0ba43c1 100644
--- a/wm/windowmaker/patches/patch-ag
+++ b/wm/windowmaker/patches/patch-ag
@@ -1,15 +1,39 @@
-$NetBSD: patch-ag,v 1.3 2004/11/12 21:17:55 kristerw Exp $
+$NetBSD: patch-ag,v 1.4 2005/01/04 14:29:19 sekiya Exp $
---- src/wmspec.c.orig Fri Nov 12 22:06:05 2004
-+++ src/wmspec.c Fri Nov 12 22:08:17 2004
-@@ -392,8 +392,9 @@
+--- src/wmspec.c.orig 2004-10-25 04:36:15.000000000 +0900
++++ src/wmspec.c 2005-01-04 23:18:46.000000000 +0900
+@@ -382,18 +382,19 @@
+ &nitems_return, &bytes_after_return, &prop_return);
+
+ if (rc==Success && prop_return) {
+- unsigned int *data = (unsigned int *)prop_return;
+- unsigned int pos = 0, len = 0;
+- unsigned int best_pos = 0, best_tmp = ~0;
++ unsigned long *data = (unsigned int *)prop_return;
++ unsigned long pos = 0, len = 0;
++ unsigned long best_pos = 0, best_tmp = ~0;
+ extern WPreferences wPreferences;
+- unsigned int pref_size = wPreferences.icon_size;
+- unsigned int pref_sq = pref_size*pref_size;
++ unsigned long pref_size = wPreferences.icon_size;
++ unsigned long pref_sq = pref_size*pref_size;
+ char *src, *dst;
RImage *new_rimage;
do {
-+ unsigned int tmp;
++ unsigned long tmp;
len = data[pos+0]*data[pos+1];
- unsigned int tmp = pref_sq-len;
+ tmp = pref_sq-len;
if (tmp < best_tmp && tmp > 0) {
best_tmp = tmp;
best_pos = pos;
+@@ -405,7 +406,7 @@
+ len = data[best_pos+0] * data[best_pos+1];
+ src = (char*)&data[best_pos+2];
+ dst = new_rimage->data;
+- for (pos=0; pos<len; ++pos, src+=4, dst+=4) {
++ for (pos=0; pos<len; ++pos, src+=sizeof(long), dst+=4) {
+ dst[0] = src[2]; /* R */
+ dst[1] = src[1]; /* G */
+ dst[2] = src[0]; /* B */
diff --git a/wm/windowmaker/patches/patch-al b/wm/windowmaker/patches/patch-al
new file mode 100644
index 00000000000..88deaa386b0
--- /dev/null
+++ b/wm/windowmaker/patches/patch-al
@@ -0,0 +1,19 @@
+--- WINGs/wwindow.c.orig 2004-10-24 11:58:20.000000000 +0900
++++ WINGs/wwindow.c 2005-01-04 23:17:30.000000000 +0900
+@@ -254,14 +254,14 @@
+ setMiniwindow(WMWindow *win, RImage *image)
+ {
+ WMScreen *scr= win->view->screen;
+- CARD32 *data;
++ unsigned long *data;
+ int x, y;
+ int o;
+
+ if (!image)
+ return;
+
+- data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
++ data = wmalloc((image->width * image->height + 2) * sizeof(unsigned long));
+
+ o= 0;
+ data[o++] = image->width;