[arch-commits] Commit in atril/trunk (3 files)

[Brad Fanella]

    Date: Thursday, December 20, 2018 @ 04:19:27
  Author: cesura
Revision: 416844

upgpkg: atril 1.20.3-2

Fixed FS#61128

Added:
  atril/trunk/comicsdocument.atril-backend.in.patch
  atril/trunk/configure.ac.patch
Modified:
  atril/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   56 ++++++++++++++++++--------------
 comicsdocument.atril-backend.in.patch |    8 ++++
 configure.ac.patch                    |   11 ++++++
 3 files changed, 51 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-20 04:17:25 UTC (rev 416843)
+++ PKGBUILD	2018-12-20 04:19:27 UTC (rev 416844)
@@ -3,7 +3,7 @@
 
 pkgname=atril
 pkgver=1.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc="MATE document viewer"
 url="https://mate-desktop.org"
 arch=('x86_64')
@@ -15,38 +15,46 @@
 groups=('mate-extra')
 conflicts=('atril-gtk3')
 replaces=('atril-gtk3')
-source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('79dbcdf663a7a40194ece1b1ac3304a35b6828b0a68eed286c0e9c319dc77903')
+source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+	"comicsdocument.atril-backend.in.patch"
+	"configure.ac.patch")
+sha256sums=('79dbcdf663a7a40194ece1b1ac3304a35b6828b0a68eed286c0e9c319dc77903'
+            '03775ab5cacae05d1e42c77cef8c6105fd822534408d48490b2ff014221f163b'
+            'a00899287858adf6e594944e408f7e58c30d7675c935b7efe742a5ceec1c17da')
 
 prepare() {
-    cd $pkgname-$pkgver
+	cd "$pkgname-$pkgver"
 
-    # Fix mathjax path
-    sed -i 's|/usr/share/javascript/mathjax|/usr/share/mathjax|' backend/epub/epub-document.c
+	# Fix mathjax path
+	sed -i 's|/usr/share/javascript/mathjax|/usr/share/mathjax|' backend/epub/epub-document.c
+
+	# Fix FS#61128
+	patch -p0 < ../configure.ac.patch
+	patch -p0 < ../comicsdocument.atril-backend.in.patch
 }
 
 build() {
-    cd $pkgname-$pkgver
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgbase} \
-        --with-gtk=2.0 \
-        --enable-djvu \
-        --enable-dvi \
-        --enable-epub \
-        --enable-t1lib \
-        --enable-pixbuf \
-        --enable-comics \
-        --enable-xps \
-        --enable-introspection
+	cd "$pkgname-$pkgver"
+	./configure \
+        	--prefix=/usr \
+        	--libexecdir=/usr/lib/${_pkgbase} \
+        	--with-gtk=2.0 \
+        	--enable-djvu \
+        	--enable-dvi \
+        	--enable-epub \
+        	--enable-t1lib \
+        	--enable-pixbuf \
+        	--enable-comics \
+        	--enable-xps \
+        	--enable-introspection
 
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    	#https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-    make
+    	make
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
+    	cd "$pkgname-$pkgver"
+    	make DESTDIR="$pkgdir" install
 }

Added: comicsdocument.atril-backend.in.patch
===================================================================
--- comicsdocument.atril-backend.in.patch	                        (rev 0)
+++ comicsdocument.atril-backend.in.patch	2018-12-20 04:19:27 UTC (rev 416844)
@@ -0,0 +1,8 @@
+--- backend/comics/comicsdocument.atril-backend.in.orig	2018-12-19 21:56:58.967629664 -0600
++++ backend/comics/comicsdocument.atril-backend.in	2018-12-19 21:57:16.687554873 -0600
+@@ -1,4 +1,4 @@
+ [Atril Backend]
+ Module=comicsdocument
+ _TypeDescription=Comic Books
+-MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.rar;
++MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar;

Added: configure.ac.patch
===================================================================
--- configure.ac.patch	                        (rev 0)
+++ configure.ac.patch	2018-12-20 04:19:27 UTC (rev 416844)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-12-19 21:53:32.977910976 -0600
++++ configure.ac	2018-12-19 21:56:20.418981753 -0600
+@@ -639,7 +639,7 @@
+     ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/tiff;"
+ fi
+ if test "x$enable_comics" = "xyes"; then
+-    ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.rar;"
++    ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd-comicbook.rar;"
+ fi
+ if test "x$enable_pixbuf" = "xyes"; then
+     ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/*;"