diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 072360ebc63134..a4d660d78a7923 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -2,7 +2,7 @@ # !! keep synced with: acfgfs aclip aloadimage pkgname=arcan version=0.6.3.3 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc=arcan/src build_style=cmake diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template index 0ca2ae418ba1f9..6ea9c070350edc 100644 --- a/srcpkgs/fbpdf/template +++ b/srcpkgs/fbpdf/template @@ -1,7 +1,7 @@ # Template file for 'fbpdf' pkgname=fbpdf version=0.0.20220624 -revision=9 +revision=10 _githash=6276360f47edd71de736e153f5dcc82b6d60b3db _gitshort="${_githash:0:7}" build_style=gnu-makefile diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index fbea263bbe6833..57714219785446 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,13 +1,11 @@ # Template file for 'mupdf' # Static library, revbump all dependants on mupdf updates pkgname=mupdf -version=1.24.9 -revision=2 -hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel - libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel - libXrandr-devel libXinerama-devel harfbuzz-devel readline-devel - MesaLib-devel libopenjpeg2-devel glu-devel libXi-devel libfreeglut-devel - gumbo-parser-devel" +version=1.26.12 +revision=1 +hostmakedepends="pkg-config libcurl-devel libXext-devel libXcursor-devel + libXrandr-devel libXinerama-devel readline-devel + MesaLib-devel glu-devel libXi-devel libjpeg-turbo-devel" makedepends="$hostmakedepends" depends="desktop-file-utils" short_desc="Lightweight PDF and XPS viewer" @@ -16,30 +14,26 @@ license="AGPL-3.0-only" homepage="https://mupdf.com" changelog="https://mupdf.com/releases/history.html" distfiles="https://mupdf.com/downloads/archive/mupdf-${version}-source.tar.lz" -checksum=d87da097ae943ad0113003190ed370d39bde817383c59dc753dce23c7ba2b710 +checksum=5496163e39516af7675c19d5d43506ae815dabdb763e2a4da243c4f427eab15d pre_build() { if [ "$CROSS_BUILD" ]; then - make ${makejobs} CC=cc LD=ld AR=ar CFLAGS="-fPIC" LDFLAGS='' build=release generate + make ${makejobs} XCFLAGS="-fPIC" build=release generate fi } do_build() { - CFLAGS+=" -fPIC" - CXXFLAGS+=" -fPIC" - local _crosscompile if [ "$CROSS_BUILD" ]; then _crosscompile="CROSSCOMPILE=yes" fi - make ${makejobs} USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release ${_crosscompile} all - make ${makejobs} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" build=release ${_crosscompile} -C thirdparty/mujs + make ${makejobs} USE_SYSTEM_LIBJPEG=yes XCFLAGS="-fPIC" XCXXFLAGS="-fPIC" build=release ${_crosscompile} all } do_install() { - make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install + make USE_SYSTEM_LIBJPEG=yes build=release prefix=${DESTDIR}/usr install install-extra-apps for f in build/release/libmupdf-*.a; do vinstall $f 644 usr/lib done @@ -63,7 +57,6 @@ post_install() { mupdf-devel_package() { short_desc+=" - development files" - depends="libjpeg-turbo-devel jbig2dec-devel libopenjpeg2-devel" pkg_install() { vmove usr/lib/pkgconfig vmove usr/include diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template index fa0047531c3c64..8cf4b5f8fded5d 100644 --- a/srcpkgs/sioyek/template +++ b/srcpkgs/sioyek/template @@ -1,14 +1,14 @@ # Template file for 'sioyek' pkgname=sioyek version=2.0.0 -revision=11 +revision=12 build_style=qmake configure_args="pdf_viewer_build_config.pro" hostmakedepends="qt5-qmake qt5-host-tools qt5-opengl qt5-gui qt5-widgets qt5-network" makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel gumbo-parser-devel harfbuzz-devel qt5-opengl mujs-devel freetype-devel - libjbig2dec libjpeg-turbo-devel libopenjpeg2-devel" + jbig2dec-devel libjpeg-turbo-devel libopenjpeg2-devel" short_desc="PDF viewer designed for reading research papers and technical books" maintainer="dkwo " license="GPL-3.0-or-later" diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-third.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-third.patch new file mode 100644 index 00000000000000..906c671772cd58 --- /dev/null +++ b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-third.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 0ce1b1f..9b66348 100644 +--- a/meson.build ++++ b/meson.build +@@ -32,7 +32,7 @@ build_dependencies = [ + cairo, + ] + +-if not mupdf.found() ++if true + # normal build of mupdf + mupdf = cc.find_library('mupdf', has_headers: ['mupdf/fitz/version.h', 'mupdf/fitz.h', 'mupdf/pdf.h'], required: true) + mupdfthird = cc.find_library('mupdf-third') diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index e188d689578c6a..d5204a303ea378 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -1,11 +1,10 @@ # Template file for 'zathura-pdf-mupdf' pkgname=zathura-pdf-mupdf -version=0.4.4 -revision=3 +version=0.4.6 +revision=1 build_style=meson hostmakedepends="pkg-config" -makedepends="mupdf-devel zathura-devel libopenjpeg2-devel tesseract-ocr-devel - libjpeg-turbo-devel libjbig2dec gumbo-parser-devel leptonica-devel mujs-devel" +makedepends="mupdf-devel zathura-devel" depends="zathura" short_desc="PDF support for zathura (using mupdf)" maintainer="lemmi " @@ -13,7 +12,7 @@ license="Zlib" homepage="https://pwmt.org/projects/zathura-pdf-mupdf/" changelog="https://pwmt.org/projects/zathura-pdf-mupdf/changelog/${version}/index.html" distfiles="https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${version}.tar.xz" -checksum=0125624901cabe3a2fe63315a46e7d966a323c028ff53890dfaf7856adb1f4fc +checksum=c43cddb5809cc87f0bf263999020cb17eeb9ce46e2ea4525eb0ad954ddfb17bb conflicts="zathura-pdf-poppler>=0" post_install() {