Accepting request 122062 from X11:windowmanagers

- Fix build with gcc 4.7
- Fix build with new X11 headers (forwarded request 121755 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/122062
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=33

icewm-gcc47.patch

@@ -0,0 +1,13 @@
+Index: icewm-1.3.7/src/yarray.h
+===================================================================
+--- icewm-1.3.7.orig/src/yarray.h
++++ icewm-1.3.7/src/yarray.h
+@@ -152,7 +152,7 @@ public:
+     }
+ 
+     virtual void remove(const typename YArray<DataType *>::SizeType index) {
+-        if (index < YArray<DataType *>::getCount()) delete getItem(index);
++        if (index < YArray<DataType *>::getCount()) delete this->getItem(index);
+         YArray<DataType *>::remove(index);
+     }
+     

icewm-x11.patch

@@ -0,0 +1,21 @@
+Description: Don't use "deprecated" as identifier, will FTBFS if another
+ library defines functions as deprecated.
+Author: Andreas Moog <amoog@ubuntu.com>
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
+Forwarded: Yes
+
+--- icewm-1.3.7.orig/src/base.h
++++ icewm-1.3.7/src/base.h
+@@ -2,9 +2,9 @@
+ #define __BASE_H
+ 
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+-#define deprecated __attribute__((deprecated))
++#define ICEWM_deprecated __attribute__((deprecated))
+ #else
+-#define deprecated
++#define ICEWM_deprecated
+ #endif
+ 
+ /*** Atomar Data Types ********************************************************/

icewm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 22 10:25:52 UTC 2012 - idonmez@suse.com
+
+- Fix build with gcc 4.7
+- Fix build with new X11 headers
+
 -------------------------------------------------------------------
 Tue Dec 20 20:49:49 UTC 2011 - coolo@suse.com
 

icewm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package icewm
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           icewm
 BuildRequires:  autoconf
 BuildRequires:  gcc-c++
@@ -28,7 +29,9 @@ BuildRequires:  pkgconfig(libgnomeui-2.0)
 BuildRequires:  fdupes
 %endif
 Provides:       windowmanager
-Requires:       icewm-bin, xdg-menu, desktop-data
+Requires:       desktop-data
+Requires:       icewm-bin
+Requires:       xdg-menu
 Version:        1.3.7
 Release:        0
 Source:         icewm-%version.tar.bz2
@@ -41,6 +44,8 @@ Patch5:         icewm-1.2.35-empty-winmenu.patch
 Patch6:         icewm-1.2.35-unaligned-access.patch
 Patch7:         icewm-1.3.6-winoptions.patch
 Patch8:         icewm-linking.patch
+Patch9:         icewm-gcc47.patch
+Patch10:        icewm-x11.patch
 # applied in %%build
 Patch99:        icewm-preferences.patch
 Url:            http://www.icewm.org/
@@ -111,6 +116,8 @@ Authors:
 %patch6
 %patch7 -p1
 %patch8
+%patch9 -p1
+%patch10 -p1
 
 %build
 autoconf