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

[Jan Steffens]

    Date: Sunday, December 19, 2021 @ 17:20:47
  Author: heftig
Revision: 1079059

3.2.6-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-19 17:20:30 UTC (rev 1079058)
+++ PKGBUILD	2021-12-19 17:20:47 UTC (rev 1079059)
@@ -3,8 +3,8 @@
 # Contributor: Charles Lindsay <charles at chaoslizard.org>
 
 pkgname=libmirage
-pkgver=3.2.5
-pkgrel=2
+pkgver=3.2.6
+pkgrel=1
 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,17 +11,11 @@
 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
-        fix-fwupd.diff)
-sha256sums=('d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139'
-            '3859903af5700f2536bfe4758f5176e3fc962a290d955a23526c342fa46a10d3')
+source=(https://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.xz)
+sha256sums=('257f4690c9195749ea936c4b44ada3e449b352dadaa107f31a1ed10f7b6df2a6')
 
 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() {

Deleted: fix-fwupd.diff
===================================================================
--- fix-fwupd.diff	2021-12-19 17:20:30 UTC (rev 1079058)
+++ fix-fwupd.diff	2021-12-19 17:20:47 UTC (rev 1079059)
@@ -1,18 +0,0 @@
-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>