[arch-commits] Commit in mupdf/trunk (4 files)

[Bartłomiej Piotrowski]

    Date: Friday, June 13, 2014 @ 20:25:58
  Author: bpiotrowski
Revision: 113109

upgpkg: mupdf 1.5-1

new upstream release

Added:
  mupdf/trunk/mupdf.desktop
  mupdf/trunk/mupdf.xpm
Modified:
  mupdf/trunk/PKGBUILD
Deleted:
  mupdf/trunk/mupdf-1.4-system-libcurl.patch

--------------------------------+
 PKGBUILD                       |   32 ++++++++++++--------------------
 mupdf-1.4-system-libcurl.patch |   26 --------------------------
 mupdf.desktop                  |   15 +++++++++++++++
 mupdf.xpm                      |    1 +
 4 files changed, 28 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-13 16:55:14 UTC (rev 113108)
+++ PKGBUILD	2014-06-13 18:25:58 UTC (rev 113109)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Brad Fanella <bradfanella at archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann at t-online.de>
 # Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.4
-pkgrel=2
+pkgver=1.5
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -17,21 +17,15 @@
 install=mupdf.install
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
-        mupdf-1.4-system-libcurl.patch)
-md5sums=('0f6840a7020db0c833b0c090ca1864ec'
-         'b9fa68f059cfcd0b95c1166c83fd2ec5')
+        mupdf.desktop
+        mupdf.xpm)
+md5sums=('89bd4ddc74c266062ebf2702741bb173'
+         '39b54f82a763aac54e352315a0ee9037'
+         'f3f35e7320bafde331250de1c99186a1')
 
 prepare() {
   cd $pkgname-$pkgver-source
   rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
-  patch -p1 -i ../mupdf-1.4-system-libcurl.patch
-
-  cd platform/debian
-  sed -i -e 's/mupdf.xpm/mupdf/' \
-    -e 's/application\/x-pdf/application\/x-pdf/' \
-    -e 's/mupdf-select-file/mupdf/' \
-    -e 's/^$/NoDisplay=true/' \
-    mupdf.desktop
 }
 
 build() {
@@ -50,11 +44,9 @@
   mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
   rm "$pkgdir"/usr/bin/mupdf-x11
 
-  cd platform/debian
-  install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
-  install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+  install -Dm644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+  install -Dm644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
-  find "$pkgdir"/usr/include \
-    "$pkgdir"/usr/share \
-    "$pkgdir"/usr/lib -type f | xargs chmod -v 0644
+  find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
+    -type f -exec chmod -v 0644 {} +
 }

Deleted: mupdf-1.4-system-libcurl.patch
===================================================================
--- mupdf-1.4-system-libcurl.patch	2014-06-13 16:55:14 UTC (rev 113108)
+++ mupdf-1.4-system-libcurl.patch	2014-06-13 18:25:58 UTC (rev 113109)
@@ -1,26 +0,0 @@
-diff -rupN a/Makerules b/Makerules
---- a/Makerules	2014-04-11 15:10:41.000000000 +0000
-+++ b/Makerules	2014-04-15 05:35:34.430028127 +0000
-@@ -47,6 +47,8 @@ SYS_OPENJPEG_LIBS = -lopenjpeg
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
- 
- CC = xcrun cc
- AR = xcrun ar
-diff -rupN a/Makethird b/Makethird
---- a/Makethird	2014-04-11 15:10:41.000000000 +0000
-+++ b/Makethird	2014-04-15 05:37:06.712810863 +0000
-@@ -454,6 +454,10 @@ CURL_CFLAGS := -I$(CURL_DIR)/include
- CURL_LIBS := $(SYS_CURL_DEPS)
- 
- HAVE_CURL := yes
-+else
-+HAVE_CURL := yes
-+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
-+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
- endif
- 
- # --- X11 ---

Added: mupdf.desktop
===================================================================
--- mupdf.desktop	                        (rev 0)
+++ mupdf.desktop	2014-06-13 18:25:58 UTC (rev 113109)
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=MuPDF
+GenericName=PDF file viewer
+Exec=mupdf %f
+TryExec=mupdf
+Icon=mupdf
+Terminal=false
+Type=Application
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
+Categories=Viewer;Graphics;
+Actions=View
+NoDisplay=true
+[Desktop Action View]
+Name=View with mupdf
+Exec=mupdf %f

Added: mupdf.xpm
===================================================================
(Binary files differ)

Index: mupdf/trunk/mupdf.xpm
===================================================================
--- mupdf.xpm	2014-06-13 16:55:14 UTC (rev 113108)
+++ mupdf.xpm	2014-06-13 18:25:58 UTC (rev 113109)

Property changes on: mupdf/trunk/mupdf.xpm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/x-xpmi
\ No newline at end of property