[arch-commits] Commit in icewm/trunk (5 files)
Eric Bélanger
eric at nymeria.archlinux.org
Mon Nov 18 16:09:48 UTC 2013
Date: Monday, November 18, 2013 @ 17:09:48
Author: eric
Revision: 199903
upgpkg: icewm 1.3.8-1
Upstream update, Add prepare function, Remove old patches
Modified:
icewm/trunk/PKGBUILD
icewm/trunk/ignore_workarea_hints.patch
Deleted:
icewm/trunk/no_proc_acpi.patch
icewm/trunk/use_ICEWM_deprecated.patch
icewm/trunk/wmclient.patch
-----------------------------+
PKGBUILD | 29 +++++++++++++----------------
ignore_workarea_hints.patch | 2 +-
no_proc_acpi.patch | 17 -----------------
use_ICEWM_deprecated.patch | 21 ---------------------
wmclient.patch | 25 -------------------------
5 files changed, 14 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-11-18 14:27:44 UTC (rev 199902)
+++ PKGBUILD 2013-11-18 16:09:48 UTC (rev 199903)
@@ -2,8 +2,8 @@
# Maintainer: Eric Bélanger <eric at 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 @@
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
}
Modified: ignore_workarea_hints.patch
===================================================================
--- ignore_workarea_hints.patch 2013-11-18 14:27:44 UTC (rev 199902)
+++ ignore_workarea_hints.patch 2013-11-18 16:09:48 UTC (rev 199903)
@@ -3,9 +3,9 @@
--- 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,
Deleted: no_proc_acpi.patch
===================================================================
--- no_proc_acpi.patch 2013-11-18 14:27:44 UTC (rev 199902)
+++ no_proc_acpi.patch 2013-11-18 16:09:48 UTC (rev 199903)
@@ -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))
Deleted: use_ICEWM_deprecated.patch
===================================================================
--- use_ICEWM_deprecated.patch 2013-11-18 14:27:44 UTC (rev 199902)
+++ use_ICEWM_deprecated.patch 2013-11-18 16:09:48 UTC (rev 199903)
@@ -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 ********************************************************/
Deleted: wmclient.patch
===================================================================
--- wmclient.patch 2013-11-18 14:27:44 UTC (rev 199902)
+++ wmclient.patch 2013-11-18 16:09:48 UTC (rev 199903)
@@ -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);
More information about the arch-commits
mailing list