- updated to 1.2.15pre1

Changed files:
    icewm-gcc34.patch -> 1.2
    icewm-link_with_g++.patch -> 1.2

diff --git a/icewm-gcc34.patch b/icewm-gcc34.patch
index 798547031d671d7d5d0ab88889e9e68766873418..4bfbaa72ecd1a8b2226d91cdd5e092de2861ab4c 100644 (file)
--- a/icewm-gcc34.patch
+++ b/icewm-gcc34.patch
@@ -1,24 +1,44 @@
-diff -ruN icewm-1.2.14pre10./src/iceicon.cc icewm-1.2.14pre10/src/iceicon.cc
---- icewm-1.2.14pre10./src/iceicon.cc  2004-02-29 16:09:01.000000000 +0100
-+++ icewm-1.2.14pre10/src/iceicon.cc   2004-03-13 22:37:58.480776816 +0100
-@@ -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 -ruN icewm-1.2.14pre10./src/wmwinlist.cc icewm-1.2.14pre10/src/wmwinlist.cc
---- icewm-1.2.14pre10./src/wmwinlist.cc        2004-02-29 16:09:01.000000000 +0100
-+++ icewm-1.2.14pre10/src/wmwinlist.cc 2004-03-13 22:38:16.576025920 +0100
-@@ -269,7 +269,7 @@
-     list->show();
-     scroll->show();
+diff -ruN icewm-1.2.15pre1./src/base.h icewm-1.2.15pre1/src/base.h
+--- icewm-1.2.15pre1./src/base.h       2004-07-06 22:05:46.914841864 +0200
++++ icewm-1.2.15pre1/src/base.h        2004-07-06 22:05:32.211077176 +0200
+@@ -171,7 +171,6 @@
+ int strpcmp(char const *str, char const *pfx, char const *delim = "=:");
+ unsigned strtoken(const char *str, const char *delim = " \t");
+ char const * strnxt(const char *str, const char *delim = " \t");
+-extern "C" char *basename(const char *filename);
  
--    workspaceItem = new (WindowListItem *)[workspaceCount + 1];
-+    workspaceItem = new WindowListItem *[workspaceCount + 1];
-     for (int ws = 0; ws < workspaceCount; ws++) {
-         workspaceItem[ws] = new WindowListItem(0, ws);
-         list->addItem(workspaceItem[ws]);
+ bool strequal(const char *a, const char *b);
+ int strnullcmp(const char *a, const char *b);
+diff -ruN icewm-1.2.15pre1./src/icesound.cc icewm-1.2.15pre1/src/icesound.cc
+--- icewm-1.2.15pre1./src/icesound.cc  2004-07-06 22:07:53.000000000 +0200
++++ icewm-1.2.15pre1/src/icesound.cc   2004-07-06 22:12:24.544392984 +0200
+@@ -190,7 +190,8 @@
+     virtual int init(int & argc, char **& argv);
+     
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+       CommandLine(int & argc, char **& argv, YOSSAudio & oss):
+           YCommandLine(argc, argv), oss(oss) {}
+@@ -326,7 +327,8 @@
+     virtual int init(int & argc, char **& argv);
+ 
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+       CommandLine(int & argc, char **& argv, YESDAudio & esd):
+           YCommandLine(argc, argv), esd(esd) {}
+@@ -502,7 +504,8 @@
+             Coefficient lVol = 1.0, Coefficient rVol = 1.0);
+ 
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+       CommandLine(int & argc, char **& argv, YY2Audio & yiff):
+           YCommandLine(argc, argv), yiff(yiff) {}

diff --git a/icewm-link_with_g++.patch b/icewm-link_with_g++.patch
index e7740e2d700c4e432c98d6fb99d5d869a6539ce7..22d88ffd05c60ffcdd521e3da10483214cab7454 100644 (file)
--- a/icewm-link_with_g++.patch
+++ b/icewm-link_with_g++.patch
@@ -1,14 +1,21 @@
-diff -dur icewm-1.2.14pre6.orig/configure.in icewm-1.2.14pre6/configure.in
---- icewm-1.2.14pre6.orig/configure.in 2003-12-30 22:40:04.000000000 +0100
-+++ icewm-1.2.14pre6/configure.in      2004-01-09 10:43:57.502805490 +0100
-@@ -29,9 +29,6 @@
- dnl ---- for linking. Also check how to turn off RTTI and exception handling ---
- if test x"$ac_cv_prog_gxx" != x; then
+diff -ruN icewm-1.2.15pre1./configure.in icewm-1.2.15pre1/configure.in
+--- icewm-1.2.15pre1./configure.in     2004-06-27 22:02:01.000000000 +0200
++++ icewm-1.2.15pre1/configure.in      2004-07-06 22:02:56.094810456 +0200
+@@ -21,7 +21,6 @@
+ 
+ dnl ---------- Checking for a C compiler in hope that it understands C++ too ---
+ dnl
+-ICE_PROG_CXX_LIGHT
+ AC_LANG_CPLUSPLUS
+ AC_PROG_CXX
+ 
+@@ -29,9 +28,6 @@
+ dnl ---- for linking. 
+ if test x"$ac_cv_prog_gxx" = x; then
    AC_PROG_CC
--  if test x"$ac_cv_prog_gcc" != x; then
+-  if test x"$ac_cv_prog_gcc" = x; then
 -    CXX_LINK=${CC}
 -  fi
-   
-   ICE_CXX_FLAG_ACCEPT(no_rtti, -fno-rtti)
-   dnl --- Intel C++ supports -fno-rtti, but doens't support -fno-*-exceptions
-Only in icewm-1.2.14pre6: configure.in~
+ fi
+ 
+ dnl ---------- Also check how to turn off RTTI and exception handling ---