Mon May 28 17:43:57 UTC 2012

11 files changed, 159 insertions, 32 deletions

diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 7a43d184b..b997bbbe2 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151923 2012-03-04 10:46:24Z andrea $
+# $Id: PKGBUILD 159952 2012-05-27 10:21:37Z tomegun $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=easytag
 pkgver=2.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'libmp4v2' 'speex' 'wavpack')
+depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'desktop-file-utils')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('9df3e800d80e754670642f2ba5e03539')
@@ -25,8 +25,4 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-
-  # Remove directory mimetype
-#  sed '/^MimeType=/ s@;x-directory/normal;@;@' \
-#    -i ${pkgdir}/usr/share/applications/easytag.desktop
 }
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index ac3784d62..03eeab096 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157035 2012-04-23 09:53:22Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 159956 2012-05-27 10:22:22Z tomegun $
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64')
 url="http://gtkpod.sourceforge.net"
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 7c7951c04..1a0b1fc72 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,22 +1,31 @@
-# $Id: PKGBUILD 127320 2011-06-13 04:06:23Z eric $
+# $Id: PKGBUILD 160012 2012-05-28 00:49:21Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=icewm
 pkgver=1.3.7
-pkgrel=1
+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)
-md5sums=('224695231aedb2b91db3254a13e1c8dd')
-sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803')
+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}"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-shaped-decorations --enable-gradients
+  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
 }
 
diff --git a/extra/icewm/ignore_workarea_hints.patch b/extra/icewm/ignore_workarea_hints.patch
new file mode 100644
index 000000000..99ffa4a28
--- /dev/null
+++ b/extra/icewm/ignore_workarea_hints.patch
@@ -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" },
diff --git a/extra/icewm/no_proc_acpi.patch b/extra/icewm/no_proc_acpi.patch
new file mode 100644
index 000000000..4cd92360c
--- /dev/null
+++ b/extra/icewm/no_proc_acpi.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..3533d31e3
--- /dev/null
+++ b/extra/icewm/use_ICEWM_deprecated.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..95f00614d
--- /dev/null
+++ b/extra/icewm/wmclient.patch
@@ -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);
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index 8ab1a372a..c6b18078d 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142850 2011-11-17 01:39:31Z eric $
+# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
-pkgver=1.2.11
+pkgver=1.2.12
 pkgrel=1
 pkgdesc="A portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467')
+md5sums=('2218a193900e3203aa10dc24cdf54275')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index b01f571d0..ceccc583e 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157441 2012-04-28 10:45:14Z tomegun $
+# $Id: PKGBUILD 159958 2012-05-27 10:22:24Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmp4v2
-pkgver=1.9.1
-pkgrel=4
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="MPEG-4 library"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -13,11 +13,9 @@ url="http://code.google.com/p/mp4v2/"
 depends=('gcc-libs')
 options=('!libtool')
 source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
-#source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2")
 
 build() {
   cd ${srcdir}/mp4v2-${pkgver}
-#  cd ${srcdir}/mp4v2-trunk-r479
 
   ./configure --prefix=/usr
   make
@@ -25,8 +23,7 @@ build() {
 
 package() {
   cd ${srcdir}/mp4v2-${pkgver}
-#  cd ${srcdir}/mp4v2-trunk-r479
   make DESTDIR=${pkgdir} install
   make DESTDIR=${pkgdir} install-man
 }
-md5sums=('986701929ef15b03155ac4fb16444797')
+md5sums=('c91f06711225b34b4c192c9114887b14')
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index bd4f07597..a513693e7 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155839 2012-04-07 12:35:14Z giovanni $
+# $Id: PKGBUILD 160008 2012-05-27 23:45:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.5.0
+pkgver=5.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('2c89693b2a2391ece14a5c93ba8a9974')
+md5sums=('53e96b613752913da800dcde7b65cf6d')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 7c15073a2..5a1b3a8b4 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156004 2012-04-11 11:56:37Z bisson $
+# $Id: PKGBUILD 159998 2012-05-27 13:45:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc='Multilingual input method library'
 url='http://code.google.com/p/uim/'
@@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications'
             'gnome-panel: gnome applet indicator')
 options=('!libtool')
 source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('bf26b0b8b6b3949a612607df1d7feb9b6083745e')
+sha1sums=('99267908095e6e36ce78cf0316a17a7d5f2fcc68')
 
 install=install