Fri Dec 27 23:54:04 UTC 2013

5 files changed, 15 insertions, 81 deletions

diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 4bd344e42..3573fb570 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160075 2012-05-29 22:01:31Z eric $
+# $Id: PKGBUILD 199904 2013-11-18 16:10:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=icewm
-pkgver=1.3.7
-pkgrel=3
+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/"
@@ -11,28 +11,25 @@ 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'
+        ignore_workarea_hints.patch icewm-cpustatus.patch)
+sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8'
+          '88b4b198827d6590901c2c8bdba8826d928f6f1a'
           '0f4a02153496dadd26742f6bd3bdc166d7eafaed')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
+prepare() {
+  cd ${pkgname}-${pkgver}
   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 \
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-shaped-decorations --enable-gradients
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
 }
diff --git a/extra/icewm/ignore_workarea_hints.patch b/extra/icewm/ignore_workarea_hints.patch
index 99ffa4a28..df0a2a502 100644
--- a/extra/icewm/ignore_workarea_hints.patch
+++ b/extra/icewm/ignore_workarea_hints.patch
@@ -3,9 +3,9 @@ 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_WM_STRUT_PARTIAL,
 -        _XA_NET_WORKAREA,
          _XA_NET_WM_STATE,
          _XA_NET_WM_STATE_MAXIMIZED_VERT,
diff --git a/extra/icewm/no_proc_acpi.patch b/extra/icewm/no_proc_acpi.patch
deleted file mode 100644
index 4cd92360c..000000000
--- a/extra/icewm/no_proc_acpi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
-Author: Andrey Danin <danindrey@mail.ru>, Eduard Bloch <blade@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))
diff --git a/extra/icewm/use_ICEWM_deprecated.patch b/extra/icewm/use_ICEWM_deprecated.patch
deleted file mode 100644
index 3533d31e3..000000000
--- a/extra/icewm/use_ICEWM_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 ********************************************************/
diff --git a/extra/icewm/wmclient.patch b/extra/icewm/wmclient.patch
deleted file mode 100644
index 95f00614d..000000000
--- a/extra/icewm/wmclient.patch
+++ /dev/null
@@ -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);