[arch-commits] Commit in libmirage/trunk (PKGBUILD missing-xml.patch)

[Jan Steffens]

    Date: Sunday, June 29, 2014 @ 23:37:12
  Author: heftig
Revision: 113766

3.0.0

Modified:
  libmirage/trunk/PKGBUILD
  libmirage/trunk/missing-xml.patch

-------------------+
 PKGBUILD          |    8 ++++----
 missing-xml.patch |   20 +++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-29 21:27:34 UTC (rev 113765)
+++ PKGBUILD	2014-06-29 21:37:12 UTC (rev 113766)
@@ -4,7 +4,7 @@
 # Contributor: Charles Lindsay <charles at chaoslizard.org>
 
 pkgname=libmirage
-pkgver=2.1.1
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library"
 arch=(i686 x86_64)
@@ -15,13 +15,13 @@
 install=libmirage.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2
         missing-xml.patch)
-sha256sums=('f606391095200df510b923201881bfbadb6ab032035ce9a67aa24fcae3145108'
-            'c20e5d8d0695e3832971646eef2d735f1d12a4da767da1ff4f9c9af92ad7ad02')
+sha256sums=('bb0e0f0ed082efe03be4254d1be1310956652b1cec9fad10f9e602a088d17f84'
+            '53f98a6b894dbdb2733e17c00aee079d9a36fdd25e295f81487aad3c2d775563')
 
 prepare() {
   mkdir build
   cd $pkgname-$pkgver
-  patch -Np2 -i ../missing-xml.patch
+  patch -Np1 -i ../missing-xml.patch
 }
 
 build() {

Modified: missing-xml.patch
===================================================================
--- missing-xml.patch	2014-06-29 21:27:34 UTC (rev 113765)
+++ missing-xml.patch	2014-06-29 21:37:12 UTC (rev 113766)
@@ -1,8 +1,7 @@
-diff --git i/libmirage/src/filters/filter-daa/CMakeLists.txt w/libmirage/src/filters/filter-daa/CMakeLists.txt
-index ebd2890..e7021c1 100644
---- i/libmirage/src/filters/filter-daa/CMakeLists.txt
-+++ w/libmirage/src/filters/filter-daa/CMakeLists.txt
-@@ -35,6 +35,7 @@ if (${ZLIB_FOUND})
+diff -u -r libmirage-3.0.0/filters/filter-daa/CMakeLists.txt libmirage-3.0.0-xml/filters/filter-daa/CMakeLists.txt
+--- libmirage-3.0.0/filters/filter-daa/CMakeLists.txt	2014-06-29 15:25:04.000000000 +0200
++++ libmirage-3.0.0-xml/filters/filter-daa/CMakeLists.txt	2014-06-29 23:31:23.432780158 +0200
+@@ -35,6 +35,7 @@
  
      # Install MIME type
      install(FILES "libmirage-${filter_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
@@ -10,14 +9,13 @@
      if (POST_INSTALL_HOOKS)
          install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)")
      endif ()
-diff --git i/libmirage/src/parsers/image-mds/CMakeLists.txt w/libmirage/src/parsers/image-mds/CMakeLists.txt
-index c97be8f..bb0ee2b 100644
---- i/libmirage/src/parsers/image-mds/CMakeLists.txt
-+++ w/libmirage/src/parsers/image-mds/CMakeLists.txt
-@@ -20,6 +20,7 @@ if (TRUE)
+diff -u -r libmirage-3.0.0/images/image-mds/CMakeLists.txt libmirage-3.0.0-xml/images/image-mds/CMakeLists.txt
+--- libmirage-3.0.0/images/image-mds/CMakeLists.txt	2014-06-29 15:25:04.000000000 +0200
++++ libmirage-3.0.0-xml/images/image-mds/CMakeLists.txt	2014-06-29 23:32:31.092485925 +0200
+@@ -19,6 +19,7 @@
  
      # Install MIME type
-     install(FILES "libmirage-${parser_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
+     install(FILES "libmirage-${image_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
 +    install(FILES "libmirage-xmd.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
      if (POST_INSTALL_HOOKS)
          install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)")