Date: Saturday, May 31, 2014 @ 03:09:27 Author: eric Revision: 213876
archrelease: copy trunk to extra-i686, extra-x86_64 Added: icewm/repos/extra-i686/PKGBUILD (from rev 213875, icewm/trunk/PKGBUILD) icewm/repos/extra-i686/icewm-1.3.8-shutdown-reboot-command.patch (from rev 213875, icewm/trunk/icewm-1.3.8-shutdown-reboot-command.patch) icewm/repos/extra-i686/icewm-cpustatus.patch (from rev 213875, icewm/trunk/icewm-cpustatus.patch) icewm/repos/extra-i686/ignore_workarea_hints.patch (from rev 213875, icewm/trunk/ignore_workarea_hints.patch) icewm/repos/extra-x86_64/PKGBUILD (from rev 213875, icewm/trunk/PKGBUILD) icewm/repos/extra-x86_64/icewm-1.3.8-shutdown-reboot-command.patch (from rev 213875, icewm/trunk/icewm-1.3.8-shutdown-reboot-command.patch) icewm/repos/extra-x86_64/icewm-cpustatus.patch (from rev 213875, icewm/trunk/icewm-cpustatus.patch) icewm/repos/extra-x86_64/ignore_workarea_hints.patch (from rev 213875, icewm/trunk/ignore_workarea_hints.patch) Deleted: icewm/repos/extra-i686/PKGBUILD icewm/repos/extra-i686/icewm-cpustatus.patch icewm/repos/extra-i686/ignore_workarea_hints.patch icewm/repos/extra-x86_64/PKGBUILD icewm/repos/extra-x86_64/icewm-cpustatus.patch icewm/repos/extra-x86_64/ignore_workarea_hints.patch --------------------------------------------------------+ /PKGBUILD | 74 ++++++++ /icewm-cpustatus.patch | 90 ++++++++++ /ignore_workarea_hints.patch | 124 +++++++++++++++ extra-i686/PKGBUILD | 35 ---- extra-i686/icewm-1.3.8-shutdown-reboot-command.patch | 13 + extra-i686/icewm-cpustatus.patch | 45 ----- extra-i686/ignore_workarea_hints.patch | 62 ------- extra-x86_64/PKGBUILD | 35 ---- extra-x86_64/icewm-1.3.8-shutdown-reboot-command.patch | 13 + extra-x86_64/icewm-cpustatus.patch | 45 ----- extra-x86_64/ignore_workarea_hints.patch | 62 ------- 11 files changed, 314 insertions(+), 284 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-i686/PKGBUILD 2014-05-31 01:09:27 UTC (rev 213876) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=icewm -pkgver=1.3.8 -pkgrel=1 -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 - ignore_workarea_hints.patch icewm-cpustatus.patch) -sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8' - '88b4b198827d6590901c2c8bdba8826d928f6f1a' - '0f4a02153496dadd26742f6bd3bdc166d7eafaed') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/ignore_workarea_hints.patch" - patch -p2 -i "${srcdir}/icewm-cpustatus.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-shaped-decorations --enable-gradients - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install install-man install-docs install-desktop -} Copied: icewm/repos/extra-i686/PKGBUILD (from rev 213875, icewm/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-05-31 01:09:27 UTC (rev 213876) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=icewm +pkgver=1.3.8 +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 + ignore_workarea_hints.patch icewm-cpustatus.patch icewm-1.3.8-shutdown-reboot-command.patch) +sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8' + '88b4b198827d6590901c2c8bdba8826d928f6f1a' + '0f4a02153496dadd26742f6bd3bdc166d7eafaed' + 'd85d35b756ca2d5283f10de9d9bca23d39c68f6f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/ignore_workarea_hints.patch" + patch -p2 -i "${srcdir}/icewm-cpustatus.patch" + patch -p1 -i "${srcdir}/icewm-1.3.8-shutdown-reboot-command.patch" +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shaped-decorations --enable-gradients + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install-man install-docs install-desktop +} Copied: icewm/repos/extra-i686/icewm-1.3.8-shutdown-reboot-command.patch (from rev 213875, icewm/trunk/icewm-1.3.8-shutdown-reboot-command.patch) =================================================================== --- extra-i686/icewm-1.3.8-shutdown-reboot-command.patch (rev 0) +++ extra-i686/icewm-1.3.8-shutdown-reboot-command.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -0,0 +1,13 @@ +diff --git a/src/wmmgr.cc b/src/wmmgr.cc +index 4252bf6..dc1e703 100644 +--- a/src/wmmgr.cc ++++ b/src/wmmgr.cc +@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) { + case ICEWM_ACTION_RESTARTWM: + case ICEWM_ACTION_WINDOWLIST: + case ICEWM_ACTION_ABOUT: +- break; ++ //break; + default: + smActionListener->handleSMAction(message.data.l[1]); + break; Deleted: extra-i686/icewm-cpustatus.patch =================================================================== --- extra-i686/icewm-cpustatus.patch 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-i686/icewm-cpustatus.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -1,45 +0,0 @@ - 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; - } - Copied: icewm/repos/extra-i686/icewm-cpustatus.patch (from rev 213875, icewm/trunk/icewm-cpustatus.patch) =================================================================== --- extra-i686/icewm-cpustatus.patch (rev 0) +++ extra-i686/icewm-cpustatus.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-i686/ignore_workarea_hints.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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_CLOSE_WINDOW, - _XA_NET_WM_STRUT, - _XA_NET_WM_STRUT_PARTIAL, -- _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 213875, icewm/trunk/ignore_workarea_hints.patch) =================================================================== --- extra-i686/ignore_workarea_hints.patch (rev 0) +++ extra-i686/ignore_workarea_hints.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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_CLOSE_WINDOW, + _XA_NET_WM_STRUT, + _XA_NET_WM_STRUT_PARTIAL, +- _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/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-x86_64/PKGBUILD 2014-05-31 01:09:27 UTC (rev 213876) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=icewm -pkgver=1.3.8 -pkgrel=1 -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 - ignore_workarea_hints.patch icewm-cpustatus.patch) -sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8' - '88b4b198827d6590901c2c8bdba8826d928f6f1a' - '0f4a02153496dadd26742f6bd3bdc166d7eafaed') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/ignore_workarea_hints.patch" - patch -p2 -i "${srcdir}/icewm-cpustatus.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-shaped-decorations --enable-gradients - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install install-man install-docs install-desktop -} Copied: icewm/repos/extra-x86_64/PKGBUILD (from rev 213875, icewm/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-05-31 01:09:27 UTC (rev 213876) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=icewm +pkgver=1.3.8 +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 + ignore_workarea_hints.patch icewm-cpustatus.patch icewm-1.3.8-shutdown-reboot-command.patch) +sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8' + '88b4b198827d6590901c2c8bdba8826d928f6f1a' + '0f4a02153496dadd26742f6bd3bdc166d7eafaed' + 'd85d35b756ca2d5283f10de9d9bca23d39c68f6f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/ignore_workarea_hints.patch" + patch -p2 -i "${srcdir}/icewm-cpustatus.patch" + patch -p1 -i "${srcdir}/icewm-1.3.8-shutdown-reboot-command.patch" +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shaped-decorations --enable-gradients + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install-man install-docs install-desktop +} Copied: icewm/repos/extra-x86_64/icewm-1.3.8-shutdown-reboot-command.patch (from rev 213875, icewm/trunk/icewm-1.3.8-shutdown-reboot-command.patch) =================================================================== --- extra-x86_64/icewm-1.3.8-shutdown-reboot-command.patch (rev 0) +++ extra-x86_64/icewm-1.3.8-shutdown-reboot-command.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -0,0 +1,13 @@ +diff --git a/src/wmmgr.cc b/src/wmmgr.cc +index 4252bf6..dc1e703 100644 +--- a/src/wmmgr.cc ++++ b/src/wmmgr.cc +@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) { + case ICEWM_ACTION_RESTARTWM: + case ICEWM_ACTION_WINDOWLIST: + case ICEWM_ACTION_ABOUT: +- break; ++ //break; + default: + smActionListener->handleSMAction(message.data.l[1]); + break; Deleted: extra-x86_64/icewm-cpustatus.patch =================================================================== --- extra-x86_64/icewm-cpustatus.patch 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-x86_64/icewm-cpustatus.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -1,45 +0,0 @@ - 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; - } - Copied: icewm/repos/extra-x86_64/icewm-cpustatus.patch (from rev 213875, icewm/trunk/icewm-cpustatus.patch) =================================================================== --- extra-x86_64/icewm-cpustatus.patch (rev 0) +++ extra-x86_64/icewm-cpustatus.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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 2014-05-31 01:05:52 UTC (rev 213875) +++ extra-x86_64/ignore_workarea_hints.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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_CLOSE_WINDOW, - _XA_NET_WM_STRUT, - _XA_NET_WM_STRUT_PARTIAL, -- _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 213875, icewm/trunk/ignore_workarea_hints.patch) =================================================================== --- extra-x86_64/ignore_workarea_hints.patch (rev 0) +++ extra-x86_64/ignore_workarea_hints.patch 2014-05-31 01:09:27 UTC (rev 213876) @@ -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_CLOSE_WINDOW, + _XA_NET_WM_STRUT, + _XA_NET_WM_STRUT_PARTIAL, +- _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" },