[arch-commits] Commit in libmirage/trunk (PKGBUILD fix-fwupd.diff)

[Jan Steffens]

    Date: Thursday, December 16, 2021 @ 15:54:37
  Author: heftig
Revision: 1074575

3.2.5-2: unbreak fwupd

Added:
  libmirage/trunk/fix-fwupd.diff
Modified:
  libmirage/trunk/PKGBUILD

----------------+
 PKGBUILD       |   14 ++++++++++----
 fix-fwupd.diff |   18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-16 15:52:23 UTC (rev 1074574)
+++ PKGBUILD	2021-12-16 15:54:37 UTC (rev 1074575)
@@ -4,7 +4,7 @@
 
 pkgname=libmirage
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library"
 arch=(x86_64)
 url="https://cdemu.sourceforge.io/"
@@ -11,16 +11,22 @@
 license=(GPL)
 depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info)
 makedepends=(gtk-doc gobject-introspection cmake intltool)
-source=(https://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.xz)
-sha256sums=('d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139')
+source=(https://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.xz
+        fix-fwupd.diff)
+sha256sums=('d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139'
+            '3859903af5700f2536bfe4758f5176e3fc962a290d955a23526c342fa46a10d3')
 
 prepare() {
   cd $pkgname-$pkgver
+  
+  # remove overly broad mime magic that breaks fwupd
+  # https://github.com/cdemu/cdemu/issues/20
+  patch -Np1 -i ../fix-fwupd.diff
 }
 
 build() {
   cmake -S $pkgname-$pkgver -B build \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DPOST_INSTALL_HOOKS:BOOL=OFF

Added: fix-fwupd.diff
===================================================================
--- fix-fwupd.diff	                        (rev 0)
+++ fix-fwupd.diff	2021-12-16 15:54:37 UTC (rev 1074575)
@@ -0,0 +1,18 @@
+diff -u -r l/images/image-harddisk/libmirage-apple.xml.in l2/images/image-harddisk/libmirage-apple.xml.in
+--- l/images/image-harddisk/libmirage-apple.xml.in	2021-04-17 11:19:54.000000000 +0000
++++ l2/images/image-harddisk/libmirage-apple.xml.in	2021-12-16 15:52:00.461808945 +0000
+@@ -13,14 +13,5 @@
+         <magic priority="50">
+             <match value="koly" type="string" offset="0"/>
+         </magic>
+-
+-        <magic priority="20">
+-            <match value="ER" type="string" offset="0"/>
+-            <match value="PM" type="string" offset="512"/>
+-
+-            <match value="BD" type="string" offset="1024"/>
+-            <match value="H+" type="string" offset="1024"/>
+-            <match value="HX" type="string" offset="1024"/>
+-        </magic>
+     </mime-type>
+ </mime-info>