Overdue bump to 1.2.25, spring cleaning too

(Portage version: 2.1_pre7-r4)

11 files changed, 14 insertions, 88 deletions

diff --git a/x11-wm/icewm/files/digest-icewm-1.2.20 b/x11-wm/icewm/files/digest-icewm-1.2.20
deleted file mode 100644
index afeadd967029..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c94dae56fbf9aa085a1d780538018c1 icewm-1.2.20.tar.gz 948530
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.21 b/x11-wm/icewm/files/digest-icewm-1.2.21
deleted file mode 100644
index e24f1bc54b52..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c17d89fea9044d79a29b88aa6199968 icewm-1.2.21.tar.gz 969491
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.22 b/x11-wm/icewm/files/digest-icewm-1.2.22
deleted file mode 100644
index 79519a62ac76..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed156744dc2967518cea4eb952d1983e icewm-1.2.22.tar.gz 990315
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.25 b/x11-wm/icewm/files/digest-icewm-1.2.25
new file mode 100644
index 000000000000..1eaef6bcb480
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.25
@@ -0,0 +1,3 @@
+MD5 af69d095a6c6fba1f73f80e966bc4459 icewm-1.2.25.tar.gz 1042790
+RMD160 58bab630875aea02c64c2ca9bcbe80cf2338cdb3 icewm-1.2.25.tar.gz 1042790
+SHA256 b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa icewm-1.2.25.tar.gz 1042790
diff --git a/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch b/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
deleted file mode 100644
index 90c442b1e769..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceicon.cc	2005-01-09 15:48:23.000000000 -0600
-+++ /root/iceicon.cc	2005-05-21 01:00:11.000000000 -0500
-@@ -161,7 +161,7 @@
- void YIconView::updateItems() {
-     if (fItems == 0) {
-         //fMaxWidth = 0;
--        fItems = new (YIconItem *)[fItemCount];
-+        fItems = new YIconItem *[fItemCount];
-         if (fItems) {
-             YIconItem *a = getFirst();
-             int n = 0;
diff --git a/x11-wm/icewm/files/icewm-1.2.20.testmap.patch b/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
deleted file mode 100644
index 0c6fb65b9221..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- testmap.cc	2005-01-09 15:48:24.000000000 -0600
-+++ /root/testmap.cc	2005-05-21 00:57:32.000000000 -0500
-@@ -63,10 +63,11 @@
-     
-     while (1) {
-         if (argc > 1) {
--            int nwx, nwy, nww, nwh;
-+            int nwx, nwy;
-+	    unsigned int nww, nwh;
-             int nrx, nry;
--            int bw;
--            int depth;
-+            unsigned int bw;
-+            unsigned int depth;
-             Window xroot, child;
- 
-             XGetGeometry(display, window, &xroot, &nwx, &nwy, &nww, &nwh, &bw, &depth);
diff --git a/x11-wm/icewm/files/icewm-1.2.21.testmap.patch b/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
deleted file mode 100644
index 0c6fb65b9221..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- testmap.cc	2005-01-09 15:48:24.000000000 -0600
-+++ /root/testmap.cc	2005-05-21 00:57:32.000000000 -0500
-@@ -63,10 +63,11 @@
-     
-     while (1) {
-         if (argc > 1) {
--            int nwx, nwy, nww, nwh;
-+            int nwx, nwy;
-+	    unsigned int nww, nwh;
-             int nrx, nry;
--            int bw;
--            int depth;
-+            unsigned int bw;
-+            unsigned int depth;
-             Window xroot, child;
- 
-             XGetGeometry(display, window, &xroot, &nwx, &nwy, &nww, &nwh, &bw, &depth);
diff --git a/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch
deleted file mode 100644
index 2eeb379ecb41..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ybutton.cc.orig	2004-11-07 13:49:19.926827944 -0600
-+++ ybutton.cc	2004-11-07 13:49:30.113279368 -0600
-@@ -103,8 +103,7 @@
-         g.setColor(surface.color);
- 
-         if (wmLook == lookMetal) {
--            g.drawBorderM(x, y, w - 1, h - 1, !d);
--            d = 0; x += 2; y += 2; w -= 4; h -= 4;
-+	    d=0;
-         } else if (wmLook == lookGtk) {
-             g.drawBorderG(x, y, w - 1, h - 1, !d);
-             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
-@@ -114,7 +113,6 @@
-         }
- 
-         paint(g, d, YRect(x, y, w, h));
--        paintFocus(g, YRect(x, y, w, h));
-     }
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch
deleted file mode 100644
index 2eeb379ecb41..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ybutton.cc.orig	2004-11-07 13:49:19.926827944 -0600
-+++ ybutton.cc	2004-11-07 13:49:30.113279368 -0600
-@@ -103,8 +103,7 @@
-         g.setColor(surface.color);
- 
-         if (wmLook == lookMetal) {
--            g.drawBorderM(x, y, w - 1, h - 1, !d);
--            d = 0; x += 2; y += 2; w -= 4; h -= 4;
-+	    d=0;
-         } else if (wmLook == lookGtk) {
-             g.drawBorderG(x, y, w - 1, h - 1, !d);
-             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
-@@ -114,7 +113,6 @@
-         }
- 
-         paint(g, d, YRect(x, y, w, h));
--        paintFocus(g, YRect(x, y, w, h));
-     }
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch b/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch
new file mode 100644
index 000000000000..eba1c2bfffb2
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch
@@ -0,0 +1,11 @@
+--- icewm-1.2.25/src/ylocale.cc.orig	2006-04-08 19:03:17.000000000 -0500
++++ icewm-1.2.25/src/ylocale.cc	2006-04-08 19:04:46.000000000 -0500
+@@ -152,7 +152,7 @@ YUChar *YLocale::unicodeString(const YLC
+     char * inbuf((char *) lStr), * outbuf((char *) uStr);
+     size_t inlen(lLen), outlen(4 * lLen);
+ 
+-    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
++    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
+         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
+ 
+     *((YUChar *) outbuf) = 0;
diff --git a/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch
index 2eeb379ecb41..2eeb379ecb41 100644
--- a/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch
+++ b/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch