[arch-commits] Commit in easytag/trunk (PKGBUILD easytag.install mp4v2-1.9.patch)

[Andrea Scarpino]

    Date: Sunday, March 4, 2012 @ 05:45:52
  Author: andrea
Revision: 151922

upgpkg: easytag 2.1.7-1

Upstream release

Modified:
  easytag/trunk/PKGBUILD
  easytag/trunk/easytag.install
Deleted:
  easytag/trunk/mp4v2-1.9.patch

-----------------+
 PKGBUILD        |   20 +++++++++-----------
 easytag.install |    7 +++----
 mp4v2-1.9.patch |   51 ---------------------------------------------------
 3 files changed, 12 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-04 10:39:20 UTC (rev 151921)
+++ PKGBUILD	2012-03-04 10:45:52 UTC (rev 151922)
@@ -1,25 +1,23 @@
 # $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Maintainer:
+# Contributor: Kevin Piche <kevin at archlinux.org>
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=easytag
-pkgver=2.1.6
-pkgrel=4
+pkgver=2.1.7
+pkgrel=1
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://easytag.sourceforge.net/"
+url='http://easytag.sourceforge.net/'
 depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'libmp4v2' 'speex' 'wavpack')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'mp4v2-1.9.patch')
-md5sums=('6c5b9dc2bf1f3b0a11bd4efc81aaa9ee'
-         '912d9baa362c4d9e5aee0436b4ccb5a2')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9df3e800d80e754670642f2ba5e03539')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/mp4v2-1.9.patch
   ./configure --prefix=/usr
   make
 }
@@ -29,6 +27,6 @@
   make DESTDIR=${pkgdir} install
 
   # Remove directory mimetype
-  sed '/^MimeType=/ s@;x-directory/normal;@;@' \
-    -i ${pkgdir}/usr/share/applications/easytag.desktop
+#  sed '/^MimeType=/ s@;x-directory/normal;@;@' \
+#    -i ${pkgdir}/usr/share/applications/easytag.desktop
 }

Modified: easytag.install
===================================================================
--- easytag.install	2012-03-04 10:39:20 UTC (rev 151921)
+++ easytag.install	2012-03-04 10:45:52 UTC (rev 151922)
@@ -1,12 +1,11 @@
 post_install() {
-  update-desktop-database -q
+    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
 }
 
 post_upgrade() {
-  update-desktop-database -q
+    post_install
 }
 
 post_remove() {
-  update-desktop-database -q
+    post_install
 }
-

Deleted: mp4v2-1.9.patch
===================================================================
--- mp4v2-1.9.patch	2012-03-04 10:39:20 UTC (rev 151921)
+++ mp4v2-1.9.patch	2012-03-04 10:45:52 UTC (rev 151922)
@@ -1,51 +0,0 @@
-diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
---- easytag-2.1.6.orig/configure	2008-07-12 17:57:44.000000000 +0300
-+++ easytag-2.1.6/configure	2009-07-10 16:44:39.000000000 +0300
-@@ -22418,12 +22418,12 @@
- /* end confdefs.h.  */
- 
-                 #include <stdio.h>
--                #include <mpeg4ip_config.h>
-+                #include <mp4v2/mp4v2.h>
-                 int main (void)
-                 {
-                     FILE *output;
-                     output=fopen("conftest.mp4v2","w");
--                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-                     fclose(output);
-                     exit(0);
-                 }
-@@ -22471,7 +22471,7 @@
- 
-                 cat >conftest.$ac_ext <<_ACEOF
- 
--           #include <mp4.h>
-+           #include <mp4v2/mp4v2.h>
-            main () {
-            MP4FileHandle hFile;
-            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
-diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
---- easytag-2.1.6.orig/src/mp4_header.c	2007-11-28 10:54:35.000000000 +0200
-+++ easytag-2.1.6/src/mp4_header.c	2009-07-10 16:44:54.000000000 +0300
-@@ -44,7 +44,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
-diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
---- easytag-2.1.6.orig/src/mp4_tag.c	2007-12-11 00:08:11.000000000 +0200
-+++ easytag-2.1.6/src/mp4_tag.c	2009-07-10 16:45:08.000000000 +0300
-@@ -50,7 +50,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************