[arch-commits] Commit in shared-mime-info/repos (4 files)

2020-05-18 Thread Andreas Radke via arch-commits 
Date: Monday, May 18, 2020 @ 08:21:02
  Author: andyrtr
Revision: 385451

archrelease: copy trunk to testing-x86_64

Added:
  shared-mime-info/repos/testing-x86_64/
  shared-mime-info/repos/testing-x86_64/PKGBUILD
(from rev 385450, shared-mime-info/trunk/PKGBUILD)
  shared-mime-info/repos/testing-x86_64/shared-mime-info.install
(from rev 385450, shared-mime-info/trunk/shared-mime-info.install)
  shared-mime-info/repos/testing-x86_64/update-mime-database.hook
(from rev 385450, shared-mime-info/trunk/update-mime-database.hook)

---+
 PKGBUILD  |   60 
 shared-mime-info.install  |7 +
 update-mime-database.hook |   11 
 3 files changed, 78 insertions(+)

Copied: shared-mime-info/repos/testing-x86_64/PKGBUILD (from rev 385450, 
shared-mime-info/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-05-18 08:21:02 UTC (rev 385451)
@@ -0,0 +1,60 @@
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgname=shared-mime-info
+_commit=6bf9e4ff0fb7eff11a02bd937045bf5dc291841a # master 2020-05-06
+pkgver=2.0+1+g6bf9e4f
+pkgrel=2
+pkgdesc="Freedesktop.org Shared MIME Info"
+arch=('x86_64')
+license=('GPL2')
+depends=('libxml2' 'glib2')
+#makedepends=('itstool' 'gettext')
+makedepends=('itstool' 'gettext' 'xmlto' 'docbook-xsl' 'git' 'meson')
+install=shared-mime-info.install
+# https://gitlab.freedesktop.org/xdg/shared-mime-info
+url="https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/;
+#source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/$pkgname-$pkgver.tar.xz
+source=("git+https://gitlab.freedesktop.org/xdg/shared-mime-info.git#commit=$_commit;
+# tu run the testsuite
+
"git+https://gitlab.freedesktop.org/xdg/xdgmime.git#commit=6663a2288d11b37bc07f5a01b4b85dcd377787e1;
 # master 2019-06-03
+update-mime-database.hook)
+sha256sums=('SKIP'
+'SKIP'
+'f08efbcbac9d2bd18a805b8dcf3ed06d7763b97eca5935aa64d65593774b6501')
+options=(!makeflags)
+
+pkgver() {
+  cd $pkgname
+  git describe --long | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;'
+}
+
+prepare() {
+  # build xdgmime from source to run the testsuite - check HACKING.md
+  CFLAGS= make -C xdgmime
+}
+
+build() {
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  # https://bugs.archlinux.org/task/66687
+  #export ac_cv_func_fdatasync=no -> for now moved into aplm hook
+
+  arch-meson ${pkgname} build \
+-D update-mimedb=false \
+-D xdgmime-path=${srcdir}/xdgmime
+
+  # Print config
+  meson configure build
+  # compile it
+  ninja -C build 
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+  install -Dm644 "$srcdir"/update-mime-database.hook 
"$pkgdir"/usr/share/libalpm/hooks/update-mime-database.hook
+}

Copied: shared-mime-info/repos/testing-x86_64/shared-mime-info.install (from 
rev 385450, shared-mime-info/trunk/shared-mime-info.install)
===
--- testing-x86_64/shared-mime-info.install (rev 0)
+++ testing-x86_64/shared-mime-info.install 2020-05-18 08:21:02 UTC (rev 
385451)
@@ -0,0 +1,7 @@
+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
+}

Copied: shared-mime-info/repos/testing-x86_64/update-mime-database.hook (from 
rev 385450, shared-mime-info/trunk/update-mime-database.hook)
===
--- testing-x86_64/update-mime-database.hook(rev 0)
+++ testing-x86_64/update-mime-database.hook2020-05-18 08:21:02 UTC (rev 
385451)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/mime/packages/*.xml
+
+[Action]
+Description = Updating the MIME type database...
+When = PostTransaction
+Exec = /usr/bin/env PKGSYSTEM_ENABLE_FSYNC=0 /usr/bin/update-mime-database 
/usr/share/mime

[arch-commits] Commit in shared-mime-info/repos (4 files)

2020-05-01 Thread Andreas Radke via arch-commits 
Date: Friday, May 1, 2020 @ 18:01:38
  Author: andyrtr
Revision: 382100

archrelease: copy trunk to testing-x86_64

Added:
  shared-mime-info/repos/testing-x86_64/
  shared-mime-info/repos/testing-x86_64/PKGBUILD
(from rev 382099, shared-mime-info/trunk/PKGBUILD)
  shared-mime-info/repos/testing-x86_64/shared-mime-info.install
(from rev 382099, shared-mime-info/trunk/shared-mime-info.install)
  shared-mime-info/repos/testing-x86_64/update-mime-database.hook
(from rev 382099, shared-mime-info/trunk/update-mime-database.hook)

---+
 PKGBUILD  |   62 
 shared-mime-info.install  |7 
 update-mime-database.hook |   11 +++
 3 files changed, 80 insertions(+)

Copied: shared-mime-info/repos/testing-x86_64/PKGBUILD (from rev 382099, 
shared-mime-info/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-05-01 18:01:38 UTC (rev 382100)
@@ -0,0 +1,62 @@
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgname=shared-mime-info
+_commit=d23e9fa537b84950cdb518f87e3bf1f3f2577523 # master
+pkgver=1.15+43+gd23e9fa
+pkgrel=1
+pkgdesc="Freedesktop.org Shared MIME Info"
+arch=('x86_64')
+license=('GPL2')
+depends=('libxml2' 'glib2')
+#makedepends=('itstool' 'gettext')
+makedepends=('itstool' 'gettext' 'xmlto' 'docbook-xsl' 'git' 'meson')
+install=shared-mime-info.install
+# https://gitlab.freedesktop.org/xdg/shared-mime-info
+url="https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/;
+#source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/$pkgname-$pkgver.tar.xz
+source=("git+https://gitlab.freedesktop.org/xdg/shared-mime-info.git#commit=$_commit;
+# tu run the testsuite
+
"git+https://gitlab.freedesktop.org/xdg/xdgmime.git#commit=6663a2288d11b37bc07f5a01b4b85dcd377787e1;
 # master 2019-06-03
+update-mime-database.hook)
+sha256sums=('SKIP'
+'SKIP'
+'58ed2c38bf2c78276a309d2e24040ed159868b0f04e72a6b039ea803e45ff6f0')
+options=(!makeflags)
+
+pkgver() {
+  cd $pkgname
+  git describe --long | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;s/+/./'
+}
+
+prepare() {
+  # build xdgmime from source to run the testsuite - check HACKING.md
+  CFLAGS= make -C xdgmime
+}
+
+build() {
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  export ac_cv_func_fdatasync=no
+
+  arch-meson ${pkgname} build \
+-D update-mimedb=false \
+-D xdgmime-path=./xdgmime
+
+  # Print config
+#  meson configure build
+  # compile it
+  ninja -C build 
+}
+
+check() {
+  # one test failure not finding the file though it's there
+  # /build/shared-mime-info/src/shared-mime-info/tests/test_mime.sh: line 22: 
./xdgmime/src/test-mime-data: No such file or directory
+  # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/132
+  meson test -C build --print-errorlogs || /bin/true
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+  install -Dm644 "$srcdir"/update-mime-database.hook 
"$pkgdir"/usr/share/libalpm/hooks/update-mime-database.hook
+}

Copied: shared-mime-info/repos/testing-x86_64/shared-mime-info.install (from 
rev 382099, shared-mime-info/trunk/shared-mime-info.install)
===
--- testing-x86_64/shared-mime-info.install (rev 0)
+++ testing-x86_64/shared-mime-info.install 2020-05-01 18:01:38 UTC (rev 
382100)
@@ -0,0 +1,7 @@
+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
+}

Copied: shared-mime-info/repos/testing-x86_64/update-mime-database.hook (from 
rev 382099, shared-mime-info/trunk/update-mime-database.hook)
===
--- testing-x86_64/update-mime-database.hook(rev 0)
+++ testing-x86_64/update-mime-database.hook2020-05-01 18:01:38 UTC (rev 
382100)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/mime/packages/*.xml
+
+[Action]
+Description = Updating the MIME type database...
+When = PostTransaction
+Exec = /usr/bin/update-mime-database /usr/share/mime

[arch-commits] Commit in shared-mime-info/repos (4 files)

2019-01-27 Thread Andreas Radke via arch-commits 
Date: Sunday, January 27, 2019 @ 18:07:35
  Author: andyrtr
Revision: 344882

archrelease: copy trunk to testing-x86_64

Added:
  shared-mime-info/repos/testing-x86_64/
  shared-mime-info/repos/testing-x86_64/PKGBUILD
(from rev 344881, shared-mime-info/trunk/PKGBUILD)
  shared-mime-info/repos/testing-x86_64/shared-mime-info.install
(from rev 344881, shared-mime-info/trunk/shared-mime-info.install)
  shared-mime-info/repos/testing-x86_64/update-mime-database.hook
(from rev 344881, shared-mime-info/trunk/update-mime-database.hook)

---+
 PKGBUILD  |   39 +++
 shared-mime-info.install  |7 +++
 update-mime-database.hook |   11 +++
 3 files changed, 57 insertions(+)

Copied: shared-mime-info/repos/testing-x86_64/PKGBUILD (from rev 344881, 
shared-mime-info/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-01-27 18:07:35 UTC (rev 344882)
@@ -0,0 +1,39 @@
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgname=shared-mime-info
+pkgver=1.12
+pkgrel=1
+pkgdesc="Freedesktop.org Shared MIME Info"
+arch=('x86_64')
+license=('GPL2')
+depends=('libxml2' 'glib2')
+makedepends=('intltool' 'pkgconfig')
+install=shared-mime-info.install
+url="https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/;
+source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz
+update-mime-database.hook)
+sha256sums=('18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e'
+'7ecdd55ff7c4331e188cf46debbcc5660edb0e2bbeb4dd87cc5b87278c292821')
+options=(!makeflags)
+
+build() {
+  cd ${pkgname}-${pkgver}
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  export ac_cv_func_fdatasync=no
+  ./configure --prefix=/usr --disable-update-mimedb
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make -k check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "$srcdir"/update-mime-database.hook 
"$pkgdir"/usr/share/libalpm/hooks/update-mime-database.hook
+}

Copied: shared-mime-info/repos/testing-x86_64/shared-mime-info.install (from 
rev 344881, shared-mime-info/trunk/shared-mime-info.install)
===
--- testing-x86_64/shared-mime-info.install (rev 0)
+++ testing-x86_64/shared-mime-info.install 2019-01-27 18:07:35 UTC (rev 
344882)
@@ -0,0 +1,7 @@
+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
+}

Copied: shared-mime-info/repos/testing-x86_64/update-mime-database.hook (from 
rev 344881, shared-mime-info/trunk/update-mime-database.hook)
===
--- testing-x86_64/update-mime-database.hook(rev 0)
+++ testing-x86_64/update-mime-database.hook2019-01-27 18:07:35 UTC (rev 
344882)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/mime/packages/*.xml
+
+[Action]
+Description = Updating the MIME type database...
+When = PostTransaction
+Exec = /usr/bin/update-mime-database /usr/share/mime

[arch-commits] Commit in shared-mime-info/repos (4 files)

2018-08-05 Thread Andreas Radke via arch-commits 
Date: Sunday, August 5, 2018 @ 17:24:07
  Author: andyrtr
Revision: 330617

archrelease: copy trunk to testing-x86_64

Added:
  shared-mime-info/repos/testing-x86_64/
  shared-mime-info/repos/testing-x86_64/PKGBUILD
(from rev 330616, shared-mime-info/trunk/PKGBUILD)
  shared-mime-info/repos/testing-x86_64/shared-mime-info.install
(from rev 330616, shared-mime-info/trunk/shared-mime-info.install)
  shared-mime-info/repos/testing-x86_64/update-mime-database.hook
(from rev 330616, shared-mime-info/trunk/update-mime-database.hook)

---+
 PKGBUILD  |   40 
 shared-mime-info.install  |7 +++
 update-mime-database.hook |   11 +++
 3 files changed, 58 insertions(+)

Copied: shared-mime-info/repos/testing-x86_64/PKGBUILD (from rev 330616, 
shared-mime-info/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-08-05 17:24:07 UTC (rev 330617)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer: Jan de Groot 
+
+pkgname=shared-mime-info
+pkgver=1.10
+pkgrel=1
+pkgdesc="Freedesktop.org Shared MIME Info"
+arch=('x86_64')
+license=('GPL2')
+depends=('libxml2' 'glib2')
+makedepends=('intltool' 'pkgconfig')
+install=shared-mime-info.install
+url="https://freedesktop.org/Software/shared-mime-info;
+source=(https://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz
+update-mime-database.hook)
+sha256sums=('c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf'
+'7ecdd55ff7c4331e188cf46debbcc5660edb0e2bbeb4dd87cc5b87278c292821')
+options=(!makeflags)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  export ac_cv_func_fdatasync=no
+  ./configure --prefix=/usr --disable-update-mimedb
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "$srcdir"/update-mime-database.hook 
"$pkgdir"/usr/share/libalpm/hooks/update-mime-database.hook
+}

Copied: shared-mime-info/repos/testing-x86_64/shared-mime-info.install (from 
rev 330616, shared-mime-info/trunk/shared-mime-info.install)
===
--- testing-x86_64/shared-mime-info.install (rev 0)
+++ testing-x86_64/shared-mime-info.install 2018-08-05 17:24:07 UTC (rev 
330617)
@@ -0,0 +1,7 @@
+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
+}

Copied: shared-mime-info/repos/testing-x86_64/update-mime-database.hook (from 
rev 330616, shared-mime-info/trunk/update-mime-database.hook)
===
--- testing-x86_64/update-mime-database.hook(rev 0)
+++ testing-x86_64/update-mime-database.hook2018-08-05 17:24:07 UTC (rev 
330617)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/mime/packages/*.xml
+
+[Action]
+Description = Updating the MIME type database...
+When = PostTransaction
+Exec = /usr/bin/update-mime-database /usr/share/mime

[arch-commits] Commit in shared-mime-info/repos (4 files)

2010-02-06 Thread Eric Bélanger 
Date: Saturday, February 6, 2010 @ 03:33:20
  Author: eric
Revision: 67312

Merged revisions 67311 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/shared-mime-info/trunk


  r67311 | eric | 2010-02-06 03:33:01 -0500 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: shared-mime-info 0.71-1
  Upstream update, Fixed freedesktop.org.xml for portable pixmaps (close 
FS#17253), Removed leading slash in install scriptlet


Added:
  shared-mime-info/repos/extra-i686/pbm.patch
(from rev 67311, shared-mime-info/trunk/pbm.patch)
Modified:
  shared-mime-info/repos/extra-i686/(properties)
  shared-mime-info/repos/extra-i686/PKGBUILD
  shared-mime-info/repos/extra-i686/shared-mime-info.install

--+
 PKGBUILD |   10 +
 pbm.patch|   49 +
 shared-mime-info.install |2 -
 3 files changed, 56 insertions(+), 5 deletions(-)


Property changes on: shared-mime-info/repos/extra-i686
___
Modified: svnmerge-integrated
   - /shared-mime-info/trunk:1-57078
   + /shared-mime-info/trunk:1-67311

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-02-06 08:33:01 UTC (rev 67311)
+++ extra-i686/PKGBUILD 2010-02-06 08:33:20 UTC (rev 67312)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=shared-mime-info
-pkgver=0.70
-pkgrel=2
+pkgver=0.71
+pkgrel=1
 pkgdesc=Freedesktop.org Shared MIME Info
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,11 +11,13 @@
 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=('9032d98f14b8e13e0fea4bf45ca23401')
+source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2 pbm.patch)
+md5sums=('0a90508234d415f761a79fbffdff74f4' '39fcc08fbd33145684ba97f1f64644c2')
+sha1sums=('6f3d3379662857646b0c5b95d5d26e47c0b6250a' 
'1e8f1cf027e0ce4b5a88f0e36f4bab3ff2d320a5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/pbm.patch || return 1
   ./configure --prefix=/usr --disable-update-mimedb || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1

Copied: shared-mime-info/repos/extra-i686/pbm.patch (from rev 67311, 
shared-mime-info/trunk/pbm.patch)
===
--- extra-i686/pbm.patch(rev 0)
+++ extra-i686/pbm.patch2010-02-06 08:33:20 UTC (rev 67312)
@@ -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.0 -0500
 shared-mime-info-0.70/freedesktop.org.xml  2010-02-06 02:48:01.0 
-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

Modified: extra-i686/shared-mime-info.install
===
--- extra-i686/shared-mime-info.install 2010-02-06 08:33:01 UTC (rev 67311)
+++ extra-i686/shared-mime-info.install 2010-02-06 08:33:20 UTC (rev 67312)
@@ -1,5 +1,5 @@
 post_install() {
-  update-mime-database /usr/share/mime  /dev/null 21
+  update-mime-database usr/share/mime  /dev/null 21
 }
 
 post_upgrade() {

[arch-commits] Commit in shared-mime-info/repos (4 files)

2010-02-06 Thread Eric Bélanger 
Date: Saturday, February 6, 2010 @ 03:33:50
  Author: eric
Revision: 67313

Merged revisions 67311 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/shared-mime-info/trunk


  r67311 | eric | 2010-02-06 03:33:01 -0500 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: shared-mime-info 0.71-1
  Upstream update, Fixed freedesktop.org.xml for portable pixmaps (close 
FS#17253), Removed leading slash in install scriptlet


Added:
  shared-mime-info/repos/extra-x86_64/pbm.patch
(from rev 67311, shared-mime-info/trunk/pbm.patch)
Modified:
  shared-mime-info/repos/extra-x86_64/  (properties)
  shared-mime-info/repos/extra-x86_64/PKGBUILD
  shared-mime-info/repos/extra-x86_64/shared-mime-info.install

--+
 PKGBUILD |   10 +
 pbm.patch|   49 +
 shared-mime-info.install |2 -
 3 files changed, 56 insertions(+), 5 deletions(-)


Property changes on: shared-mime-info/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /shared-mime-info/trunk:1-57074
   + /shared-mime-info/trunk:1-67312

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-02-06 08:33:20 UTC (rev 67312)
+++ extra-x86_64/PKGBUILD   2010-02-06 08:33:50 UTC (rev 67313)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=shared-mime-info
-pkgver=0.70
-pkgrel=2
+pkgver=0.71
+pkgrel=1
 pkgdesc=Freedesktop.org Shared MIME Info
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,11 +11,13 @@
 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=('9032d98f14b8e13e0fea4bf45ca23401')
+source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2 pbm.patch)
+md5sums=('0a90508234d415f761a79fbffdff74f4' '39fcc08fbd33145684ba97f1f64644c2')
+sha1sums=('6f3d3379662857646b0c5b95d5d26e47c0b6250a' 
'1e8f1cf027e0ce4b5a88f0e36f4bab3ff2d320a5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/pbm.patch || return 1
   ./configure --prefix=/usr --disable-update-mimedb || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1

Copied: shared-mime-info/repos/extra-x86_64/pbm.patch (from rev 67311, 
shared-mime-info/trunk/pbm.patch)
===
--- extra-x86_64/pbm.patch  (rev 0)
+++ extra-x86_64/pbm.patch  2010-02-06 08:33:50 UTC (rev 67313)
@@ -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.0 -0500
 shared-mime-info-0.70/freedesktop.org.xml  2010-02-06 02:48:01.0 
-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

Modified: extra-x86_64/shared-mime-info.install
===
--- extra-x86_64/shared-mime-info.install   2010-02-06 08:33:20 UTC (rev 
67312)
+++ extra-x86_64/shared-mime-info.install   2010-02-06 08:33:50 UTC (rev 
67313)
@@ -1,5 +1,5 @@
 post_install() {
-  update-mime-database /usr/share/mime  /dev/null 21
+  update-mime-database usr/share/mime  /dev/null 21
 }
 
 post_upgrade() {