From 3bf48d7ffdf20be10852ddc9d1d79bebc53f2123 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sat, 21 Apr 2007 11:29:46 +0200 Subject: [PATCH] shared-mime-info: updated to 0.21. Also replaced my crappy patch with Matt's simple sed calls. --- shared-mime-info/.footprint | 24 ++++++++++++++++++++++-- shared-mime-info/.md5sum | 3 +-- shared-mime-info/Pkgfile | 13 ++++++++----- shared-mime-info/shared-mime-info.patch | 21 --------------------- 4 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 shared-mime-info/shared-mime-info.patch diff --git a/shared-mime-info/.footprint b/shared-mime-info/.footprint index 702a31431..34020b866 100644 --- a/shared-mime-info/.footprint +++ b/shared-mime-info/.footprint @@ -29,6 +29,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/pgp-encrypted.xml -rw-r--r-- root/root usr/share/mime/application/pgp-keys.xml -rw-r--r-- root/root usr/share/mime/application/pgp-signature.xml +-rw-r--r-- root/root usr/share/mime/application/pkcs10.xml -rw-r--r-- root/root usr/share/mime/application/pkcs7-mime.xml -rw-r--r-- root/root usr/share/mime/application/pkcs7-signature.xml -rw-r--r-- root/root usr/share/mime/application/postscript.xml @@ -47,6 +48,8 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/vnd.ms-access.xml -rw-r--r-- root/root usr/share/mime/application/vnd.ms-excel.xml -rw-r--r-- root/root usr/share/mime/application/vnd.ms-powerpoint.xml +-rw-r--r-- root/root usr/share/mime/application/vnd.ms-tnef.xml +-rw-r--r-- root/root usr/share/mime/application/vnd.ms-xpsdocument.xml -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.chart.xml -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.database.xml -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.formula.xml @@ -157,6 +160,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-graphite.xml -rw-r--r-- root/root usr/share/mime/application/x-gtar.xml -rw-r--r-- root/root usr/share/mime/application/x-gtktalog.xml +-rw-r--r-- root/root usr/share/mime/application/x-gz-font-linux-psf.xml -rw-r--r-- root/root usr/share/mime/application/x-gzdvi.xml -rw-r--r-- root/root usr/share/mime/application/x-gzip.xml -rw-r--r-- root/root usr/share/mime/application/x-gzpdf.xml @@ -208,6 +212,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-object.xml -rw-r--r-- root/root usr/share/mime/application/x-ole-storage.xml -rw-r--r-- root/root usr/share/mime/application/x-oleo.xml +-rw-r--r-- root/root usr/share/mime/application/x-pak.xml -rw-r--r-- root/root usr/share/mime/application/x-palm-database.xml -rw-r--r-- root/root usr/share/mime/application/x-par2.xml -rw-r--r-- root/root usr/share/mime/application/x-pef-executable.xml @@ -254,6 +259,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-troff-man-compressed.xml -rw-r--r-- root/root usr/share/mime/application/x-troff-man.xml -rw-r--r-- root/root usr/share/mime/application/x-tzo.xml +-rw-r--r-- root/root usr/share/mime/application/x-ufraw.xml -rw-r--r-- root/root usr/share/mime/application/x-ustar.xml -rw-r--r-- root/root usr/share/mime/application/x-wais-source.xml -rw-r--r-- root/root usr/share/mime/application/x-wpg.xml @@ -277,7 +283,6 @@ drwxr-xr-x root/root usr/share/mime/audio/ -rw-r--r-- root/root usr/share/mime/audio/mpeg.xml -rw-r--r-- root/root usr/share/mime/audio/prs.sid.xml -rw-r--r-- root/root usr/share/mime/audio/vnd.rn-realaudio.xml --rw-r--r-- root/root usr/share/mime/audio/vnd.rn-realvideo.xml -rw-r--r-- root/root usr/share/mime/audio/x-adpcm.xml -rw-r--r-- root/root usr/share/mime/audio/x-aifc.xml -rw-r--r-- root/root usr/share/mime/audio/x-aiff.xml @@ -287,13 +292,15 @@ drwxr-xr-x root/root usr/share/mime/audio/ -rw-r--r-- root/root usr/share/mime/audio/x-flac.xml -rw-r--r-- root/root usr/share/mime/audio/x-it.xml -rw-r--r-- root/root usr/share/mime/audio/x-matroska.xml +-rw-r--r-- root/root usr/share/mime/audio/x-minipsf.xml -rw-r--r-- root/root usr/share/mime/audio/x-mod.xml -rw-r--r-- root/root usr/share/mime/audio/x-mp3-playlist.xml --rw-r--r-- root/root usr/share/mime/audio/x-mpeg.xml -rw-r--r-- root/root usr/share/mime/audio/x-mpegurl.xml -rw-r--r-- root/root usr/share/mime/audio/x-ms-asx.xml -rw-r--r-- root/root usr/share/mime/audio/x-ms-wma.xml -rw-r--r-- root/root usr/share/mime/audio/x-musepack.xml +-rw-r--r-- root/root usr/share/mime/audio/x-psf.xml +-rw-r--r-- root/root usr/share/mime/audio/x-psflib.xml -rw-r--r-- root/root usr/share/mime/audio/x-riff.xml -rw-r--r-- root/root usr/share/mime/audio/x-s3m.xml -rw-r--r-- root/root usr/share/mime/audio/x-scpls.xml @@ -329,11 +336,15 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/vnd.rn-realpix.xml -rw-r--r-- root/root usr/share/mime/image/vnd.wap.wbmp.xml -rw-r--r-- root/root usr/share/mime/image/x-3ds.xml +-rw-r--r-- root/root usr/share/mime/image/x-adobe-dng.xml -rw-r--r-- root/root usr/share/mime/image/x-applix-graphics.xml -rw-r--r-- root/root usr/share/mime/image/x-bzeps.xml +-rw-r--r-- root/root usr/share/mime/image/x-canon-cr2.xml -rw-r--r-- root/root usr/share/mime/image/x-canon-crw.xml -rw-r--r-- root/root usr/share/mime/image/x-cmu-raster.xml -rw-r--r-- root/root usr/share/mime/image/x-compressed-xcf.xml +-rw-r--r-- root/root usr/share/mime/image/x-dcraw.xml +-rw-r--r-- root/root usr/share/mime/image/x-dds.xml -rw-r--r-- root/root usr/share/mime/image/x-dib.xml -rw-r--r-- root/root usr/share/mime/image/x-eps.xml -rw-r--r-- root/root usr/share/mime/image/x-fits.xml @@ -346,6 +357,7 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/x-ilbm.xml -rw-r--r-- root/root usr/share/mime/image/x-jng.xml -rw-r--r-- root/root usr/share/mime/image/x-kodak-dcr.xml +-rw-r--r-- root/root usr/share/mime/image/x-kodak-k25.xml -rw-r--r-- root/root usr/share/mime/image/x-kodak-kdc.xml -rw-r--r-- root/root usr/share/mime/image/x-lwo.xml -rw-r--r-- root/root usr/share/mime/image/x-lws.xml @@ -355,7 +367,9 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/x-niff.xml -rw-r--r-- root/root usr/share/mime/image/x-nikon-nef.xml -rw-r--r-- root/root usr/share/mime/image/x-olympus-orf.xml +-rw-r--r-- root/root usr/share/mime/image/x-panasonic-raw.xml -rw-r--r-- root/root usr/share/mime/image/x-pcx.xml +-rw-r--r-- root/root usr/share/mime/image/x-pentax-pef.xml -rw-r--r-- root/root usr/share/mime/image/x-photo-cd.xml -rw-r--r-- root/root usr/share/mime/image/x-pict.xml -rw-r--r-- root/root usr/share/mime/image/x-portable-anymap.xml @@ -365,12 +379,17 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/x-psd.xml -rw-r--r-- root/root usr/share/mime/image/x-rgb.xml -rw-r--r-- root/root usr/share/mime/image/x-sgi.xml +-rw-r--r-- root/root usr/share/mime/image/x-sigma-x3f.xml +-rw-r--r-- root/root usr/share/mime/image/x-sony-arw.xml +-rw-r--r-- root/root usr/share/mime/image/x-sony-sr2.xml +-rw-r--r-- root/root usr/share/mime/image/x-sony-srf.xml -rw-r--r-- root/root usr/share/mime/image/x-sun-raster.xml -rw-r--r-- root/root usr/share/mime/image/x-tga.xml -rw-r--r-- root/root usr/share/mime/image/x-win-bitmap.xml -rw-r--r-- root/root usr/share/mime/image/x-wmf.xml -rw-r--r-- root/root usr/share/mime/image/x-xbitmap.xml -rw-r--r-- root/root usr/share/mime/image/x-xcf.xml +-rw-r--r-- root/root usr/share/mime/image/x-xcursor.xml -rw-r--r-- root/root usr/share/mime/image/x-xfig.xml -rw-r--r-- root/root usr/share/mime/image/x-xpixmap.xml -rw-r--r-- root/root usr/share/mime/image/x-xwindowdump.xml @@ -493,6 +512,7 @@ drwxr-xr-x root/root usr/share/mime/video/ -rw-r--r-- root/root usr/share/mime/video/mpeg.xml -rw-r--r-- root/root usr/share/mime/video/quicktime.xml -rw-r--r-- root/root usr/share/mime/video/vivo.xml +-rw-r--r-- root/root usr/share/mime/video/vnd.rn-realvideo.xml -rw-r--r-- root/root usr/share/mime/video/wavelet.xml -rw-r--r-- root/root usr/share/mime/video/x-anim.xml -rw-r--r-- root/root usr/share/mime/video/x-flic.xml diff --git a/shared-mime-info/.md5sum b/shared-mime-info/.md5sum index 4e77dda76..81692c7b0 100644 --- a/shared-mime-info/.md5sum +++ b/shared-mime-info/.md5sum @@ -1,2 +1 @@ -62184241d497d34138285bc248b3fabc shared-mime-info-0.20.tar.bz2 -bb48248d6e023ddbcf9d2bd4180ab3b7 shared-mime-info.patch +e1965e129a473683ba395ebc02206367 shared-mime-info-0.21.tar.bz2 diff --git a/shared-mime-info/Pkgfile b/shared-mime-info/Pkgfile index 9bc92e401..833e8ea10 100644 --- a/shared-mime-info/Pkgfile +++ b/shared-mime-info/Pkgfile @@ -5,15 +5,18 @@ # Group: gnome name=shared-mime-info -version=0.20 +version=0.21 release=1 -source=(http://freedesktop.org/~hadess/$name-$version.tar.bz2 \ - $name.patch) +source=(http://freedesktop.org/~hadess/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 < ../$name.patch - ./configure --prefix=/usr + + rm po/*.po + sed -i -e 's/USE_NLS=yes/USE_NLS=no/' \ + -e 's/ENABLE_NLS 1/ENABLE_NLS 0/' configure + + ./configure --prefix=/usr --mandir=/usr/man make make DESTDIR=$PKG install diff --git a/shared-mime-info/shared-mime-info.patch b/shared-mime-info/shared-mime-info.patch deleted file mode 100644 index e1257722d..000000000 --- a/shared-mime-info/shared-mime-info.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN shared-mime-info-0.14.orig/configure shared-mime-info-0.15/configure ---- shared-mime-info-0.14.orig/configure 2004-04-26 13:40:35.884056512 -0400 -+++ shared-mime-info-0.15/configure 2004-04-26 13:40:36.098023984 -0400 -@@ -3513,7 +3513,7 @@ - - fi - fi -- USE_NLS=yes -+ USE_NLS=no - - - gt_cv_have_gettext=no -@@ -4440,7 +4440,7 @@ - if test "$gt_cv_have_gettext" = "yes" ; then - - cat >>confdefs.h <<\_ACEOF --#define ENABLE_NLS 1 -+#define ENABLE_NLS 0 - _ACEOF - - fi