diff options
| author | René de Hesselle <dehesselle@web.de> | 2019-05-12 18:52:11 +0000 |
|---|---|---|
| committer | René de Hesselle <dehesselle@web.de> | 2019-05-12 18:52:11 +0000 |
| commit | 32bad85569823f80f0d92e189d1aae1ecd7acbfe (patch) | |
| tree | af89ec1de351aea3267e51dfab6233a3f2423188 /packaging | |
| parent | Remove support for LCMS 1 (diff) | |
| download | inkscape-32bad85569823f80f0d92e189d1aae1ecd7acbfe.tar.gz inkscape-32bad85569823f80f0d92e189d1aae1ecd7acbfe.zip | |
Add lcms2 and potrace libraries to build
This fixes the empty color tab (#241) and the missing paint bucket
tool (inbox#469).
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/macos/020-vars.sh | 4 | ||||
| -rwxr-xr-x | packaging/macos/150-jhbuild-inkdeps.sh | 10 | ||||
| -rwxr-xr-x | packaging/macos/220-inkscape-package.sh | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/packaging/macos/020-vars.sh b/packaging/macos/020-vars.sh index 6da06ffe9..27bf6b35d 100644 --- a/packaging/macos/020-vars.sh +++ b/packaging/macos/020-vars.sh @@ -141,11 +141,13 @@ URL_INKSCAPE=https://gitlab.com/inkscape/inkscape # download the icns from the original "macOS Inkscape build and package" # repository. URL_INKSCAPE_ICNS=https://github.com/dehesselle/mibap/raw/master/inkscape.icns +URL_LCMS2=https://netcologne.dl.sourceforge.net/project/lcms/lcms/2.9/lcms2-2.9.tar.gz URL_LIBPSL=https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.20.2/libpsl-0.20.2.tar.gz URL_LIBSOUP=https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.65/libsoup-2.65.92.tar.xz URL_OPENJPEG=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz URL_OPENSSL=https://www.openssl.org/source/openssl-1.1.1b.tar.gz URL_POPPLER=https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-0.74.0/poppler-poppler-0.74.0.tar.gz +URL_POTRACE=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz # A pre-built version of the complete toolset. -URL_TOOLSET_CACHE=https://github.com/dehesselle/mibap/releases/download/v0.7/mibap_v0.7.tar.xz +URL_TOOLSET_CACHE=https://github.com/dehesselle/mibap/releases/download/v0.9/mibap_v0.9.tar.xz diff --git a/packaging/macos/150-jhbuild-inkdeps.sh b/packaging/macos/150-jhbuild-inkdeps.sh index 8078a425a..d13c7f844 100755 --- a/packaging/macos/150-jhbuild-inkdeps.sh +++ b/packaging/macos/150-jhbuild-inkdeps.sh @@ -41,6 +41,11 @@ get_source $URL_BOOST jhbuild run ./bootstrap.sh --prefix=$OPT_DIR jhbuild run ./b2 -j$CORES install +### install little CMS colore engine v2 ######################################## + +get_source $URL_LCMS2 +configure_make_makeinstall + ### install OpenJPEG ########################################################### get_source $URL_OPENJPEG @@ -63,3 +68,8 @@ make install get_source $URL_DOUBLE_CONVERSION cmake_make_makeinstall +### install Potrace ############################################################ + +get_source $URL_POTRACE +configure_make_makeinstall --with-libpotrace + diff --git a/packaging/macos/220-inkscape-package.sh b/packaging/macos/220-inkscape-package.sh index 08d9477fb..602397e3c 100755 --- a/packaging/macos/220-inkscape-package.sh +++ b/packaging/macos/220-inkscape-package.sh @@ -110,6 +110,8 @@ for file in ./*.conf; do ln -sf ../../../share/fontconfig/conf.avail/$(basename $file) done +# Set environment variable so fontconfig looks in the right place for its +# files. (https://www.freedesktop.org/software/fontconfig/fontconfig-user.html) insert_before $APP_EXE_DIR/Inkscape '\$EXEC' \ 'export FONTCONFIG_PATH=$bundle_res/etc/fonts' @@ -119,5 +121,7 @@ cp $SELF_DIR/fonts.conf $APP_ETC_DIR/fonts ### GIO modules path ########################################################### +# Set environment variable for GIO to find its modules. +# (https://developer.gnome.org/gio//2.52/running-gio-apps.html) insert_before $APP_EXE_DIR/Inkscape '\$EXEC' 'export GIO_MODULE_DIR=$bundle_lib/gio/modules' |