[arch-commits] Commit in icewm/repos (22 files)
Eric Bélanger
eric at archlinux.org
Tue May 29 22:01:31 UTC 2012
Date: Tuesday, May 29, 2012 @ 18:01:31
Author: eric
Revision: 160075
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
icewm/repos/extra-i686/PKGBUILD
(from rev 160074, icewm/trunk/PKGBUILD)
icewm/repos/extra-i686/icewm-cpustatus.patch
(from rev 160074, icewm/trunk/icewm-cpustatus.patch)
icewm/repos/extra-i686/ignore_workarea_hints.patch
(from rev 160074, icewm/trunk/ignore_workarea_hints.patch)
icewm/repos/extra-i686/no_proc_acpi.patch
(from rev 160074, icewm/trunk/no_proc_acpi.patch)
icewm/repos/extra-i686/use_ICEWM_deprecated.patch
(from rev 160074, icewm/trunk/use_ICEWM_deprecated.patch)
icewm/repos/extra-i686/wmclient.patch
(from rev 160074, icewm/trunk/wmclient.patch)
icewm/repos/extra-x86_64/PKGBUILD
(from rev 160074, icewm/trunk/PKGBUILD)
icewm/repos/extra-x86_64/icewm-cpustatus.patch
(from rev 160074, icewm/trunk/icewm-cpustatus.patch)
icewm/repos/extra-x86_64/ignore_workarea_hints.patch
(from rev 160074, icewm/trunk/ignore_workarea_hints.patch)
icewm/repos/extra-x86_64/no_proc_acpi.patch
(from rev 160074, icewm/trunk/no_proc_acpi.patch)
icewm/repos/extra-x86_64/use_ICEWM_deprecated.patch
(from rev 160074, icewm/trunk/use_ICEWM_deprecated.patch)
icewm/repos/extra-x86_64/wmclient.patch
(from rev 160074, icewm/trunk/wmclient.patch)
Deleted:
icewm/repos/extra-i686/PKGBUILD
icewm/repos/extra-i686/ignore_workarea_hints.patch
icewm/repos/extra-i686/no_proc_acpi.patch
icewm/repos/extra-i686/use_ICEWM_deprecated.patch
icewm/repos/extra-i686/wmclient.patch
icewm/repos/extra-x86_64/PKGBUILD
icewm/repos/extra-x86_64/ignore_workarea_hints.patch
icewm/repos/extra-x86_64/no_proc_acpi.patch
icewm/repos/extra-x86_64/use_ICEWM_deprecated.patch
icewm/repos/extra-x86_64/wmclient.patch
------------------------------------------+
extra-i686/PKGBUILD | 73 ++++++++---------
extra-i686/icewm-cpustatus.patch | 45 ++++++++++
extra-i686/ignore_workarea_hints.patch | 124 ++++++++++++++---------------
extra-i686/no_proc_acpi.patch | 34 +++----
extra-i686/use_ICEWM_deprecated.patch | 42 ++++-----
extra-i686/wmclient.patch | 50 +++++------
extra-x86_64/PKGBUILD | 73 ++++++++---------
extra-x86_64/icewm-cpustatus.patch | 45 ++++++++++
extra-x86_64/ignore_workarea_hints.patch | 124 ++++++++++++++---------------
extra-x86_64/no_proc_acpi.patch | 34 +++----
extra-x86_64/use_ICEWM_deprecated.patch | 42 ++++-----
extra-x86_64/wmclient.patch | 50 +++++------
12 files changed, 416 insertions(+), 320 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-i686/PKGBUILD 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=icewm
-pkgver=1.3.7
-pkgrel=2
-pkgdesc="A Window Manager designed for speed, usability, and consistency"
-arch=('i686' 'x86_64')
-url="http://www.icewm.org/"
-license=('LGPL')
-depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
-makedepends=('xorg-mkfontdir')
-source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
- use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch wmclient.patch)
-sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803'
- 'ac8f352ba5ee33e19ce75fdeed890361550e125a'
- '49ca37ae41290f17a71a177b1f774235f91d79f1'
- 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338'
- 'd16b4b3ab269a657e735e343833973d000c0b35b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
- patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
- patch -p1 -i "${srcdir}/no_proc_acpi.patch"
- patch -p1 -i "${srcdir}/wmclient.patch"
- LIBS+="-lfontconfig" ./configure --prefix=/usr --sysconfdir=/etc \
- --enable-shaped-decorations --enable-gradients
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
-}
Copied: icewm/repos/extra-i686/PKGBUILD (from rev 160074, icewm/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=icewm
+pkgver=1.3.7
+pkgrel=3
+pkgdesc="A Window Manager designed for speed, usability, and consistency"
+arch=('i686' 'x86_64')
+url="http://www.icewm.org/"
+license=('LGPL')
+depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
+makedepends=('xorg-mkfontdir')
+source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
+ use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch
+ wmclient.patch icewm-cpustatus.patch)
+sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803'
+ 'ac8f352ba5ee33e19ce75fdeed890361550e125a'
+ '49ca37ae41290f17a71a177b1f774235f91d79f1'
+ 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338'
+ 'd16b4b3ab269a657e735e343833973d000c0b35b'
+ '0f4a02153496dadd26742f6bd3bdc166d7eafaed')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
+ patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
+ patch -p1 -i "${srcdir}/no_proc_acpi.patch"
+ patch -p1 -i "${srcdir}/wmclient.patch"
+ patch -p2 -i "${srcdir}/icewm-cpustatus.patch"
+ LIBS+="-lfontconfig" ./configure --prefix=/usr --sysconfdir=/etc \
+ --enable-shaped-decorations --enable-gradients
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
+}
Copied: icewm/repos/extra-i686/icewm-cpustatus.patch (from rev 160074, icewm/trunk/icewm-cpustatus.patch)
===================================================================
--- extra-i686/icewm-cpustatus.patch (rev 0)
+++ extra-i686/icewm-cpustatus.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,45 @@
+ icewm/src/acpustatus.cc | 31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+
+diff --git a/icewm/src/acpustatus.cc b/icewm/src/acpustatus.cc
+index 5e959d6..b9e5450 100644
+--- a/icewm/src/acpustatus.cc
++++ b/icewm/src/acpustatus.cc
+@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf, int buflen) {
+ }
+ closedir(dir);
+ }
++ else if ((dir = opendir("/sys/class/thermal")) != NULL) {
++ struct dirent *de;
++
++ while ((de = readdir(dir)) != NULL) {
++
++ int fd, seglen;
++
++ if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
++ continue;
++
++ sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
++ fd = open(namebuf, O_RDONLY);
++ if (fd != -1) {
++ int len = read(fd, buf, sizeof(buf) - 1);
++ buf[len - 4] = '\0';
++ seglen = strlen(buf) + 4;
++ if (retbuflen + seglen >= buflen) {
++ retbuflen = -retbuflen;
++ close(fd);
++ closedir(dir);
++ break;
++ }
++ retbuflen += seglen;
++ strcat(tempbuf, " ");
++ strncat(tempbuf, buf, seglen);
++ strcat(tempbuf, " C");
++ close(fd);
++ }
++ }
++ closedir(dir);
++ }
+ return retbuflen;
+ }
+
Deleted: extra-i686/ignore_workarea_hints.patch
===================================================================
--- extra-i686/ignore_workarea_hints.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-i686/ignore_workarea_hints.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,62 +0,0 @@
-Index: icewm-1.3.7/src/wmapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100
-@@ -187,7 +187,6 @@
- _XA_NET_ACTIVE_WINDOW,
- _XA_NET_CLOSE_WINDOW,
- _XA_NET_WM_STRUT,
-- _XA_NET_WORKAREA,
- _XA_NET_WM_STATE,
- _XA_NET_WM_STATE_MAXIMIZED_VERT,
- _XA_NET_WM_STATE_MAXIMIZED_HORZ,
-Index: icewm-1.3.7/src/wmmgr.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmmgr.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmmgr.cc 2012-01-15 16:59:18.000000000 +0100
-@@ -2114,11 +2114,6 @@
- area[ws * 4 + 3] = fWorkArea[ws][0].fMaxY - fWorkArea[ws][0].fMinY;
- }
-
-- XChangeProperty(xapp->display(), handle(),
-- _XA_NET_WORKAREA,
-- XA_CARDINAL,
-- 32, PropModeReplace,
-- (unsigned char *)area, nw * 4);
- delete [] area;
- #endif
- #ifdef GNOME1_HINTS
-Index: icewm-1.3.7/src/wmmgr.h
-===================================================================
---- icewm-1.3.7.orig/src/wmmgr.h 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmmgr.h 2012-01-15 16:59:18.000000000 +0100
-@@ -297,7 +297,6 @@
- extern Atom _XA_NET_CURRENT_DESKTOP; // OK
- ///extern Atom _XA_NET_DESKTOP_NAMES; // N/A
- extern Atom _XA_NET_ACTIVE_WINDOW; // OK
--extern Atom _XA_NET_WORKAREA; // OK
- extern Atom _XA_NET_SUPPORTING_WM_CHECK; // OK
- ///extern Atom _XA_NET_SUPPORTING_WM_CHECK; // N/A
- extern Atom _XA_NET_CLOSE_WINDOW; // OK
-Index: icewm-1.3.7/src/yxapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/yxapp.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yxapp.cc 2012-01-15 17:03:59.556423213 +0100
-@@ -67,7 +67,7 @@
- Atom _XA_NET_CLIENT_LIST_STACKING;
- Atom _XA_NET_NUMBER_OF_DESKTOPS;
- Atom _XA_NET_CURRENT_DESKTOP;
--Atom _XA_NET_WORKAREA;
-+//Atom _XA_NET_WORKAREA;
- Atom _XA_NET_WM_MOVERESIZE;
-
- Atom _XA_NET_WM_STRUT;
-@@ -286,7 +286,7 @@
- { &_XA_NET_CLIENT_LIST_STACKING, "_NET_CLIENT_LIST_STACKING" },
- { &_XA_NET_NUMBER_OF_DESKTOPS, "_NET_NUMBER_OF_DESKTOPS" },
- { &_XA_NET_CURRENT_DESKTOP, "_NET_CURRENT_DESKTOP" },
-- { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
-+// { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
- { &_XA_NET_WM_MOVERESIZE, "_NET_WM_MOVERESIZE" },
-
- { &_XA_NET_WM_STRUT, "_NET_WM_STRUT" },
Copied: icewm/repos/extra-i686/ignore_workarea_hints.patch (from rev 160074, icewm/trunk/ignore_workarea_hints.patch)
===================================================================
--- extra-i686/ignore_workarea_hints.patch (rev 0)
+++ extra-i686/ignore_workarea_hints.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,62 @@
+Index: icewm-1.3.7/src/wmapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100
+@@ -187,7 +187,6 @@
+ _XA_NET_ACTIVE_WINDOW,
+ _XA_NET_CLOSE_WINDOW,
+ _XA_NET_WM_STRUT,
+- _XA_NET_WORKAREA,
+ _XA_NET_WM_STATE,
+ _XA_NET_WM_STATE_MAXIMIZED_VERT,
+ _XA_NET_WM_STATE_MAXIMIZED_HORZ,
+Index: icewm-1.3.7/src/wmmgr.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmmgr.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmmgr.cc 2012-01-15 16:59:18.000000000 +0100
+@@ -2114,11 +2114,6 @@
+ area[ws * 4 + 3] = fWorkArea[ws][0].fMaxY - fWorkArea[ws][0].fMinY;
+ }
+
+- XChangeProperty(xapp->display(), handle(),
+- _XA_NET_WORKAREA,
+- XA_CARDINAL,
+- 32, PropModeReplace,
+- (unsigned char *)area, nw * 4);
+ delete [] area;
+ #endif
+ #ifdef GNOME1_HINTS
+Index: icewm-1.3.7/src/wmmgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/wmmgr.h 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmmgr.h 2012-01-15 16:59:18.000000000 +0100
+@@ -297,7 +297,6 @@
+ extern Atom _XA_NET_CURRENT_DESKTOP; // OK
+ ///extern Atom _XA_NET_DESKTOP_NAMES; // N/A
+ extern Atom _XA_NET_ACTIVE_WINDOW; // OK
+-extern Atom _XA_NET_WORKAREA; // OK
+ extern Atom _XA_NET_SUPPORTING_WM_CHECK; // OK
+ ///extern Atom _XA_NET_SUPPORTING_WM_CHECK; // N/A
+ extern Atom _XA_NET_CLOSE_WINDOW; // OK
+Index: icewm-1.3.7/src/yxapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yxapp.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yxapp.cc 2012-01-15 17:03:59.556423213 +0100
+@@ -67,7 +67,7 @@
+ Atom _XA_NET_CLIENT_LIST_STACKING;
+ Atom _XA_NET_NUMBER_OF_DESKTOPS;
+ Atom _XA_NET_CURRENT_DESKTOP;
+-Atom _XA_NET_WORKAREA;
++//Atom _XA_NET_WORKAREA;
+ Atom _XA_NET_WM_MOVERESIZE;
+
+ Atom _XA_NET_WM_STRUT;
+@@ -286,7 +286,7 @@
+ { &_XA_NET_CLIENT_LIST_STACKING, "_NET_CLIENT_LIST_STACKING" },
+ { &_XA_NET_NUMBER_OF_DESKTOPS, "_NET_NUMBER_OF_DESKTOPS" },
+ { &_XA_NET_CURRENT_DESKTOP, "_NET_CURRENT_DESKTOP" },
+- { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
++// { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
+ { &_XA_NET_WM_MOVERESIZE, "_NET_WM_MOVERESIZE" },
+
+ { &_XA_NET_WM_STRUT, "_NET_WM_STRUT" },
Deleted: extra-i686/no_proc_acpi.patch
===================================================================
--- extra-i686/no_proc_acpi.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-i686/no_proc_acpi.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,17 +0,0 @@
-Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
-Author: Andrey Danin <danindrey at mail.ru>, Eduard Bloch <blade at debian.org>
-Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
-Forwarded: Yes
-
-Index: icewm-1.3.7/src/wmtaskbar.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200
-@@ -467,6 +467,7 @@
- #endif
- #ifdef CONFIG_APPLET_APM
- if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
-+ access("/sys/class/power_supply", 0) == 0 ||
- access("/proc/acpi", 0) == 0 ||
- access("/dev/acpi", 0) == 0 ||
- access("/proc/pmu", R_OK|X_OK) == 0))
Copied: icewm/repos/extra-i686/no_proc_acpi.patch (from rev 160074, icewm/trunk/no_proc_acpi.patch)
===================================================================
--- extra-i686/no_proc_acpi.patch (rev 0)
+++ extra-i686/no_proc_acpi.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,17 @@
+Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
+Author: Andrey Danin <danindrey at mail.ru>, Eduard Bloch <blade at debian.org>
+Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
+Forwarded: Yes
+
+Index: icewm-1.3.7/src/wmtaskbar.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200
+@@ -467,6 +467,7 @@
+ #endif
+ #ifdef CONFIG_APPLET_APM
+ if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
++ access("/sys/class/power_supply", 0) == 0 ||
+ access("/proc/acpi", 0) == 0 ||
+ access("/dev/acpi", 0) == 0 ||
+ access("/proc/pmu", R_OK|X_OK) == 0))
Deleted: extra-i686/use_ICEWM_deprecated.patch
===================================================================
--- extra-i686/use_ICEWM_deprecated.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-i686/use_ICEWM_deprecated.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog at 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 ********************************************************/
Copied: icewm/repos/extra-i686/use_ICEWM_deprecated.patch (from rev 160074, icewm/trunk/use_ICEWM_deprecated.patch)
===================================================================
--- extra-i686/use_ICEWM_deprecated.patch (rev 0)
+++ extra-i686/use_ICEWM_deprecated.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,21 @@
+Description: Don't use "deprecated" as identifier, will FTBFS if another
+ library defines functions as deprecated.
+Author: Andreas Moog <amoog at 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 ********************************************************/
Deleted: extra-i686/wmclient.patch
===================================================================
--- extra-i686/wmclient.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-i686/wmclient.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,25 +0,0 @@
-diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
---- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200
-+++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200
-@@ -1044,20 +1044,11 @@
- while (XGetWindowProperty(display, handle,
- propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
- &r_type, &r_format, &nitems, &bytes_remain,
-- &prop) == Success && prop && bytes_remain == 0)
-+ &prop) == Success && prop)
- {
- if (r_format == itemSize1 && nitems > 0) {
- data = realloc(data, (itemCount + nitems) * itemSize / 8);
-
-- // access to memory beyound 256MiB causes crashes! But anyhow, size
-- // >>2MiB looks suspicious. Detect this case ASAP. However, if
-- // the usable icon is somewhere in the beginning, it's okay to
-- // return truncated data.
-- if (itemCount * itemSize / 8 >= 2097152) {
-- XFree(prop);
-- break;
-- }
--
- memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
- itemCount += nitems;
- XFree(prop);
Copied: icewm/repos/extra-i686/wmclient.patch (from rev 160074, icewm/trunk/wmclient.patch)
===================================================================
--- extra-i686/wmclient.patch (rev 0)
+++ extra-i686/wmclient.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,25 @@
+diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
+--- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200
++++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200
+@@ -1044,20 +1044,11 @@
+ while (XGetWindowProperty(display, handle,
+ propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
+ &r_type, &r_format, &nitems, &bytes_remain,
+- &prop) == Success && prop && bytes_remain == 0)
++ &prop) == Success && prop)
+ {
+ if (r_format == itemSize1 && nitems > 0) {
+ data = realloc(data, (itemCount + nitems) * itemSize / 8);
+
+- // access to memory beyound 256MiB causes crashes! But anyhow, size
+- // >>2MiB looks suspicious. Detect this case ASAP. However, if
+- // the usable icon is somewhere in the beginning, it's okay to
+- // return truncated data.
+- if (itemCount * itemSize / 8 >= 2097152) {
+- XFree(prop);
+- break;
+- }
+-
+ memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
+ itemCount += nitems;
+ XFree(prop);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-x86_64/PKGBUILD 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=icewm
-pkgver=1.3.7
-pkgrel=2
-pkgdesc="A Window Manager designed for speed, usability, and consistency"
-arch=('i686' 'x86_64')
-url="http://www.icewm.org/"
-license=('LGPL')
-depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
-makedepends=('xorg-mkfontdir')
-source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
- use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch wmclient.patch)
-sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803'
- 'ac8f352ba5ee33e19ce75fdeed890361550e125a'
- '49ca37ae41290f17a71a177b1f774235f91d79f1'
- 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338'
- 'd16b4b3ab269a657e735e343833973d000c0b35b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
- patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
- patch -p1 -i "${srcdir}/no_proc_acpi.patch"
- patch -p1 -i "${srcdir}/wmclient.patch"
- LIBS+="-lfontconfig" ./configure --prefix=/usr --sysconfdir=/etc \
- --enable-shaped-decorations --enable-gradients
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
-}
Copied: icewm/repos/extra-x86_64/PKGBUILD (from rev 160074, icewm/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=icewm
+pkgver=1.3.7
+pkgrel=3
+pkgdesc="A Window Manager designed for speed, usability, and consistency"
+arch=('i686' 'x86_64')
+url="http://www.icewm.org/"
+license=('LGPL')
+depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
+makedepends=('xorg-mkfontdir')
+source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
+ use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch
+ wmclient.patch icewm-cpustatus.patch)
+sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803'
+ 'ac8f352ba5ee33e19ce75fdeed890361550e125a'
+ '49ca37ae41290f17a71a177b1f774235f91d79f1'
+ 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338'
+ 'd16b4b3ab269a657e735e343833973d000c0b35b'
+ '0f4a02153496dadd26742f6bd3bdc166d7eafaed')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
+ patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
+ patch -p1 -i "${srcdir}/no_proc_acpi.patch"
+ patch -p1 -i "${srcdir}/wmclient.patch"
+ patch -p2 -i "${srcdir}/icewm-cpustatus.patch"
+ LIBS+="-lfontconfig" ./configure --prefix=/usr --sysconfdir=/etc \
+ --enable-shaped-decorations --enable-gradients
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
+}
Copied: icewm/repos/extra-x86_64/icewm-cpustatus.patch (from rev 160074, icewm/trunk/icewm-cpustatus.patch)
===================================================================
--- extra-x86_64/icewm-cpustatus.patch (rev 0)
+++ extra-x86_64/icewm-cpustatus.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,45 @@
+ icewm/src/acpustatus.cc | 31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+
+diff --git a/icewm/src/acpustatus.cc b/icewm/src/acpustatus.cc
+index 5e959d6..b9e5450 100644
+--- a/icewm/src/acpustatus.cc
++++ b/icewm/src/acpustatus.cc
+@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf, int buflen) {
+ }
+ closedir(dir);
+ }
++ else if ((dir = opendir("/sys/class/thermal")) != NULL) {
++ struct dirent *de;
++
++ while ((de = readdir(dir)) != NULL) {
++
++ int fd, seglen;
++
++ if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
++ continue;
++
++ sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
++ fd = open(namebuf, O_RDONLY);
++ if (fd != -1) {
++ int len = read(fd, buf, sizeof(buf) - 1);
++ buf[len - 4] = '\0';
++ seglen = strlen(buf) + 4;
++ if (retbuflen + seglen >= buflen) {
++ retbuflen = -retbuflen;
++ close(fd);
++ closedir(dir);
++ break;
++ }
++ retbuflen += seglen;
++ strcat(tempbuf, " ");
++ strncat(tempbuf, buf, seglen);
++ strcat(tempbuf, " C");
++ close(fd);
++ }
++ }
++ closedir(dir);
++ }
+ return retbuflen;
+ }
+
Deleted: extra-x86_64/ignore_workarea_hints.patch
===================================================================
--- extra-x86_64/ignore_workarea_hints.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-x86_64/ignore_workarea_hints.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,62 +0,0 @@
-Index: icewm-1.3.7/src/wmapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100
-@@ -187,7 +187,6 @@
- _XA_NET_ACTIVE_WINDOW,
- _XA_NET_CLOSE_WINDOW,
- _XA_NET_WM_STRUT,
-- _XA_NET_WORKAREA,
- _XA_NET_WM_STATE,
- _XA_NET_WM_STATE_MAXIMIZED_VERT,
- _XA_NET_WM_STATE_MAXIMIZED_HORZ,
-Index: icewm-1.3.7/src/wmmgr.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmmgr.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmmgr.cc 2012-01-15 16:59:18.000000000 +0100
-@@ -2114,11 +2114,6 @@
- area[ws * 4 + 3] = fWorkArea[ws][0].fMaxY - fWorkArea[ws][0].fMinY;
- }
-
-- XChangeProperty(xapp->display(), handle(),
-- _XA_NET_WORKAREA,
-- XA_CARDINAL,
-- 32, PropModeReplace,
-- (unsigned char *)area, nw * 4);
- delete [] area;
- #endif
- #ifdef GNOME1_HINTS
-Index: icewm-1.3.7/src/wmmgr.h
-===================================================================
---- icewm-1.3.7.orig/src/wmmgr.h 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmmgr.h 2012-01-15 16:59:18.000000000 +0100
-@@ -297,7 +297,6 @@
- extern Atom _XA_NET_CURRENT_DESKTOP; // OK
- ///extern Atom _XA_NET_DESKTOP_NAMES; // N/A
- extern Atom _XA_NET_ACTIVE_WINDOW; // OK
--extern Atom _XA_NET_WORKAREA; // OK
- extern Atom _XA_NET_SUPPORTING_WM_CHECK; // OK
- ///extern Atom _XA_NET_SUPPORTING_WM_CHECK; // N/A
- extern Atom _XA_NET_CLOSE_WINDOW; // OK
-Index: icewm-1.3.7/src/yxapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/yxapp.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yxapp.cc 2012-01-15 17:03:59.556423213 +0100
-@@ -67,7 +67,7 @@
- Atom _XA_NET_CLIENT_LIST_STACKING;
- Atom _XA_NET_NUMBER_OF_DESKTOPS;
- Atom _XA_NET_CURRENT_DESKTOP;
--Atom _XA_NET_WORKAREA;
-+//Atom _XA_NET_WORKAREA;
- Atom _XA_NET_WM_MOVERESIZE;
-
- Atom _XA_NET_WM_STRUT;
-@@ -286,7 +286,7 @@
- { &_XA_NET_CLIENT_LIST_STACKING, "_NET_CLIENT_LIST_STACKING" },
- { &_XA_NET_NUMBER_OF_DESKTOPS, "_NET_NUMBER_OF_DESKTOPS" },
- { &_XA_NET_CURRENT_DESKTOP, "_NET_CURRENT_DESKTOP" },
-- { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
-+// { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
- { &_XA_NET_WM_MOVERESIZE, "_NET_WM_MOVERESIZE" },
-
- { &_XA_NET_WM_STRUT, "_NET_WM_STRUT" },
Copied: icewm/repos/extra-x86_64/ignore_workarea_hints.patch (from rev 160074, icewm/trunk/ignore_workarea_hints.patch)
===================================================================
--- extra-x86_64/ignore_workarea_hints.patch (rev 0)
+++ extra-x86_64/ignore_workarea_hints.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,62 @@
+Index: icewm-1.3.7/src/wmapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100
+@@ -187,7 +187,6 @@
+ _XA_NET_ACTIVE_WINDOW,
+ _XA_NET_CLOSE_WINDOW,
+ _XA_NET_WM_STRUT,
+- _XA_NET_WORKAREA,
+ _XA_NET_WM_STATE,
+ _XA_NET_WM_STATE_MAXIMIZED_VERT,
+ _XA_NET_WM_STATE_MAXIMIZED_HORZ,
+Index: icewm-1.3.7/src/wmmgr.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmmgr.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmmgr.cc 2012-01-15 16:59:18.000000000 +0100
+@@ -2114,11 +2114,6 @@
+ area[ws * 4 + 3] = fWorkArea[ws][0].fMaxY - fWorkArea[ws][0].fMinY;
+ }
+
+- XChangeProperty(xapp->display(), handle(),
+- _XA_NET_WORKAREA,
+- XA_CARDINAL,
+- 32, PropModeReplace,
+- (unsigned char *)area, nw * 4);
+ delete [] area;
+ #endif
+ #ifdef GNOME1_HINTS
+Index: icewm-1.3.7/src/wmmgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/wmmgr.h 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmmgr.h 2012-01-15 16:59:18.000000000 +0100
+@@ -297,7 +297,6 @@
+ extern Atom _XA_NET_CURRENT_DESKTOP; // OK
+ ///extern Atom _XA_NET_DESKTOP_NAMES; // N/A
+ extern Atom _XA_NET_ACTIVE_WINDOW; // OK
+-extern Atom _XA_NET_WORKAREA; // OK
+ extern Atom _XA_NET_SUPPORTING_WM_CHECK; // OK
+ ///extern Atom _XA_NET_SUPPORTING_WM_CHECK; // N/A
+ extern Atom _XA_NET_CLOSE_WINDOW; // OK
+Index: icewm-1.3.7/src/yxapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yxapp.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yxapp.cc 2012-01-15 17:03:59.556423213 +0100
+@@ -67,7 +67,7 @@
+ Atom _XA_NET_CLIENT_LIST_STACKING;
+ Atom _XA_NET_NUMBER_OF_DESKTOPS;
+ Atom _XA_NET_CURRENT_DESKTOP;
+-Atom _XA_NET_WORKAREA;
++//Atom _XA_NET_WORKAREA;
+ Atom _XA_NET_WM_MOVERESIZE;
+
+ Atom _XA_NET_WM_STRUT;
+@@ -286,7 +286,7 @@
+ { &_XA_NET_CLIENT_LIST_STACKING, "_NET_CLIENT_LIST_STACKING" },
+ { &_XA_NET_NUMBER_OF_DESKTOPS, "_NET_NUMBER_OF_DESKTOPS" },
+ { &_XA_NET_CURRENT_DESKTOP, "_NET_CURRENT_DESKTOP" },
+- { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
++// { &_XA_NET_WORKAREA, "_NET_WORKAREA" },
+ { &_XA_NET_WM_MOVERESIZE, "_NET_WM_MOVERESIZE" },
+
+ { &_XA_NET_WM_STRUT, "_NET_WM_STRUT" },
Deleted: extra-x86_64/no_proc_acpi.patch
===================================================================
--- extra-x86_64/no_proc_acpi.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-x86_64/no_proc_acpi.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,17 +0,0 @@
-Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
-Author: Andrey Danin <danindrey at mail.ru>, Eduard Bloch <blade at debian.org>
-Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
-Forwarded: Yes
-
-Index: icewm-1.3.7/src/wmtaskbar.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200
-@@ -467,6 +467,7 @@
- #endif
- #ifdef CONFIG_APPLET_APM
- if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
-+ access("/sys/class/power_supply", 0) == 0 ||
- access("/proc/acpi", 0) == 0 ||
- access("/dev/acpi", 0) == 0 ||
- access("/proc/pmu", R_OK|X_OK) == 0))
Copied: icewm/repos/extra-x86_64/no_proc_acpi.patch (from rev 160074, icewm/trunk/no_proc_acpi.patch)
===================================================================
--- extra-x86_64/no_proc_acpi.patch (rev 0)
+++ extra-x86_64/no_proc_acpi.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,17 @@
+Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
+Author: Andrey Danin <danindrey at mail.ru>, Eduard Bloch <blade at debian.org>
+Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
+Forwarded: Yes
+
+Index: icewm-1.3.7/src/wmtaskbar.cc
+===================================================================
+--- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200
+@@ -467,6 +467,7 @@
+ #endif
+ #ifdef CONFIG_APPLET_APM
+ if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
++ access("/sys/class/power_supply", 0) == 0 ||
+ access("/proc/acpi", 0) == 0 ||
+ access("/dev/acpi", 0) == 0 ||
+ access("/proc/pmu", R_OK|X_OK) == 0))
Deleted: extra-x86_64/use_ICEWM_deprecated.patch
===================================================================
--- extra-x86_64/use_ICEWM_deprecated.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-x86_64/use_ICEWM_deprecated.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog at 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 ********************************************************/
Copied: icewm/repos/extra-x86_64/use_ICEWM_deprecated.patch (from rev 160074, icewm/trunk/use_ICEWM_deprecated.patch)
===================================================================
--- extra-x86_64/use_ICEWM_deprecated.patch (rev 0)
+++ extra-x86_64/use_ICEWM_deprecated.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,21 @@
+Description: Don't use "deprecated" as identifier, will FTBFS if another
+ library defines functions as deprecated.
+Author: Andreas Moog <amoog at 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 ********************************************************/
Deleted: extra-x86_64/wmclient.patch
===================================================================
--- extra-x86_64/wmclient.patch 2012-05-29 22:00:51 UTC (rev 160074)
+++ extra-x86_64/wmclient.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -1,25 +0,0 @@
-diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
---- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200
-+++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200
-@@ -1044,20 +1044,11 @@
- while (XGetWindowProperty(display, handle,
- propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
- &r_type, &r_format, &nitems, &bytes_remain,
-- &prop) == Success && prop && bytes_remain == 0)
-+ &prop) == Success && prop)
- {
- if (r_format == itemSize1 && nitems > 0) {
- data = realloc(data, (itemCount + nitems) * itemSize / 8);
-
-- // access to memory beyound 256MiB causes crashes! But anyhow, size
-- // >>2MiB looks suspicious. Detect this case ASAP. However, if
-- // the usable icon is somewhere in the beginning, it's okay to
-- // return truncated data.
-- if (itemCount * itemSize / 8 >= 2097152) {
-- XFree(prop);
-- break;
-- }
--
- memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
- itemCount += nitems;
- XFree(prop);
Copied: icewm/repos/extra-x86_64/wmclient.patch (from rev 160074, icewm/trunk/wmclient.patch)
===================================================================
--- extra-x86_64/wmclient.patch (rev 0)
+++ extra-x86_64/wmclient.patch 2012-05-29 22:01:31 UTC (rev 160075)
@@ -0,0 +1,25 @@
+diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
+--- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200
++++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200
+@@ -1044,20 +1044,11 @@
+ while (XGetWindowProperty(display, handle,
+ propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
+ &r_type, &r_format, &nitems, &bytes_remain,
+- &prop) == Success && prop && bytes_remain == 0)
++ &prop) == Success && prop)
+ {
+ if (r_format == itemSize1 && nitems > 0) {
+ data = realloc(data, (itemCount + nitems) * itemSize / 8);
+
+- // access to memory beyound 256MiB causes crashes! But anyhow, size
+- // >>2MiB looks suspicious. Detect this case ASAP. However, if
+- // the usable icon is somewhere in the beginning, it's okay to
+- // return truncated data.
+- if (itemCount * itemSize / 8 >= 2097152) {
+- XFree(prop);
+- break;
+- }
+-
+ memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
+ itemCount += nitems;
+ XFree(prop);
More information about the arch-commits
mailing list