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

2020-09-14 Thread Frederik Schwan via arch-commits 
Date: Monday, September 14, 2020 @ 13:39:57
  Author: freswa
Revision: 705987

fix FS#67890

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-14 13:37:27 UTC (rev 705986)
+++ PKGBUILD2020-09-14 13:39:57 UTC (rev 705987)
@@ -8,7 +8,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.17.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'

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

2020-05-06 Thread Christian Hesse via arch-commits 
Date: Wednesday, May 6, 2020 @ 06:28:48
  Author: eworm
Revision: 625020

upgpkg: mupdf 1.17.0-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 06:20:34 UTC (rev 625019)
+++ PKGBUILD2020-05-06 06:28:48 UTC (rev 625020)
@@ -7,8 +7,8 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.16.1
-pkgrel=3
+pkgver=1.17.0
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'
@@ -20,7 +20,7 @@
 source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz;
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('6fe78184bd5208f9595e4d7f92bc8df50af30fbe8e2c1298b581c84945f2f5da'
+sha256sums=('c935fb2593d9a28d9b56b59dad6e3b0716a6790f8a257a68fa7dcb4430bc6086'
 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')

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

2020-03-26 Thread Christian Hesse via arch-commits 
Date: Thursday, March 26, 2020 @ 19:38:56
  Author: eworm
Revision: 604602

upgpkg: mupdf 1.16.1-3

rebuilt

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-26 19:38:45 UTC (rev 604601)
+++ PKGBUILD2020-03-26 19:38:56 UTC (rev 604602)
@@ -8,7 +8,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.16.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'

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

2019-10-17 Thread Giancarlo Razzolini via arch-commits 
Date: Thursday, October 17, 2019 @ 14:56:58
  Author: grazzolini
Revision: 516460

upgpkg: mupdf 1.16.1-2

Rebuild for new jbig2dec

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-17 14:46:44 UTC (rev 516459)
+++ PKGBUILD2019-10-17 14:56:58 UTC (rev 516460)
@@ -8,7 +8,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.16.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'

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

2019-08-02 Thread Christian Hesse via arch-commits 
Date: Friday, August 2, 2019 @ 19:26:28
  Author: eworm
Revision: 497093

upgpkg: mupdf 1.16.1-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-02 17:56:45 UTC (rev 497092)
+++ PKGBUILD2019-08-02 19:26:28 UTC (rev 497093)
@@ -7,7 +7,7 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.16.0
+pkgver=1.16.1
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
@@ -20,7 +20,7 @@
 source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz;
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('d28906cea4f602ced98f0b08d04138a9a4ac2e5462effa8c45f86c0816ab1da4'
+sha256sums=('6fe78184bd5208f9595e4d7f92bc8df50af30fbe8e2c1298b581c84945f2f5da'
 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')

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

2019-07-30 Thread Christian Hesse via arch-commits 
Date: Tuesday, July 30, 2019 @ 13:33:49
  Author: eworm
Revision: 495291

upgpkg: mupdf 1.16.0-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-30 13:32:25 UTC (rev 495290)
+++ PKGBUILD2019-07-30 13:33:49 UTC (rev 495291)
@@ -7,7 +7,7 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.15.0
+pkgver=1.16.0
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
@@ -20,7 +20,7 @@
 source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz;
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('565036cf7f140139c3033f0934b72e1885ac7e881994b7919e15d7bee3f8ac4e'
+sha256sums=('d28906cea4f602ced98f0b08d04138a9a4ac2e5462effa8c45f86c0816ab1da4'
 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')

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

2019-05-16 Thread Christian Hesse via arch-commits 
Date: Thursday, May 16, 2019 @ 13:21:43
  Author: eworm
Revision: 467505

upgpkg: mupdf 1.15.0-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-16 10:53:02 UTC (rev 467504)
+++ PKGBUILD2019-05-16 13:21:43 UTC (rev 467505)
@@ -7,13 +7,13 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.14.0
+pkgver=1.15.0
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'
 license=('AGPL3')
-makedepends=('curl' 'desktop-file-utils' 'freetype2' 'freeglut' 'glu' 
'harfbuzz'
+makedepends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz'
  'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext')
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
@@ -20,7 +20,7 @@
 source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz;
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('603e69a96b04cdf9b19a3e41bd7b20c63b39abdcfba81a7460fcdcc205f856df'
+sha256sums=('565036cf7f140139c3033f0934b72e1885ac7e881994b7919e15d7bee3f8ac4e'
 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -27,11 +27,8 @@
 prepare() {
   cd $pkgbase-${pkgver/_/}-source
 
-  # fix linking curl
-  sed -i '/SYS_CURL_LIBS/s|$| -lpthread|' Makethird
-
   # remove bundled packages, we want our system libraries
-  rm -rf 
thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+  rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
 }
 
 build() {
@@ -43,7 +40,7 @@
   export USE_SYSTEM_LIBS
 
   cd $pkgbase-${pkgver/_/}-source
-  make build=release libs apps extra
+  make build=release libs apps
 }
 
 package_libmupdf() {
@@ -62,12 +59,12 @@
 
 package_mupdf() {
   pkgdesc='Lightweight PDF and XPS viewer'
-  depends=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+  depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
'libjpeg' 'openjpeg2' 'openssl' 'libxext')
 
   cd $pkgbase-${pkgver/_/}-source
 
-  install -D -m0755 build/release/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
+  install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
 
   install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
 
@@ -107,9 +104,7 @@
   cd $pkgbase-${pkgver/_/}-source
 
   install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
-  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
   install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
-  install -D -m0755 build/release/mjsgen "$pkgdir"/usr/bin/mjsgen
 
   install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1

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

2018-10-04 Thread Christian Hesse via arch-commits 
Date: Thursday, October 4, 2018 @ 16:43:07
  Author: eworm
Revision: 389557

upgpkg: mupdf 1.14.0-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-04 16:43:01 UTC (rev 389556)
+++ PKGBUILD2018-10-04 16:43:07 UTC (rev 389557)
@@ -7,7 +7,7 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.13.0
+pkgver=1.14.0
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
@@ -17,10 +17,10 @@
  'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext')
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
-source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.xz;
+source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz;
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('746698e0d5cd113bdcb8f65d096772029edea8cf20704f0d15c96cb5449a4904'
+sha256sums=('603e69a96b04cdf9b19a3e41bd7b20c63b39abdcfba81a7460fcdcc205f856df'
 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -27,14 +27,11 @@
 prepare() {
   cd $pkgbase-${pkgver/_/}-source
 
+  # fix linking curl
+  sed -i '/SYS_CURL_LIBS/s|$| -lpthread|' Makethird
+
   # remove bundled packages, we want our system libraries
-  rm -rf 
thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,lcms2,libjpeg,openjpeg,zlib}
-
-  # fix includes for jbig2dec
-  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
-
-  # this does not build with openssl 1.1.0, so disable checks
-  sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
+  rm -rf 
thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
 }
 
 build() {
@@ -41,6 +38,9 @@
   CFLAGS+=' -fPIC'
   CXXFLAGS+=' -fPIC'
   export CFLAGS CXXFLAGS
+  
+  USE_SYSTEM_LIBS='yes'
+  export USE_SYSTEM_LIBS
 
   cd $pkgbase-${pkgver/_/}-source
   make build=release libs apps extra
@@ -83,7 +83,7 @@
   conflicts=('mupdf')
   provides=("mupdf=${pkgver}")
   depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 
'jbig2dec'
-   'libjpeg' 'openjpeg2')
+   'libjpeg' 'openjpeg2' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source
 
@@ -102,7 +102,7 @@
   pkgdesc='Tools for Lightweight PDF and XPS viewer'
   depends=('mupdf')
   depends=('freetype2' 'jbig2dec' 'libjpeg'
- 'openjpeg2' 'harfbuzz')
+ 'openjpeg2' 'harfbuzz' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source

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

2017-09-10 Thread Christian Hesse 
Date: Sunday, September 10, 2017 @ 21:21:56
  Author: eworm
Revision: 256830

upgpkg: mupdf 1.11-4

properly remove 3rd party libjpeg to link against system library (FS#55569)

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-10 21:16:00 UTC (rev 256829)
+++ PKGBUILD2017-09-10 21:21:56 UTC (rev 256830)
@@ -9,7 +9,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.11
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -31,7 +31,7 @@
   cd $pkgbase-${pkgver/_/}-source
 
   # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+  rm -rf 
thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
 
   # fix function for openjpeg 2.1.x
   patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"

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

2017-07-10 Thread Christian Hesse 
Date: Monday, July 10, 2017 @ 13:19:01
  Author: eworm
Revision: 243628

upgpkg: mupdf 1.11-2

PIE static libraries rebuild

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 13:14:34 UTC (rev 243627)
+++ PKGBUILD2017-07-10 13:19:01 UTC (rev 243628)
@@ -9,7 +9,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'

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

2017-02-24 Thread Christian Hesse 
Date: Friday, February 24, 2017 @ 13:52:45
  Author: eworm
Revision: 213729

upgpkg: mupdf 1.10_a-2

do not link against openssl

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-24 10:55:03 UTC (rev 213728)
+++ PKGBUILD2017-02-24 13:52:45 UTC (rev 213729)
@@ -9,13 +9,13 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.10_a
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('AGPL3')
 makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
- 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
+ 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2')
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
 source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz;
@@ -38,6 +38,9 @@
 
   # fix includes for jbig2dec
   sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
+
+  # this does not build with openssl 1.1.0, so disable checks
+  sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
 }
 
 build() {

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

2017-01-27 Thread Christian Hesse 
Date: Friday, January 27, 2017 @ 14:42:17
  Author: eworm
Revision: 209243

download via https

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-27 14:37:30 UTC (rev 209242)
+++ PKGBUILD2017-01-27 14:42:17 UTC (rev 209243)
@@ -18,7 +18,7 @@
  'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
-source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz;
+source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz;
 '0001-mupdf-openjpeg.patch'
 'mupdf.desktop'
 'mupdf.xpm')

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

2016-12-01 Thread Christian Hesse 
Date: Thursday, December 1, 2016 @ 10:50:37
  Author: eworm
Revision: 197594

upgpkg: mupdf 1.10_a-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-01 10:16:11 UTC (rev 197593)
+++ PKGBUILD2016-12-01 10:50:37 UTC (rev 197594)
@@ -8,7 +8,7 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.10
+pkgver=1.10_a
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@
 '0001-mupdf-openjpeg.patch'
 'mupdf.desktop'
 'mupdf.xpm')
-sha256sums=('1185637A93055CDAE8335DB14FEF3E0FBD2ACADAE94EABD2EC0111D89A04A667'
+sha256sums=('aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836'
 'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
 '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')

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

2016-08-30 Thread Christian Hesse 
Date: Tuesday, August 30, 2016 @ 20:23:41
  Author: eworm
Revision: 188073

upgpkg: mupdf 1.9_a-5

make sure that number of colors in mesh params is valid
https://security-tracker.debian.org/tracker/CVE-2016-6525

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-30 18:30:37 UTC (rev 188072)
+++ PKGBUILD2016-08-30 20:23:41 UTC (rev 188073)
@@ -9,7 +9,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.9_a
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -20,12 +20,14 @@
 options=('staticlibs')
 source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz;
 '0001-mupdf-openjpeg.patch'
-
'mupdf-0001-bug-696941-fix-use-after-free.patch::http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=fa1936405b6a84e5c9bb440912c23d532772f958'
+
'mupdf-0001-bug-696941-fix-use-after-free.patch::http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958'
+
'mupdf-0002-make-sure-that-number-of-colors-in-mesh-params-is-valid.patch::http://git.ghostscript.com/?p=mupdf.git;a=patch;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e'
 'mupdf.desktop'
 'mupdf.xpm')
 md5sums=('658b90788a57d858dcb069cf326e11c3'
  'c2d096ecd41ae26735551d01099c0a3e'
- '5fb16881b14c686a44957ec53f7fa924'
+ 'cc0d5363bf0fd4daa46380f3799e1d16'
+ 'f73ad47c6d57aa6cc6fcfbc9aa98465f'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1')
 
@@ -40,6 +42,11 @@
   # https://security-tracker.debian.org/tracker/CVE-2016-6265
   patch -Np1 < "${srcdir}/mupdf-0001-bug-696941-fix-use-after-free.patch"
 
+  # Make sure that number of colors in mesh params is valid.
+  # CVE-2016-6525
+  # https://security-tracker.debian.org/tracker/CVE-2016-6525
+  patch -Np1 < 
"${srcdir}/mupdf-0002-make-sure-that-number-of-colors-in-mesh-params-is-valid.patch"
+
   # fix function for openjpeg 2.1.x
   patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"

[arch-commits] Commit in mupdf/trunk (PKGBUILD mupdf.install)

2016-04-27 Thread Christian Hesse 
Date: Wednesday, April 27, 2016 @ 15:38:16
  Author: eworm
Revision: 172042

upgpkg: mupdf 1.9_a-3

Hooks! (Remove install file...)

Modified:
  mupdf/trunk/PKGBUILD
Deleted:
  mupdf/trunk/mupdf.install

---+
 PKGBUILD  |3 +--
 mupdf.install |   12 
 2 files changed, 1 insertion(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 13:28:53 UTC (rev 172041)
+++ PKGBUILD2016-04-27 13:38:16 UTC (rev 172042)
@@ -9,7 +9,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.9_a
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -16,7 +16,6 @@
 license=('AGPL3')
 makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
  'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
-install=mupdf.install
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz

Deleted: mupdf.install
===
--- mupdf.install   2016-04-27 13:28:53 UTC (rev 172041)
+++ mupdf.install   2016-04-27 13:38:16 UTC (rev 172042)
@@ -1,12 +0,0 @@
-post_install() {
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}
-

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

2016-04-26 Thread Christian Hesse 
Date: Tuesday, April 26, 2016 @ 13:22:52
  Author: eworm
Revision: 171885

upgpkg: mupdf 1.9_a-2

MuPDF has static data (mostly fonts), that is linked into library and every
single executable. This results in huge files (and package). Let's split the
package to reduce download size and disk usage. Most people only need mupdf
itself anyway...

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   95 -
 1 file changed, 75 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-26 10:31:13 UTC (rev 171884)
+++ PKGBUILD2016-04-26 11:22:52 UTC (rev 171885)
@@ -6,31 +6,30 @@
 # Contributor: Pierre-Paul Paquin 
 # Contributor: xduugu
 
-pkgname=mupdf
+pkgbase=mupdf
+pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.9_a
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('AGPL3')
-depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
- 'openssl' 'openjpeg2' 'mesa' 'libgl' 'libxcursor' 'libxrandr'
-'libxinerama' 'harfbuzz' 'glfw')
-makedepends=('mesa-libgl')
+makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
+ 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
 install=mupdf.install
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
+mupdf-1.5-openjpeg-2.1.0.patch
 mupdf.desktop
-mupdf.xpm
-mupdf-1.5-openjpeg-2.1.0.patch)
+   mupdf.xpm)
 md5sums=('658b90788a57d858dcb069cf326e11c3'
+ '8e71587ad9b86e10c9144618ab43149b'
  '39b54f82a763aac54e352315a0ee9037'
- 'f3f35e7320bafde331250de1c99186a1'
- '8e71587ad9b86e10c9144618ab43149b')
+ 'f3f35e7320bafde331250de1c99186a1')
 
 prepare() {
-  cd $pkgname-${pkgver/_/}-source
+  cd $pkgbase-${pkgver/_/}-source
 
   # remove bundled packages, we want our system libraries
   rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
@@ -50,20 +49,76 @@
   SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
   export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
 
-  cd $pkgname-${pkgver/_/}-source
+  cd $pkgbase-${pkgver/_/}-source
   make build=release
 }
 
-package() {
-  cd $pkgname-${pkgver/_/}-source
+package_libmupdf() {
+  pkgdesc='Library for Lightweight PDF and XPS viewer'
+
+  cd $pkgbase-${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
+  rm -rf "$pkgdir"/usr/{bin,share/man}
+  mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
 
-  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 -exec chmod -v 0644 {} +
+-type f -exec chmod 0644 {} +
 }
+
+package_mupdf() {
+  pkgdesc='Lightweight PDF and XPS viewer'
+  depends=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+   'libjpeg' 'openjpeg2' 'openssl')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
+
+  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+  install -d "$pkgdir"/usr/share/doc/mupdf
+  install -m0644  README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+  install -D -m0644 ../mupdf.desktop 
"$pkgdir"/usr/share/applications/mupdf.desktop
+  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-gl() {
+  pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
+  conflicts=('mupdf')
+  provides=('mupdf')
+  depends=('desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz' 'jbig2dec'
+   'libjpeg' 'openjpeg2' 'openssl')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
+
+  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+  install -d "$pkgdir"/usr/share/doc/mupdf
+  install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+  install -D -m0644 ../mupdf.desktop 
"$pkgdir"/usr/share/applications/mupdf.desktop
+  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-tools() {
+  pkgdesc='Tools for Lightweight PDF and XPS viewer'
+  depends=('mupdf')
+  depends=('freetype2' 'jbig2dec' 'libjpeg'
+ 'openssl' 'openjpeg2' 'harfbuzz')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
+  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
+
+  install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1
+
+  install -d

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

2016-04-23 Thread Christian Hesse 
Date: Saturday, April 23, 2016 @ 19:47:16
  Author: eworm
Revision: 171637

use system glfw and harfbuzz

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-23 17:17:30 UTC (rev 171636)
+++ PKGBUILD2016-04-23 17:47:16 UTC (rev 171637)
@@ -15,7 +15,7 @@
 license=('AGPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
  'openssl' 'openjpeg2' 'mesa' 'libgl' 'libxcursor' 'libxrandr'
-'libxinerama')
+'libxinerama' 'harfbuzz' 'glfw')
 makedepends=('mesa-libgl')
 install=mupdf.install
 # we need static libs for zathura-pdf-mupdf
@@ -31,7 +31,10 @@
 
 prepare() {
   cd $pkgname-${pkgver/_/}-source
-  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
   patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
 
   sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
@@ -40,9 +43,15 @@
 build() {
   CFLAGS+=' -fPIC'
   CXXFLAGS+=' -fPIC'
+  export CFLAGS CXXFLAGS
 
+  HAVE_GLFW='yes'
+  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
+  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
+  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
+
   cd $pkgname-${pkgver/_/}-source
-  make build=release CURL_LIBS='-lcurl -lpthread'
+  make build=release
 }
 
 package() {

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

2016-04-21 Thread Christian Hesse 
Date: Thursday, April 21, 2016 @ 14:57:42
  Author: eworm
Revision: 171507

upgpkg: mupdf 1.9_a-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-21 12:00:14 UTC (rev 171506)
+++ PKGBUILD2016-04-21 12:57:42 UTC (rev 171507)
@@ -7,7 +7,7 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.9
+pkgver=1.9_a
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('6677c6386e8408a72826a0b7bc647a45'
+md5sums=('658b90788a57d858dcb069cf326e11c3'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')

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

2016-04-18 Thread Christian Hesse 
Date: Monday, April 18, 2016 @ 16:03:22
  Author: eworm
Revision: 171353

upgpkg: mupdf 1.9-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-18 13:30:23 UTC (rev 171352)
+++ PKGBUILD2016-04-18 14:03:22 UTC (rev 171353)
@@ -7,8 +7,8 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.8
-pkgrel=2
+pkgver=1.9
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -18,12 +18,13 @@
 'libxinerama')
 makedepends=('mesa-libgl')
 install=mupdf.install
+# we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('3205256d78d8524d67dd2a47c7a345fa'
+md5sums=('6677c6386e8408a72826a0b7bc647a45'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')
@@ -47,7 +48,6 @@
 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

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

2015-11-11 Thread Christian Hesse 
Date: Wednesday, November 11, 2015 @ 20:23:45
  Author: eworm
Revision: 146603

upgpkg: mupdf 1.8-1

upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-11 19:07:17 UTC (rev 146602)
+++ PKGBUILD2015-11-11 19:23:45 UTC (rev 146603)
@@ -7,14 +7,15 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.7_a
-pkgrel=2
+pkgver=1.8
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('AGPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
- 'openssl' 'openjpeg2')
+ 'openssl' 'openjpeg2' 'mesa' 'mesa-libgl' 'libxcursor' 'libxrandr'
+'libxinerama')
 install=mupdf.install
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
@@ -21,7 +22,7 @@
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('319fda2cc5301bb3ec2e1d82c3329986'
+md5sums=('3205256d78d8524d67dd2a47c7a345fa'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')

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

2015-11-11 Thread Bartłomiej Piotrowski 
Date: Wednesday, November 11, 2015 @ 23:28:58
  Author: bpiotrowski
Revision: 146618

upgpkg: mupdf 1.8-2

depend on libgl instead of mesa-libgl

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-11 22:06:42 UTC (rev 146617)
+++ PKGBUILD2015-11-11 22:28:58 UTC (rev 146618)
@@ -8,14 +8,15 @@
 
 pkgname=mupdf
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('AGPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
- 'openssl' 'openjpeg2' 'mesa' 'mesa-libgl' 'libxcursor' 'libxrandr'
+ 'openssl' 'openjpeg2' 'mesa' 'libgl' 'libxcursor' 'libxrandr'
 'libxinerama')
+makedepends=('mesa-libgl')
 install=mupdf.install
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz

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

2015-05-07 Thread Christian Hesse 
Date: Thursday, May 7, 2015 @ 21:33:30
  Author: eworm
Revision: 132893

upgpkg: mupdf 1.7_a-2

The git tag was updated, tarball was recreated. Let's rebuild with latest
source to make sure nothing breaks.

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-07 19:30:32 UTC (rev 132892)
+++ PKGBUILD2015-05-07 19:33:30 UTC (rev 132893)
@@ -8,7 +8,7 @@
 
 pkgname=mupdf
 pkgver=1.7_a
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -21,7 +21,7 @@
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('c0a33f8c28cb0a1ac460f0fa59e78d29'
+md5sums=('319fda2cc5301bb3ec2e1d82c3329986'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')

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

2015-05-07 Thread Christian Hesse 
Date: Thursday, May 7, 2015 @ 13:43:41
  Author: eworm
Revision: 132875

upgpkg: mupdf 1.7_a-1

upstream bugfix release 1.7a

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-07 11:39:39 UTC (rev 132874)
+++ PKGBUILD2015-05-07 11:43:41 UTC (rev 132875)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Maintainer: Christian Hesse m...@eworm.de
+# Contributor: Bartłomiej Piotrowski bpiotrow...@archlinux.org
 # Contributor: Brad Fanella bradfane...@archlinux.us
 # Contributor: Stefan Husmann stefan-husm...@t-online.de
 # Contributor: Pierre-Paul Paquin pierrepaulpaq...@gmail.com
@@ -6,7 +7,7 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.7
+pkgver=1.7_a
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
@@ -16,17 +17,17 @@
  'openssl' 'openjpeg2')
 install=mupdf.install
 options=('staticlibs')
-source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
+source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('81d36f436a7065c81a501ed7ff4ee21e'
+md5sums=('c0a33f8c28cb0a1ac460f0fa59e78d29'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')
 
 prepare() {
-  cd $pkgname-$pkgver-source
+  cd $pkgname-${pkgver/_/}-source
   rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
   patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
 
@@ -37,12 +38,12 @@
   CFLAGS+=' -fPIC'
   CXXFLAGS+=' -fPIC'
 
-  cd $pkgname-$pkgver-source
+  cd $pkgname-${pkgver/_/}-source
   make build=release CURL_LIBS='-lcurl -lpthread'
 }
 
 package() {
-  cd $pkgname-$pkgver-source
+  cd $pkgname-${pkgver/_/}-source
   make build=release prefix=$pkgdir/usr install
   install -Dm644 build/release/libmujs.a $pkgdir/usr/lib

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

2015-04-18 Thread Bartłomiej Piotrowski 
Date: Saturday, April 18, 2015 @ 19:49:20
  Author: bpiotrowski
Revision: 131635

upgpkg: mupdf 1.7-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-18 17:32:05 UTC (rev 131634)
+++ PKGBUILD2015-04-18 17:49:20 UTC (rev 131635)
@@ -6,12 +6,12 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
-license=('GPL3')
+license=('AGPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
  'openssl' 'openjpeg2')
 install=mupdf.install
@@ -20,7 +20,7 @@
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('8d69db41ae9e0b6807b76bb6ed70dc2f'
+md5sums=('81d36f436a7065c81a501ed7ff4ee21e'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')
@@ -29,6 +29,8 @@
   cd $pkgname-$pkgver-source
   rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
   patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
+
+  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
 }
 
 build() {

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

2014-10-01 Thread Bartłomiej Piotrowski 
Date: Wednesday, October 1, 2014 @ 10:29:12
  Author: bpiotrowski
Revision: 119929

upgpkg: mupdf 1.6-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-01 08:24:04 UTC (rev 119928)
+++ PKGBUILD2014-10-01 08:29:12 UTC (rev 119929)
@@ -6,8 +6,8 @@
 # Contributor: xduugu
 
 pkgname=mupdf
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -20,7 +20,7 @@
 mupdf.desktop
 mupdf.xpm
 mupdf-1.5-openjpeg-2.1.0.patch)
-md5sums=('89bd4ddc74c266062ebf2702741bb173'
+md5sums=('8d69db41ae9e0b6807b76bb6ed70dc2f'
  '39b54f82a763aac54e352315a0ee9037'
  'f3f35e7320bafde331250de1c99186a1'
  '8e71587ad9b86e10c9144618ab43149b')

[arch-commits] Commit in mupdf/trunk (PKGBUILD mupdf-1.5-openjpeg-2.1.0.patch)

2014-09-07 Thread Bartłomiej Piotrowski 
Date: Sunday, September 7, 2014 @ 09:07:19
  Author: bpiotrowski
Revision: 118518

upgpkg: mupdf 1.5-2

use system openjpeg2 to make zathura users happy (FS#41831)

Added:
  mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch
Modified:
  mupdf/trunk/PKGBUILD

+
 PKGBUILD   |   13 -
 mupdf-1.5-openjpeg-2.1.0.patch |   13 +
 2 files changed, 21 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-07 06:31:15 UTC (rev 118517)
+++ PKGBUILD2014-09-07 07:07:19 UTC (rev 118518)
@@ -7,25 +7,28 @@
 
 pkgname=mupdf
 pkgver=1.5
-pkgrel=1
+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')
+ 'openssl' 'openjpeg2')
 install=mupdf.install
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
 mupdf.desktop
-mupdf.xpm)
+mupdf.xpm
+mupdf-1.5-openjpeg-2.1.0.patch)
 md5sums=('89bd4ddc74c266062ebf2702741bb173'
  '39b54f82a763aac54e352315a0ee9037'
- 'f3f35e7320bafde331250de1c99186a1')
+ 'f3f35e7320bafde331250de1c99186a1'
+ '8e71587ad9b86e10c9144618ab43149b')
 
 prepare() {
   cd $pkgname-$pkgver-source
-  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
+  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
+  patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
 }
 
 build() {

Added: mupdf-1.5-openjpeg-2.1.0.patch
===
--- mupdf-1.5-openjpeg-2.1.0.patch  (rev 0)
+++ mupdf-1.5-openjpeg-2.1.0.patch  2014-09-07 07:07:19 UTC (rev 118518)
@@ -0,0 +1,13 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index dd7bf9e..b7c8680 100644
+--- a/source/fitz/load-jpx.c
 b/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int 
size, fz_colorspace *defcs
+   opj_stream_set_read_function(stream, fz_opj_stream_read);
+   opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+   opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-  opj_stream_set_user_data(stream, sb);
++  opj_stream_set_user_data(stream, sb, NULL);
+   /* Set the length to avoid an assert */
+   opj_stream_set_user_data_length(stream, size);
+

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

2014-04-17 Thread Sergej Pupykin 
Date: Thursday, April 17, 2014 @ 12:46:00
  Author: spupykin
Revision: 109643

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-17 10:33:05 UTC (rev 109642)
+++ PKGBUILD2014-04-17 10:46:00 UTC (rev 109643)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -45,6 +45,7 @@
 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

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

2013-10-27 Thread Bartłomiej Piotrowski 
Date: Sunday, October 27, 2013 @ 11:47:30
  Author: bpiotrowski
Revision: 99334

upgpkg: mupdf 1.3-7

- bring back static libraries (FS#37508)

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 08:52:14 UTC (rev 99333)
+++ PKGBUILD2013-10-27 10:47:30 UTC (rev 99334)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=6
+pkgrel=7
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -14,6 +14,7 @@
 license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 
'libxext' 'openssl')
 install=mupdf.install
+options=('staticlibs')
 source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
 mupdf-1.3-system-libcurl.patch)
 sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'

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

2013-10-26 Thread Bartłomiej Piotrowski 
Date: Saturday, October 26, 2013 @ 16:31:22
  Author: bpiotrowski
Revision: 99256

upgpkg: mupdf 1.3-6

remove static libraries

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 14:31:13 UTC (rev 99255)
+++ PKGBUILD2013-10-26 14:31:22 UTC (rev 99256)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'

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

2013-09-06 Thread Bartłomiej Piotrowski 
Date: Friday, September 6, 2013 @ 08:39:41
  Author: bpiotrowski
Revision: 96827

upgpkg: mupdf 1.3-5

- desktop file is used only to open files, use NoDisplay=true to hide it in menu

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-06 05:43:20 UTC (rev 96826)
+++ PKGBUILD2013-09-06 06:39:41 UTC (rev 96827)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -44,6 +44,7 @@
   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
   install -Dm644 mupdf.desktop $pkgdir/usr/share/applications/mupdf.desktop
   install -Dm644 mupdf.xpm $pkgdir/usr/share/pixmaps/mupdf.xpm

[arch-commits] Commit in mupdf/trunk (PKGBUILD mupdf-1.3-system-libcurl.patch)

2013-08-31 Thread Bartłomiej Piotrowski 
Date: Saturday, August 31, 2013 @ 11:24:47
  Author: bpiotrowski
Revision: 96532

upgpkg: mupdf 1.3-4

- switch back to shared libraries (except for openjpeg)
- make use of CURL_LIBS when shared curl is used
- change headers and documentation permissions to 0644

Thank to Leonid Isaev for all the fish and his detailed bug report. (FS#36696)

Added:
  mupdf/trunk/mupdf-1.3-system-libcurl.patch
Modified:
  mupdf/trunk/PKGBUILD

+
 PKGBUILD   |   20 +++-
 mupdf-1.3-system-libcurl.patch |   21 +
 2 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-31 09:00:41 UTC (rev 96531)
+++ PKGBUILD2013-08-31 09:24:47 UTC (rev 96532)
@@ -7,16 +7,24 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('GPL3')
-depends=('desktop-file-utils' 'libxext' 'openssl')
+depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 
'libxext' 'openssl')
 install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz)
-sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478')
+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'
@@ -40,5 +48,7 @@
   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
+  find $pkgdir/usr/include \
+$pkgdir/usr/share \
+$pkgdir/usr/lib -type f | xargs chmod -v 0644
 }

Added: mupdf-1.3-system-libcurl.patch
===
--- mupdf-1.3-system-libcurl.patch  (rev 0)
+++ mupdf-1.3-system-libcurl.patch  2013-08-31 09:24:47 UTC (rev 96532)
@@ -0,0 +1,21 @@
+--- a/Makerules2013-08-27 14:35:11.243520354 +
 b/Makerules2013-08-27 15:40:22.583629510 +
+@@ -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/Makethird2013-08-27 15:41:18.043354692 +
 b/Makethird2013-08-27 15:42:41.332916192 +
+@@ -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

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

2013-08-20 Thread Bartłomiej Piotrowski 
Date: Tuesday, August 20, 2013 @ 23:03:50
  Author: bpiotrowski
Revision: 96165

upgpkg: mupdf 1.3-3

- correct .desktop file (FS#36567)

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-20 19:17:33 UTC (rev 96164)
+++ PKGBUILD2013-08-20 21:03:50 UTC (rev 96165)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -33,8 +33,10 @@
   rm $pkgdir/usr/bin/mupdf-x11
 
   cd platform/debian
-  sed -i 's/mupdf.xpm/mupdf/' mupdf.desktop
-  sed -i 's/application\/x-pdf/application\/x-pdf/' mupdf.desktop
+  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

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

2013-08-18 Thread Bartłomiej Piotrowski 
Date: Sunday, August 18, 2013 @ 19:34:12
  Author: bpiotrowski
Revision: 95918

upgpkg: mupdf 1.3-2

- install mupdf-x11-curl as /usr/bin/mupdf (fixes FS#36567)
- remove /usr/bin/mupdf-x11

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-18 17:31:41 UTC (rev 95917)
+++ PKGBUILD2013-08-18 17:34:12 UTC (rev 95918)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -22,13 +22,16 @@
   CXXFLAGS+=' -fPIC'
 
   cd $pkgname-$pkgver-source
-  make build=release
+  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 's/mupdf.xpm/mupdf/' mupdf.desktop
   sed -i 's/application\/x-pdf/application\/x-pdf/' mupdf.desktop

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

2013-04-05 Thread Bartłomiej Piotrowski 
Date: Friday, April 5, 2013 @ 23:06:33
  Author: bpiotrowski
Revision: 87739

upgpkg: mupdf 1.2-2

- rebuild against libraries in our repositories instead of these shipped by 
upstream

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-05 20:58:51 UTC (rev 87738)
+++ PKGBUILD2013-04-05 21:06:33 UTC (rev 87739)
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -22,6 +22,7 @@
 CXXFLAGS+=' -fPIC'
 
cd $srcdir/$pkgname-$pkgver-source
+   rm -rf thirdparty
make build=release prefix=/usr
 }

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

2013-02-28 Thread Bartłomiej Piotrowski 
Date: Thursday, February 28, 2013 @ 21:49:45
  Author: bpiotrowski
Revision: 85308

upgpkg: mupdf 1.2-1

upstream release

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 20:20:52 UTC (rev 85307)
+++ PKGBUILD2013-02-28 20:49:45 UTC (rev 85308)
@@ -6,20 +6,20 @@
 # Contributor: xduugu (.desktop and install files)
 
 pkgname=mupdf
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
-pkgdesc=Lightweight PDF and XPS viewer
+pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
-url=http://mupdf.com;
+url='http://mupdf.com'
 license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 
'desktop-file-utils' 'xdg-utils')
 install=mupdf.install
-source=(http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz;)
-md5sums=('f7b5fd753f40aca207e9afd70d8f8edf')
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip)
+sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b')
 
 build() {
-CFLAGS+= -fPIC
-CXXFLAGS+= -fPIC
+CFLAGS+=' -fPIC'
+CXXFLAGS+=' -fPIC'
 
cd $srcdir/$pkgname-$pkgver-source
make build=release prefix=/usr

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

2013-02-16 Thread Bartłomiej Piotrowski 
Date: Saturday, February 16, 2013 @ 13:49:57
  Author: bpiotrowski
Revision: 84320

Update pkgdesc to contain info about XPS.

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-16 12:46:17 UTC (rev 84319)
+++ PKGBUILD2013-02-16 12:49:57 UTC (rev 84320)
@@ -8,7 +8,7 @@
 pkgname=mupdf
 pkgver=1.1
 pkgrel=1
-pkgdesc=lightweight PDF viewer and toolkit written in portable C
+pkgdesc=Lightweight PDF and XPS viewer
 arch=('i686' 'x86_64')
 url=http://mupdf.com;
 license=('GPL3')

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

2013-02-03 Thread Bartłomiej Piotrowski 
Date: Monday, February 4, 2013 @ 08:59:30
  Author: bpiotrowski
Revision: 83636

Don't use $pkgdir in build() function.

Modified:
  mupdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-04 07:56:29 UTC (rev 83635)
+++ PKGBUILD2013-02-04 07:59:30 UTC (rev 83636)
@@ -22,7 +22,7 @@
 CXXFLAGS+= -fPIC
 
cd $srcdir/$pkgname-$pkgver-source
-   make build=release prefix=$pkgdir/usr
+   make build=release prefix=/usr
 }
 
 package() {