[arch-commits] Commit in converseen/trunk (PKGBUILD converseen-IM-formats.patch)

[Antonio Rojas]

    Date: Monday, October 11, 2021 @ 22:30:21
  Author: arojas
Revision: 1029615

Update to 0.9.9.2, don't crash if some IM module can't be loaded

Added:
  converseen/trunk/converseen-IM-formats.patch
Modified:
  converseen/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   15 +++++++++------
 converseen-IM-formats.patch |   18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-11 22:03:29 UTC (rev 1029614)
+++ PKGBUILD	2021-10-11 22:30:21 UTC (rev 1029615)
@@ -3,22 +3,25 @@
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.9.9.1
+pkgver=0.9.9.2
 pkgrel=1
 pkgdesc='Batch image converter and resizer'
 arch=('x86_64')
 url='http://converseen.fasterland.net/'
 license=('GPL3')
-depends=('djvulibre' 'ghostscript' 'hicolor-icon-theme' 'libheif' 'imagemagick' 'libraw' 'librsvg'
-         'libwebp' 'libwmf' 'libzip' 'openexr' 'qt5-base')
-makedepends=('cmake' 'qt5-tools')
-source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('b5615a76a87e6bcb064ac0d5032f606bba0666815c178b27903806349818d30e')
+depends=('hicolor-icon-theme' 'imagemagick' 'qt5-base')
+makedepends=('cmake' 'qt5-tools') 
+source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+         converseen-IM-formats.patch)
+sha256sums=('4dfaac49e451dd1e6734e6d377508680138d7262c08abed366a69bd498636fac'
+            '6506abbaf52cccc8ff49f503eb083d5360135485d8f1cb72600b865b941f5378')
 
 prepare() {
   cd $pkgname-$pkgver
   convert res/converseen.png +set date:create +set date:modify -resize 256x256 -alpha on res/converseen.png
   sed -i 's|/share/pixmaps|/share/icons/hicolor/256x256/apps|' CMakeLists.txt
+
+  patch -p1 < ../converseen-IM-formats.patch # Don't crash on missing imagemagick dependencies
 }
 
 build() {

Added: converseen-IM-formats.patch
===================================================================
--- converseen-IM-formats.patch	                        (rev 0)
+++ converseen-IM-formats.patch	2021-10-11 22:30:21 UTC (rev 1029615)
@@ -0,0 +1,18 @@
+diff -ru converseen-0.9.9.2.orig/src/formats.cpp converseen-0.9.9.2/src/formats.cpp
+--- converseen-0.9.9.2.orig/src/formats.cpp	2021-05-03 12:00:24.000000000 +0200
++++ converseen-0.9.9.2/src/formats.cpp	2021-10-12 00:26:24.119475202 +0200
+@@ -37,11 +37,13 @@
+ {
+ //#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     list<CoderInfo> coderList;
++    try {
+     coderInfoList(&coderList,
+                   CoderInfo::TrueMatch,
+                   CoderInfo::AnyMatch,
+                   CoderInfo::AnyMatch);
+-
++    }
++    catch (Magick::ErrorModule&) {}
+     list<CoderInfo>::iterator entry = coderList.begin();
+     QString readableExts;
+