Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 23 insertions, 17 deletions

diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index b04d9c8b9..60817c1a4 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87740 2013-04-05 21:06:47Z bpiotrowski $
+# $Id: PKGBUILD 92586 2013-06-09 13:32:10Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,34 +7,40 @@
 
 pkgname=mupdf
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mupdf.com'
 license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils')
 install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip)
-sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b')
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip
+        mupdf-1.2-fix-dirty-flag-handling.patch)
+sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b'
+            'd5c9ab3c5e9975909562230569a149a569f44fcd2b24c0b57e889b541a017f10')
+
+prepare() {
+  cd $pkgname-$pkgver-source
+  patch -Np1 -i "$srcdir"/mupdf-1.2-fix-dirty-flag-handling.patch
+}
 
 build() {
-    CFLAGS+=' -fPIC'
-    CXXFLAGS+=' -fPIC'
+  CFLAGS+=' -fPIC'
+  CXXFLAGS+=' -fPIC'
 
-	cd "$srcdir"/$pkgname-$pkgver-source
-	rm -rf thirdparty
-	make build=release prefix=/usr
+  cd $pkgname-$pkgver-source
+  rm -rf thirdparty
+  make build=release prefix=/usr
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver-source
-	make build=release prefix="$pkgdir"/usr install
-
-	sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop
-  	sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop
+  cd $pkgname-$pkgver-source
+  make build=release prefix="$pkgdir"/usr install
 
-	install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
-  	install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+  sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop
+  sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop
+  install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+  install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
-    chmod 644 "$pkgdir"/usr/lib/libfitz.a
+  chmod 644 "$pkgdir"/usr/lib/libfitz.a
 }