[arch-commits] Commit in mupdf/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sat Aug 31 09:24:59 UTC 2013
Date: Saturday, August 31, 2013 @ 11:24:59
Author: bpiotrowski
Revision: 96533
archrelease: copy trunk to community-i686, community-x86_64
Added:
mupdf/repos/community-i686/PKGBUILD
(from rev 96532, mupdf/trunk/PKGBUILD)
mupdf/repos/community-i686/mupdf-1.3-system-libcurl.patch
(from rev 96532, mupdf/trunk/mupdf-1.3-system-libcurl.patch)
mupdf/repos/community-i686/mupdf.install
(from rev 96532, mupdf/trunk/mupdf.install)
mupdf/repos/community-x86_64/PKGBUILD
(from rev 96532, mupdf/trunk/PKGBUILD)
mupdf/repos/community-x86_64/mupdf-1.3-system-libcurl.patch
(from rev 96532, mupdf/trunk/mupdf-1.3-system-libcurl.patch)
mupdf/repos/community-x86_64/mupdf.install
(from rev 96532, mupdf/trunk/mupdf.install)
Deleted:
mupdf/repos/community-i686/PKGBUILD
mupdf/repos/community-i686/mupdf.install
mupdf/repos/community-x86_64/PKGBUILD
mupdf/repos/community-x86_64/mupdf.install
-------------------------------------------------+
/PKGBUILD | 108 ++++++++++++++++++++++
/mupdf.install | 24 ++++
community-i686/PKGBUILD | 44 --------
community-i686/mupdf-1.3-system-libcurl.patch | 21 ++++
community-i686/mupdf.install | 12 --
community-x86_64/PKGBUILD | 44 --------
community-x86_64/mupdf-1.3-system-libcurl.patch | 21 ++++
community-x86_64/mupdf.install | 12 --
8 files changed, 174 insertions(+), 112 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-31 09:24:47 UTC (rev 96532)
+++ community-i686/PKGBUILD 2013-08-31 09:24:59 UTC (rev 96533)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
-# Contributor: xduugu
-
-pkgname=mupdf
-pkgver=1.3
-pkgrel=3
-pkgdesc='Lightweight PDF and XPS viewer'
-arch=('i686' 'x86_64')
-url='http://mupdf.com'
-license=('GPL3')
-depends=('desktop-file-utils' 'libxext' 'openssl')
-install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz)
-sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478')
-
-build() {
- CFLAGS+=' -fPIC'
- CXXFLAGS+=' -fPIC'
-
- cd $pkgname-$pkgver-source
- make build=release CURL_LIBS='-lcurl -lpthread'
-}
-
-package() {
- cd $pkgname-$pkgver-source
- make build=release prefix="$pkgdir"/usr install
-
- mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
- rm "$pkgdir"/usr/bin/mupdf-x11
-
- cd platform/debian
- sed -i -e 's/mupdf.xpm/mupdf/' \
- -e 's/application\/x-pdf/application\/x-pdf/' \
- -e 's/mupdf-select-file/mupdf/' \
- mupdf.desktop
- install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
- install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-
- chmod 644 "$pkgdir"/usr/lib/libmupdf{,-js-none}.a
-}
Copied: mupdf/repos/community-i686/PKGBUILD (from rev 96532, mupdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
+# Contributor: xduugu
+
+pkgname=mupdf
+pkgver=1.3
+pkgrel=4
+pkgdesc='Lightweight PDF and XPS viewer'
+arch=('i686' 'x86_64')
+url='http://mupdf.com'
+license=('GPL3')
+depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl')
+install=mupdf.install
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
+ mupdf-1.3-system-libcurl.patch)
+sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'
+ '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42')
+
+prepare() {
+ cd $pkgname-$pkgver-source
+ rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
+ patch -Np1 -i ../mupdf-1.3-system-libcurl.patch
+}
+
+build() {
+ CFLAGS+=' -fPIC'
+ CXXFLAGS+=' -fPIC'
+
+ cd $pkgname-$pkgver-source
+ make build=release CURL_LIBS='-lcurl -lpthread'
+}
+
+package() {
+ cd $pkgname-$pkgver-source
+ make build=release prefix="$pkgdir"/usr install
+
+ mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
+ rm "$pkgdir"/usr/bin/mupdf-x11
+
+ cd platform/debian
+ sed -i -e 's/mupdf.xpm/mupdf/' \
+ -e 's/application\/x-pdf/application\/x-pdf/' \
+ -e 's/mupdf-select-file/mupdf/' \
+ mupdf.desktop
+ 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
+}
Copied: mupdf/repos/community-i686/mupdf-1.3-system-libcurl.patch (from rev 96532, mupdf/trunk/mupdf-1.3-system-libcurl.patch)
===================================================================
--- community-i686/mupdf-1.3-system-libcurl.patch (rev 0)
+++ community-i686/mupdf-1.3-system-libcurl.patch 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,21 @@
+--- a/Makerules 2013-08-27 14:35:11.243520354 +0000
++++ b/Makerules 2013-08-27 15:40:22.583629510 +0000
+@@ -67,6 +67,8 @@
+ 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)
+
+ endif
+
+--- a/Makethird 2013-08-27 15:41:18.043354692 +0000
++++ b/Makethird 2013-08-27 15:42:41.332916192 +0000
+@@ -444,5 +444,6 @@
+ CURL_CFLAGS := -I$(CURL_DIR)/include
+ CURL_LIBS := $(SYS_CURL_DEPS)
+ else
+-NOCURL := yes
++CURL_CFLAGS := $(SYS_CURL_CFLAGS)
++CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
+ endif
Deleted: community-i686/mupdf.install
===================================================================
--- community-i686/mupdf.install 2013-08-31 09:24:47 UTC (rev 96532)
+++ community-i686/mupdf.install 2013-08-31 09:24:59 UTC (rev 96533)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: mupdf/repos/community-i686/mupdf.install (from rev 96532, mupdf/trunk/mupdf.install)
===================================================================
--- community-i686/mupdf.install (rev 0)
+++ community-i686/mupdf.install 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-31 09:24:47 UTC (rev 96532)
+++ community-x86_64/PKGBUILD 2013-08-31 09:24:59 UTC (rev 96533)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
-# Contributor: xduugu
-
-pkgname=mupdf
-pkgver=1.3
-pkgrel=3
-pkgdesc='Lightweight PDF and XPS viewer'
-arch=('i686' 'x86_64')
-url='http://mupdf.com'
-license=('GPL3')
-depends=('desktop-file-utils' 'libxext' 'openssl')
-install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz)
-sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478')
-
-build() {
- CFLAGS+=' -fPIC'
- CXXFLAGS+=' -fPIC'
-
- cd $pkgname-$pkgver-source
- make build=release CURL_LIBS='-lcurl -lpthread'
-}
-
-package() {
- cd $pkgname-$pkgver-source
- make build=release prefix="$pkgdir"/usr install
-
- mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
- rm "$pkgdir"/usr/bin/mupdf-x11
-
- cd platform/debian
- sed -i -e 's/mupdf.xpm/mupdf/' \
- -e 's/application\/x-pdf/application\/x-pdf/' \
- -e 's/mupdf-select-file/mupdf/' \
- mupdf.desktop
- install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
- install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-
- chmod 644 "$pkgdir"/usr/lib/libmupdf{,-js-none}.a
-}
Copied: mupdf/repos/community-x86_64/PKGBUILD (from rev 96532, mupdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
+# Contributor: xduugu
+
+pkgname=mupdf
+pkgver=1.3
+pkgrel=4
+pkgdesc='Lightweight PDF and XPS viewer'
+arch=('i686' 'x86_64')
+url='http://mupdf.com'
+license=('GPL3')
+depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl')
+install=mupdf.install
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
+ mupdf-1.3-system-libcurl.patch)
+sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'
+ '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42')
+
+prepare() {
+ cd $pkgname-$pkgver-source
+ rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
+ patch -Np1 -i ../mupdf-1.3-system-libcurl.patch
+}
+
+build() {
+ CFLAGS+=' -fPIC'
+ CXXFLAGS+=' -fPIC'
+
+ cd $pkgname-$pkgver-source
+ make build=release CURL_LIBS='-lcurl -lpthread'
+}
+
+package() {
+ cd $pkgname-$pkgver-source
+ make build=release prefix="$pkgdir"/usr install
+
+ mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
+ rm "$pkgdir"/usr/bin/mupdf-x11
+
+ cd platform/debian
+ sed -i -e 's/mupdf.xpm/mupdf/' \
+ -e 's/application\/x-pdf/application\/x-pdf/' \
+ -e 's/mupdf-select-file/mupdf/' \
+ mupdf.desktop
+ 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
+}
Copied: mupdf/repos/community-x86_64/mupdf-1.3-system-libcurl.patch (from rev 96532, mupdf/trunk/mupdf-1.3-system-libcurl.patch)
===================================================================
--- community-x86_64/mupdf-1.3-system-libcurl.patch (rev 0)
+++ community-x86_64/mupdf-1.3-system-libcurl.patch 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,21 @@
+--- a/Makerules 2013-08-27 14:35:11.243520354 +0000
++++ b/Makerules 2013-08-27 15:40:22.583629510 +0000
+@@ -67,6 +67,8 @@
+ 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)
+
+ endif
+
+--- a/Makethird 2013-08-27 15:41:18.043354692 +0000
++++ b/Makethird 2013-08-27 15:42:41.332916192 +0000
+@@ -444,5 +444,6 @@
+ CURL_CFLAGS := -I$(CURL_DIR)/include
+ CURL_LIBS := $(SYS_CURL_DEPS)
+ else
+-NOCURL := yes
++CURL_CFLAGS := $(SYS_CURL_CFLAGS)
++CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
+ endif
Deleted: community-x86_64/mupdf.install
===================================================================
--- community-x86_64/mupdf.install 2013-08-31 09:24:47 UTC (rev 96532)
+++ community-x86_64/mupdf.install 2013-08-31 09:24:59 UTC (rev 96533)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: mupdf/repos/community-x86_64/mupdf.install (from rev 96532, mupdf/trunk/mupdf.install)
===================================================================
--- community-x86_64/mupdf.install (rev 0)
+++ community-x86_64/mupdf.install 2013-08-31 09:24:59 UTC (rev 96533)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
More information about the arch-commits
mailing list