diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
commit | 6124dfa10e2a69fc79efc85f611c8db582caf711 (patch) | |
tree | e9706ae64164967e8448140e9cb6534dfbb0a2a3 /extra/icewm | |
parent | 385fda403f286573a778ee525fe56a86d11fc967 (diff) | |
parent | 5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/almanah/PKGBUILD
community/audit/PKGBUILD
community/bird/PKGBUILD
community/blobby2/PKGBUILD
community/blueman/PKGBUILD
community/bomberclone/PKGBUILD
community/botan/PKGBUILD
community/cantata/PKGBUILD
community/cinnamon-desktop/PKGBUILD
community/cinnamon-settings-daemon/PKGBUILD
community/cinnamon/PKGBUILD
community/clearsilver/PKGBUILD
community/clinica/PKGBUILD
community/confuse/PKGBUILD
community/deadbeef/PKGBUILD
community/dvdrtools/PKGBUILD
community/etl/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/flashrom/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gcolor2/PKGBUILD
community/geary/PKGBUILD
community/glob2/PKGBUILD
community/gnash/PKGBUILD
community/gnome-commander/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gnuchess/PKGBUILD
community/haskell-bytestring-show/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-vector/PKGBUILD
community/hedgewars/PKGBUILD
community/hitori/PKGBUILD
community/inputattach/PKGBUILD
community/jack2/PKGBUILD
community/kid3/PKGBUILD
community/lcdproc/PKGBUILD
community/libcec/PKGBUILD
community/libvirt/PKGBUILD
community/libwww/PKGBUILD
community/lightdm/PKGBUILD
community/lincity-ng/PKGBUILD
community/linux-tools/PKGBUILD
community/linuxtv-dvb-apps/PKGBUILD
community/lockdev/PKGBUILD
community/log4cpp/PKGBUILD
community/love/PKGBUILD
community/luajit/PKGBUILD
community/lxc/PKGBUILD
community/metamail/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/mongodb/PKGBUILD
community/nemo/PKGBUILD
community/par2cmdline/PKGBUILD
community/pdfedit/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pidgin-talkfilters/PKGBUILD
community/pokerth/PKGBUILD
community/setconf/PKGBUILD
community/stfl/PKGBUILD
community/talkfilters/PKGBUILD
community/tre/PKGBUILD
community/ubuntuone-client-gnome/PKGBUILD
community/ubuntuone-client/PKGBUILD
community/vor/PKGBUILD
community/warmux/PKGBUILD
community/wdm/PKGBUILD
community/xbmc-pvr-addons/PKGBUILD
core/gcc/PKGBUILD
core/lvm2/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aubio/PKGBUILD
extra/avidemux/PKGBUILD
extra/bluez4/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/caribou/PKGBUILD
extra/chemtool/PKGBUILD
extra/cinepaint/PKGBUILD
extra/conky/PKGBUILD
extra/cups/PKGBUILD
extra/enlightenment16/PKGBUILD
extra/exo/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream-0.1/PKGBUILD
extra/ffmpeg-compat/PKGBUILD
extra/fltk/PKGBUILD
extra/git/PKGBUILD
extra/gpart/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ffmpeg/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-vnc/PKGBUILD
extra/haveged/PKGBUILD
extra/icewm/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdeaccessibility-jovie/PKGBUILD
extra/kdeaccessibility-kaccessible/PKGBUILD
extra/kdeaccessibility-kmag/PKGBUILD
extra/kdeaccessibility-kmousetool/PKGBUILD
extra/kdeaccessibility-kmouth/PKGBUILD
extra/kdeadmin-kcron/PKGBUILD
extra/kdeadmin-ksystemlog/PKGBUILD
extra/kdeadmin-kuser/PKGBUILD
extra/kdeartwork/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebase/PKGBUILD
extra/kdebindings-kimono/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdeedu-blinken/PKGBUILD
extra/kdeedu-cantor/PKGBUILD
extra/kdeedu-kalgebra/PKGBUILD
extra/kdeedu-kalzium/PKGBUILD
extra/kdeedu-kanagram/PKGBUILD
extra/kdeedu-kbruch/PKGBUILD
extra/kdeedu-kgeography/PKGBUILD
extra/kdeedu-khangman/PKGBUILD
extra/kdeedu-kig/PKGBUILD
extra/kdeedu-kiten/PKGBUILD
extra/kdeedu-klettres/PKGBUILD
extra/kdeedu-kmplot/PKGBUILD
extra/kdeedu-kstars/PKGBUILD
extra/kdeedu-ktouch/PKGBUILD
extra/kdeedu-kturtle/PKGBUILD
extra/kdeedu-kwordquiz/PKGBUILD
extra/kdeedu-marble/PKGBUILD
extra/kdeedu-pairs/PKGBUILD
extra/kdeedu-parley/PKGBUILD
extra/kdeedu-rocs/PKGBUILD
extra/kdeedu-step/PKGBUILD
extra/kdegames-bomber/PKGBUILD
extra/kdegames-bovo/PKGBUILD
extra/kdegames-granatier/PKGBUILD
extra/kdegames-kapman/PKGBUILD
extra/kdegames-katomic/PKGBUILD
extra/kdegames-kblackbox/PKGBUILD
extra/kdegames-kblocks/PKGBUILD
extra/kdegames-kbounce/PKGBUILD
extra/kdegames-kbreakout/PKGBUILD
extra/kdegames-kdiamond/PKGBUILD
extra/kdegames-kfourinline/PKGBUILD
extra/kdegames-kgoldrunner/PKGBUILD
extra/kdegames-kigo/PKGBUILD
extra/kdegames-killbots/PKGBUILD
extra/kdegames-kiriki/PKGBUILD
extra/kdegames-kjumpingcube/PKGBUILD
extra/kdegames-klickety/PKGBUILD
extra/kdegames-klines/PKGBUILD
extra/kdegames-kmahjongg/PKGBUILD
extra/kdegames-kmines/PKGBUILD
extra/kdegames-knavalbattle/PKGBUILD
extra/kdegames-knetwalk/PKGBUILD
extra/kdegames-kolf/PKGBUILD
extra/kdegames-kollision/PKGBUILD
extra/kdegames-konquest/PKGBUILD
extra/kdegames-kpatience/PKGBUILD
extra/kdegames-kreversi/PKGBUILD
extra/kdegames-kshisen/PKGBUILD
extra/kdegames-ksirk/PKGBUILD
extra/kdegames-ksnakeduel/PKGBUILD
extra/kdegames-kspaceduel/PKGBUILD
extra/kdegames-ksquares/PKGBUILD
extra/kdegames-ksudoku/PKGBUILD
extra/kdegames-ktuberling/PKGBUILD
extra/kdegames-kubrick/PKGBUILD
extra/kdegames-lskat/PKGBUILD
extra/kdegames-palapeli/PKGBUILD
extra/kdegames-picmi/PKGBUILD
extra/kdegraphics-gwenview/PKGBUILD
extra/kdegraphics-kamera/PKGBUILD
extra/kdegraphics-kcolorchooser/PKGBUILD
extra/kdegraphics-kgamma/PKGBUILD
extra/kdegraphics-kolourpaint/PKGBUILD
extra/kdegraphics-kruler/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-ksnapshot/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-okular/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdemultimedia-audiocd-kio/PKGBUILD
extra/kdemultimedia-dragonplayer/PKGBUILD
extra/kdemultimedia-ffmpegthumbs/PKGBUILD
extra/kdemultimedia-juk/PKGBUILD
extra/kdemultimedia-kmix/PKGBUILD
extra/kdemultimedia-kscd/PKGBUILD
extra/kdemultimedia-mplayerthumbs/PKGBUILD
extra/kdenetwork-filesharing/PKGBUILD
extra/kdenetwork-kdnssd/PKGBUILD
extra/kdenetwork-kget/PKGBUILD
extra/kdenetwork-kppp/PKGBUILD
extra/kdenetwork-krdc/PKGBUILD
extra/kdenetwork-krfb/PKGBUILD
extra/kdenetwork-strigi-analyzers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk-cervisia/PKGBUILD
extra/kdesdk-dev-scripts/PKGBUILD
extra/kdesdk-dev-utils/PKGBUILD
extra/kdesdk-dolphin-plugins/PKGBUILD
extra/kdesdk-kapptemplate/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk-kcachegrind/PKGBUILD
extra/kdesdk-kioslaves/PKGBUILD
extra/kdesdk-kompare/PKGBUILD
extra/kdesdk-lokalize/PKGBUILD
extra/kdesdk-okteta/PKGBUILD
extra/kdesdk-poxml/PKGBUILD
extra/kdesdk-strigi-analyzers/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdesdk-umbrello/PKGBUILD
extra/kdetoys-amor/PKGBUILD
extra/kdetoys-kteatime/PKGBUILD
extra/kdetoys-ktux/PKGBUILD
extra/kdeutils-filelight/PKGBUILD
extra/kdeutils-kcalc/PKGBUILD
extra/kdeutils-kcharselect/PKGBUILD
extra/kdeutils-kdf/PKGBUILD
extra/kdeutils-kfloppy/PKGBUILD
extra/kdeutils-kgpg/PKGBUILD
extra/kdeutils-kremotecontrol/PKGBUILD
extra/kdeutils-ktimer/PKGBUILD
extra/kdeutils-kwallet/PKGBUILD
extra/kdeutils-print-manager/PKGBUILD
extra/kdeutils-superkaramba/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/kdewebdev/PKGBUILD
extra/kino/PKGBUILD
extra/libdrm/PKGBUILD
extra/libiec61883/PKGBUILD
extra/libkcddb/PKGBUILD
extra/libkcompactdisc/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkdegames/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libkmahjongg/PKGBUILD
extra/libksane/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmp4v2/PKGBUILD
extra/libnet/PKGBUILD
extra/libpst/PKGBUILD
extra/libsidplay/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxmi/PKGBUILD
extra/lua51/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/nepomuk-core/PKGBUILD
extra/nepomuk-widgets/PKGBUILD
extra/obexd/PKGBUILD
extra/opencv/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
extra/phonon-gstreamer/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/plotutils/PKGBUILD
extra/postgresql/PKGBUILD
extra/pycrypto/PKGBUILD
extra/python/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/rcs/PKGBUILD
extra/rdesktop/PKGBUILD
extra/rtmpdump/PKGBUILD
extra/ruby/PKGBUILD
extra/signon/PKGBUILD
extra/sqlite/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/w3m/PKGBUILD
extra/wcslib/PKGBUILD
extra/windowmaker/PKGBUILD
extra/x264/PKGBUILD
extra/xaos/PKGBUILD
extra/xmlto/PKGBUILD
libre/angband-libre/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/kdebase-konqueror-libre/PKGBUILD
libre/kdebase-runtime-libre/PKGBUILD
libre/kdelibs-libre/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
libre/kdepim-libre/PKGBUILD
libre/kdeutils-ark-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/xbmc-libre/PKGBUILD
nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
nonprism/kdepim-runtime-nonprism/PKGBUILD
pcr/libquvi-scripts-current/PKGBUILD
Diffstat (limited to 'extra/icewm')
-rw-r--r-- | extra/icewm/PKGBUILD | 32 | ||||
-rw-r--r-- | extra/icewm/ignore_workarea_hints.patch | 2 | ||||
-rw-r--r-- | extra/icewm/no_proc_acpi.patch | 17 | ||||
-rw-r--r-- | extra/icewm/use_ICEWM_deprecated.patch | 21 | ||||
-rw-r--r-- | extra/icewm/wmclient.patch | 25 |
5 files changed, 16 insertions, 81 deletions
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD index 290f16ec2..4f8b7adc2 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.1 # only change when Arch updates +pkgver=1.3.8 +pkgrel=1 pkgdesc="A Window Manager designed for speed, usability, and consistency" arch=('i686' 'x86_64' 'mips64el') url="http://www.icewm.org/" @@ -11,28 +11,26 @@ 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 --build=$CHOST --prefix=/usr --sysconfdir=/etc \ +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --build=$CHOST \ --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); |