[arch-commits] Commit in mupdf/repos (12 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu Apr 17 10:54:09 UTC 2014
Date: Thursday, April 17, 2014 @ 12:54:08
Author: spupykin
Revision: 109645
archrelease: copy trunk to community-i686, community-x86_64
Added:
mupdf/repos/community-i686/PKGBUILD
(from rev 109644, mupdf/trunk/PKGBUILD)
mupdf/repos/community-i686/mupdf-1.4-system-libcurl.patch
(from rev 109644, mupdf/trunk/mupdf-1.4-system-libcurl.patch)
mupdf/repos/community-i686/mupdf.install
(from rev 109644, mupdf/trunk/mupdf.install)
mupdf/repos/community-x86_64/PKGBUILD
(from rev 109644, mupdf/trunk/PKGBUILD)
mupdf/repos/community-x86_64/mupdf-1.4-system-libcurl.patch
(from rev 109644, mupdf/trunk/mupdf-1.4-system-libcurl.patch)
mupdf/repos/community-x86_64/mupdf.install
(from rev 109644, mupdf/trunk/mupdf.install)
Deleted:
mupdf/repos/community-i686/PKGBUILD
mupdf/repos/community-i686/mupdf-1.4-system-libcurl.patch
mupdf/repos/community-i686/mupdf.install
mupdf/repos/community-x86_64/PKGBUILD
mupdf/repos/community-x86_64/mupdf-1.4-system-libcurl.patch
mupdf/repos/community-x86_64/mupdf.install
-------------------------------------------------+
/PKGBUILD | 120 ++++++++++++++++++++++
/mupdf-1.4-system-libcurl.patch | 52 +++++++++
/mupdf.install | 24 ++++
community-i686/PKGBUILD | 59 ----------
community-i686/mupdf-1.4-system-libcurl.patch | 26 ----
community-i686/mupdf.install | 12 --
community-x86_64/PKGBUILD | 59 ----------
community-x86_64/mupdf-1.4-system-libcurl.patch | 26 ----
community-x86_64/mupdf.install | 12 --
9 files changed, 196 insertions(+), 194 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-i686/PKGBUILD 2014-04-17 10:54:08 UTC (rev 109645)
@@ -1,59 +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.4
-pkgrel=1
-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
-options=('staticlibs')
-source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
- mupdf-1.4-system-libcurl.patch)
-md5sums=('0f6840a7020db0c833b0c090ca1864ec'
- 'b9fa68f059cfcd0b95c1166c83fd2ec5')
-
-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() {
- 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
- 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/PKGBUILD (from rev 109644, mupdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-17 10:54:08 UTC (rev 109645)
@@ -0,0 +1,60 @@
+# $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.4
+pkgrel=2
+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
+options=('staticlibs')
+source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
+ mupdf-1.4-system-libcurl.patch)
+md5sums=('0f6840a7020db0c833b0c090ca1864ec'
+ 'b9fa68f059cfcd0b95c1166c83fd2ec5')
+
+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() {
+ 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
+ install -Dm644 build/release/libmujs.a "$pkgdir"/usr/lib
+
+ 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
+
+ find "$pkgdir"/usr/include \
+ "$pkgdir"/usr/share \
+ "$pkgdir"/usr/lib -type f | xargs chmod -v 0644
+}
Deleted: community-i686/mupdf-1.4-system-libcurl.patch
===================================================================
--- community-i686/mupdf-1.4-system-libcurl.patch 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-i686/mupdf-1.4-system-libcurl.patch 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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 ---
Copied: mupdf/repos/community-i686/mupdf-1.4-system-libcurl.patch (from rev 109644, mupdf/trunk/mupdf-1.4-system-libcurl.patch)
===================================================================
--- community-i686/mupdf-1.4-system-libcurl.patch (rev 0)
+++ community-i686/mupdf-1.4-system-libcurl.patch 2014-04-17 10:54:08 UTC (rev 109645)
@@ -0,0 +1,26 @@
+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 ---
Deleted: community-i686/mupdf.install
===================================================================
--- community-i686/mupdf.install 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-i686/mupdf.install 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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 109644, mupdf/trunk/mupdf.install)
===================================================================
--- community-i686/mupdf.install (rev 0)
+++ community-i686/mupdf.install 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-x86_64/PKGBUILD 2014-04-17 10:54:08 UTC (rev 109645)
@@ -1,59 +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.4
-pkgrel=1
-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
-options=('staticlibs')
-source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
- mupdf-1.4-system-libcurl.patch)
-md5sums=('0f6840a7020db0c833b0c090ca1864ec'
- 'b9fa68f059cfcd0b95c1166c83fd2ec5')
-
-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() {
- 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
- 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/PKGBUILD (from rev 109644, mupdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-17 10:54:08 UTC (rev 109645)
@@ -0,0 +1,60 @@
+# $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.4
+pkgrel=2
+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
+options=('staticlibs')
+source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
+ mupdf-1.4-system-libcurl.patch)
+md5sums=('0f6840a7020db0c833b0c090ca1864ec'
+ 'b9fa68f059cfcd0b95c1166c83fd2ec5')
+
+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() {
+ 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
+ install -Dm644 build/release/libmujs.a "$pkgdir"/usr/lib
+
+ 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
+
+ find "$pkgdir"/usr/include \
+ "$pkgdir"/usr/share \
+ "$pkgdir"/usr/lib -type f | xargs chmod -v 0644
+}
Deleted: community-x86_64/mupdf-1.4-system-libcurl.patch
===================================================================
--- community-x86_64/mupdf-1.4-system-libcurl.patch 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-x86_64/mupdf-1.4-system-libcurl.patch 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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 ---
Copied: mupdf/repos/community-x86_64/mupdf-1.4-system-libcurl.patch (from rev 109644, mupdf/trunk/mupdf-1.4-system-libcurl.patch)
===================================================================
--- community-x86_64/mupdf-1.4-system-libcurl.patch (rev 0)
+++ community-x86_64/mupdf-1.4-system-libcurl.patch 2014-04-17 10:54:08 UTC (rev 109645)
@@ -0,0 +1,26 @@
+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 ---
Deleted: community-x86_64/mupdf.install
===================================================================
--- community-x86_64/mupdf.install 2014-04-17 10:46:12 UTC (rev 109644)
+++ community-x86_64/mupdf.install 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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 109644, mupdf/trunk/mupdf.install)
===================================================================
--- community-x86_64/mupdf.install (rev 0)
+++ community-x86_64/mupdf.install 2014-04-17 10:54:08 UTC (rev 109645)
@@ -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