diff options
Diffstat (limited to 'system-makedeps.patch')
-rw-r--r-- | system-makedeps.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/system-makedeps.patch b/system-makedeps.patch deleted file mode 100644 index 2940a00ab280..000000000000 --- a/system-makedeps.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/build.bash b/build.bash -index 9f72c04..6462b11 100755 ---- a/build.bash -+++ b/build.bash -@@ -33,9 +33,7 @@ - outd=$1 - srcd=$(dirname $0) - mudir=$outd/mupdf --muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" -- --test -d $mudir || die muPDF wasn\'t found in $outd/, consult $srcd/BUILDING -+mudeps=('freetype2' 'gumbo' 'harfbuzz' 'libjpeg' 'libopenjp2' 'x11' 'zlib') - - mkdir -p $outd/{$wsid,lablGL} - -@@ -45,8 +43,7 @@ - test -n "${gmk:-}" && gmk=false || gmk=true - - mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" --make="make -C "$mudir" build=$mbt -j $mjobs libs" --$make -q -s || $make -+ - - oincs() { - local b=$1 incs -@@ -85,7 +82,7 @@ - version.o) f=-DLLPP_VERSION=$ver;; - lablGL/*.o) f="-g -Wno-pointer-sign -Werror -O2";; - link.o) -- f="-g -std=c11 $muinc -Wall -Werror -Wextra -pedantic " -+ f="$CFLAGS -g -std=c11 $(pkg-config --cflags "${mudeps[@]}") -Wall -Werror -Wextra -pedantic " - test "${mbt-}" = "debug" || f+="-O2 " - $darwin && f+="-DMACOS -D_GNU_SOURCE -DGL_H='<OpenGL/gl.h>'" \ - || f+="-D_POSIX_C_SOURCE -DGL_H='<GL/gl.h>'" -@@ -104,39 +101,6 @@ - } - - overs=$(ocamlc -vnum 2>/dev/null) || overs="" --if test "$overs" != "4.14.0~rc1"; then -- url=https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~rc1.tar.xz -- txz=$outd/$(basename $url) -- keycmd="printf $url; digest $txz;" -- isfresh $txz "$(eval $keycmd)" || { -- if executable_p wget; then dl() { wget "$1" -O "$2"; } -- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } -- else die "no program to fetch remote urls found" -- fi -- dl $url $txz -- eval $keycmd >$txz.past -- } && vecho "fresh $txz" -- absprefix=$(realpath $outd) -- export PATH=$absprefix/bin:$PATH -- ocamlc=$absprefix/bin/ocamlc -- keycmd="printf $url; digest $ocamlc;" -- isfresh $ocamlc "$(eval $keycmd)" || ( -- # This will needlessly re{configure,make} ocaml since "past" -- # of configure/make is hard to ascertain. "Better safe than -- # sorry" approach is taken here. The check will work for a -- # single ocaml url/version, but _will_ redo _everything_ -- # otherwise (even if fully built artifacts are available) -- tar xf $txz -C $outd -- bn=$(basename $url) -- cd $outd/${bn%.tar.xz} -- ./configure --disable-ocamldoc --disable-ocamltest \ -- --enable-debugger=no --prefix=$absprefix -- make -j $mjobs world -- make install -- eval $keycmd >$absprefix/bin/ocamlc.past -- ) && vecho "fresh ocamlc" -- overs=$(ocamlc -vnum 2>/dev/null) --fi - - while read k v; do - case "$k" in -@@ -307,7 +271,7 @@ - done - - libs="str.cma unix.cma" --clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" -+clibs="-ljbig2dec $(pkg-config --libs "${mudeps[@]}") -lmupdf -lmupdf-third -lpthread" - if $darwin; then - mcomp=$ccomp - clibs+=" -framework Cocoa -framework OpenGL" |