OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 28-Aug-2003 14:22:21
Branch: HEAD Handle: 2003082813221802
Modified files:
openpkg-re/vcheck vc.icewm
openpkg-src/icewm icewm.patch icewm.spec
openpkg-web news.txt
Log:
upgrading package: icewm 1.2.10 -> 1.2.12
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-re/vcheck/vc.icewm
1.3 +0 -79 openpkg-src/icewm/icewm.patch
1.5 +2 -2 openpkg-src/icewm/icewm.spec
1.6321 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.icewm
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.icewm
--- openpkg-re/vcheck/vc.icewm 14 Aug 2003 21:09:10 -0000 1.2
+++ openpkg-re/vcheck/vc.icewm 28 Aug 2003 12:22:18 -0000 1.3
@@ -2,7 +2,7 @@
}
prog icewm = {
- version = 1.2.10
+ version = 1.2.12
url = http://ftp1.sourceforge.net/icewm/
regex = icewm-(\d+\.\d+\.\d+)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icewm/icewm.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 icewm.patch
--- openpkg-src/icewm/icewm.patch 14 Aug 2003 13:52:33 -0000 1.2
+++ openpkg-src/icewm/icewm.patch 28 Aug 2003 12:22:20 -0000 1.3
@@ -119,73 +119,6 @@
return false;
#endif // if 0
}
---- src/ylocale.cc.orig Tue Oct 9 23:54:04 2001
-+++ src/ylocale.cc Wed Feb 20 17:32:28 2002
-@@ -18,7 +18,9 @@
-
- #ifdef CONFIG_I18N
- #include <errno.h>
-+#if __FreeBSD__ >= 5
- #include <langinfo.h>
-+#endif
- #include <locale.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -31,6 +33,41 @@
- YLocale * YLocale::locale(NULL);
- #endif
-
-+#ifdef CONFIG_I18N
-+#if __FreeBSD__ < 5
-+#undef CONFIG_NL_CODESETS
-+#define CONFIG_NL_CODESETS 0
-+char* icewm_nl_langinfo(void* item) {
-+ char* mylocale = setlocale(LC_ALL, "");
-+
-+ if( mylocale == NULL || *mylocale == '\0' )
-+ return NULL;
-+
-+ if( strncmp(mylocale, "ja", strlen("ja")) == 0 ) {
-+ return strdup("EUC-JP");
-+ } if( strncmp(mylocale, "zh_TW", strlen("zh_TW")) == 0 ) {
-+ return strdup("BIG5");
-+ } if( strncmp(mylocale, "ko", strlen("ko")) == 0 ) {
-+ return strdup("EUC-KR");
-+ } if( strncmp(mylocale, "ru", strlen("ru")) == 0 ) {
-+ return "KOI8-R";
-+ } if( strncmp(mylocale, "ro", strlen("ro")) == 0 ) {
-+ return "ISO-8859-2";
-+ } if( strncmp(mylocale, "hr", strlen("hr")) == 0 ) {
-+ return "ISO-8859-2";
-+ } if( strncmp(mylocale, "hu", strlen("hu")) == 0 ) {
-+ return "ISO-8859-2";
-+ } if( strncmp(mylocale, "pl", strlen("pl")) == 0 ) {
-+ return "ISO-8859-2";
-+ } if( strncmp(mylocale, "lt", strlen("lt")) == 0 ) {
-+ return "ISO-8859-13";
-+ }
-+
-+ return NULL;
-+}
-+#endif
-+#endif /* CONFIG_I18N */
-+
- #ifndef CONFIG_I18N
- YLocale::YLocale(char const * ) {
- #else
-@@ -45,8 +82,12 @@
- char const * codeset("");
- int const codesetItems[] = { CONFIG_NL_CODESETS };
-
-+#if __FreeBSD__ >= 5
- for (int const * csi(codesetItems); *csi &&
- NULL != (codeset = nl_langinfo(*csi)) && '\0' == *codeset; ++csi);
-+#else
-+ codeset = icewm_nl_langinfo(NULL);
-+#endif
-
- if (NULL == codeset || '\0' == *codeset) {
- warn(_("Failed to determinate the current locale's codeset. "
--- src/sysdep.h.orig Tue Oct 9 23:54:03 2001
+++ src/sysdep.h Wed Feb 20 15:22:43 2002
@@ -57,7 +57,9 @@
@@ -480,15 +413,3 @@
class YFrameWindow;
class WindowListItem;
---- src/decorate.cc.orig Mon Aug 11 20:22:16 2003
-+++ src/decorate.cc Thu Aug 14 15:48:23 2003
-@@ -293,7 +293,9 @@
- ShapeBounding, 0, 0, None, ShapeSet);
- }
- #endif
-+#ifdef CONFIG_SHAPE
- setShape();
-+#endif
- }
-
- void YFrameWindow::configure(const YRect &r, const bool resized) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icewm/icewm.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 icewm.spec
--- openpkg-src/icewm/icewm.spec 14 Aug 2003 13:52:33 -0000 1.4
+++ openpkg-src/icewm/icewm.spec 28 Aug 2003 12:22:20 -0000 1.5
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: XWindow
License: GPL
-Version: 1.2.10
-Release: 20030814
+Version: 1.2.12
+Release: 20030828
# package options
%option with_iconv no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6320 -r1.6321 news.txt
--- openpkg-web/news.txt 28 Aug 2003 10:13:29 -0000 1.6320
+++ openpkg-web/news.txt 28 Aug 2003 12:22:19 -0000 1.6321
@@ -1,3 +1,4 @@
+28-Aug-2003: Upgraded package: P<icewm-1.2.12-20030828>
28-Aug-2003: Upgraded package: P<perl-crypto-20030828-20030828>
28-Aug-2003: Upgraded package: P<ncftp-3.1.6-20030828>
28-Aug-2003: Upgraded package: P<pgadmin-0.9.1.20030828-20030828>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
