OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Feb-2006 10:15:23
Branch: HEAD Handle: 2006020409152200
Modified files:
openpkg-src/icewm icewm.patch icewm.spec
Log:
upgrading package: icewm 1.2.24 -> 1.2.25
Summary:
Revision Changes Path
1.10 +8 -45 openpkg-src/icewm/icewm.patch
1.26 +2 -2 openpkg-src/icewm/icewm.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/icewm/icewm.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 icewm.patch
--- openpkg-src/icewm/icewm.patch 23 Jan 2006 12:39:44 -0000 1.9
+++ openpkg-src/icewm/icewm.patch 4 Feb 2006 09:15:22 -0000 1.10
@@ -1,6 +1,6 @@
Index: src/acpustatus.h
---- src/acpustatus.h.orig 2004-08-16 06:58:30 +0200
-+++ src/acpustatus.h 2004-08-16 20:12:37 +0200
+--- src/acpustatus.h.orig 2006-02-03 07:24:27 +0100
++++ src/acpustatus.h 2006-02-04 10:09:54 +0100
@@ -1,7 +1,7 @@
#ifndef __CPUSTATUS_H
#define __CPUSTATUS_H
@@ -32,22 +32,9 @@
};
#else
#undef CONFIG_APPLET_CPU_STATUS
-Index: src/wmapp.cc
---- src/wmapp.cc.orig 2004-08-16 06:58:30 +0200
-+++ src/wmapp.cc 2004-08-16 20:12:37 +0200
-@@ -1429,6 +1429,9 @@
- #endif
-
- int main(int argc, char **argv) {
-+#ifdef __FreeBSD__
-+ setegid( getgid() );
-+#endif
- YLocale locale;
-
- for (char ** arg = argv + 1; arg < argv + argc; ++arg) {
Index: src/wmclient.h
---- src/wmclient.h.orig 2004-08-16 06:58:30 +0200
-+++ src/wmclient.h 2004-08-16 20:12:37 +0200
+--- src/wmclient.h.orig 2006-02-03 07:24:27 +0100
++++ src/wmclient.h 2006-02-04 10:09:54 +0100
@@ -6,6 +6,8 @@
#include "ymenu.h"
#include "MwmUtil.h"
@@ -58,10 +45,10 @@
class WindowListItem;
class YIcon;
Index: src/ylocale.cc
---- src/ylocale.cc.orig 2004-08-16 06:58:31 +0200
-+++ src/ylocale.cc 2004-08-16 20:12:37 +0200
+--- src/ylocale.cc.orig 2006-02-03 07:24:27 +0100
++++ src/ylocale.cc 2006-02-04 10:09:54 +0100
@@ -149,7 +149,8 @@
- return NULL;
+ return NULL;
YUChar * uStr(new YUChar[lLen + 1]);
- char * inbuf((char *) lStr), * outbuf((char *) uStr);
@@ -69,28 +56,4 @@
+ char * outbuf((char *) uStr);
size_t inlen(lLen), outlen(4 * lLen);
- if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf,
&outlen))
-Index: src/wmapp.cc
---- src/wmapp.cc.orig 2006-01-23 09:04:55 +0100
-+++ src/wmapp.cc 2006-01-23 13:35:48 +0100
-@@ -345,7 +345,7 @@
- 0, PATH_MAX, False, XA_STRING,
- &r_type, &r_format,
- &count, &bytes_remain,
-- (char **) &icewmFontPath) ==
-+ (unsigned char **)&icewmFontPath) ==
- Success && icewmFontPath) {
- if (r_type == XA_STRING && r_format == 8) {
- for (int n(ndirs - 1); n > 0; --n) // ---- remove death
paths ---
-Index: src/yinput.cc
---- src/yinput.cc.orig 2006-01-23 09:04:55 +0100
-+++ src/yinput.cc 2006-01-23 13:36:20 +0100
-@@ -418,7 +418,7 @@
- selection.target, &type, &format,
- (unsigned long *)&nitems,
- (unsigned long *)&extra,
-- (char **)&data);
-+ (unsigned char **)&data);
-
- if (nitems > 0 && data != NULL) {
- replaceSelection(data, nitems);
+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char
**>(&inbuf), &inlen, &outbuf, &outlen))
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icewm/icewm.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 icewm.spec
--- openpkg-src/icewm/icewm.spec 23 Jan 2006 12:39:45 -0000 1.25
+++ openpkg-src/icewm/icewm.spec 4 Feb 2006 09:15:22 -0000 1.26
@@ -32,8 +32,8 @@
Class: EVAL
Group: XWindow
License: GPL
-Version: 1.2.24
-Release: 20060123
+Version: 1.2.25
+Release: 20060204
# package options
%option with_iconv no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
