shared-mime-info: upgrade

3 files changed, 74 insertions, 15 deletions

diff --git a/abs/core/shared-mime-info/PKGBUILD b/abs/core/shared-mime-info/PKGBUILD
index 4850139..45f7ba1 100644
--- a/abs/core/shared-mime-info/PKGBUILD
+++ b/abs/core/shared-mime-info/PKGBUILD
@@ -1,22 +1,29 @@
-# $Id: PKGBUILD 15025 2008-10-12 10:43:09Z jgc $
+# $Id: PKGBUILD 95306 2010-10-18 14:49:19Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=shared-mime-info
-pkgver=0.51
+pkgver=0.80
 pkgrel=1
 pkgdesc="Freedesktop.org Shared MIME Info"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libxml2>=2.6.32' 'glib2>=2.18.1')
-makedepends=('perlxml' 'pkgconfig')
+depends=('libxml2>=2.7.7' 'glib2>=2.26.0')
+makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
 url="http://freedesktop.org/Software/shared-mime-info"
-source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('01d72161f7d88123fbccd378871f02f0')
+source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2
+        pbm.patch)
+md5sums=('eb8d24a6a80888849c9db7f30232ba6a'
+         '39fcc08fbd33145684ba97f1f64644c2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-update-mimedb || return 1
+  patch -p1 -i "${srcdir}/pbm.patch"
+  ./configure --prefix=/usr --disable-update-mimedb
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/core/shared-mime-info/pbm.patch b/abs/core/shared-mime-info/pbm.patch
new file mode 100644
index 0000000..040900e
--- /dev/null
+++ b/abs/core/shared-mime-info/pbm.patch
@@ -0,0 +1,49 @@
+diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/freedesktop.org.xml
+--- shared-mime-info-0.70-orig/freedesktop.org.xml	2010-02-06 02:39:24.000000000 -0500
++++ shared-mime-info-0.70/freedesktop.org.xml	2010-02-06 02:48:01.000000000 -0500
+@@ -17025,12 +17025,10 @@
+     <magic priority="50">
+       <match value="P1" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P4" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+     </magic>
+@@ -17074,12 +17072,10 @@
+     <magic priority="50">
+       <match value="P2" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P5" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+     </magic>
+@@ -17123,12 +17119,10 @@
+     <magic priority="50">
+       <match value="P3" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P6" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+ 	</match>
+       </match>
+     </magic>
+@@ -23926,4 +23920,4 @@
+     </treemagic>
+   </mime-type>
+ 
+-</mime-info>
+\ No newline at end of file
++</mime-info>
diff --git a/abs/core/shared-mime-info/shared-mime-info.install b/abs/core/shared-mime-info/shared-mime-info.install
index 6b06094..fac0c1c 100644
--- a/abs/core/shared-mime-info/shared-mime-info.install
+++ b/abs/core/shared-mime-info/shared-mime-info.install
@@ -1,12 +1,15 @@
 post_install() {
-  update-mime-database /usr/share/mime > /dev/null 2>&1
+  update-mime-database usr/share/mime > /dev/null 2>&1
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-op=$1
-shift
-
-$op $*
+post_remove() {
+  if [ -d usr/share/mime ]; then
+    rm -f usr/share/mime/{globs,globs2,icons,treemagic,generic-icons,types,magic,XMLnamespaces,subclasses,aliases,mime.cache}
+    rm -rf usr/share/mime/{application,audio,image,inode,message,model,multipart,text,video,x-content,x-epoc}
+    rmdir --ignore-fail-on-non-empty usr/share/mime
+  fi
+}