summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-06-05 20:45:34 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-06-05 21:22:02 +0000
commit5dc92fdb2456b6d7acd491f1d3671e5b93fc559f (patch)
treeef01837377ff11329954d6bbb24904130a17914d /packaging
parentcomplete TextToolbar migration merge (diff)
downloadinkscape-5dc92fdb2456b6d7acd491f1d3671e5b93fc559f.tar.gz
inkscape-5dc92fdb2456b6d7acd491f1d3671e5b93fc559f.zip
Remove unused libyaml dependency
This was required by xverbs, which were removed in db05b842cba28f01b431eee890537959aa2d8fe3
Diffstat (limited to '')
-rw-r--r--packaging/macos/020-vars.sh1
-rwxr-xr-xpackaging/macos/150-jhbuild-inkdeps.sh5
-rwxr-xr-xpackaging/macos/210-inkscape-build.sh3
3 files changed, 0 insertions, 9 deletions
diff --git a/packaging/macos/020-vars.sh b/packaging/macos/020-vars.sh
index 7b831a964..3a82cbbd6 100644
--- a/packaging/macos/020-vars.sh
+++ b/packaging/macos/020-vars.sh
@@ -150,7 +150,6 @@ URL_LIBREVENGE=https://ayera.dl.sourceforge.net/project/libwpd/librevenge/librev
URL_LIBSOUP=https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.65/libsoup-2.65.92.tar.xz
URL_LIBVISIO=https://github.com/LibreOffice/libvisio/archive/libvisio-0.1.6.tar.gz
URL_LIBWPG=https://netcologne.dl.sourceforge.net/project/libwpg/libwpg/libwpg-0.3.3/libwpg-0.3.3.tar.xz
-URL_LIBYAML=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz
URL_OPENJPEG=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz
URL_OPENMP=https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/openmp-7.1.0.src.tar.xz
URL_OPENSSL=https://www.openssl.org/source/openssl-1.1.1b.tar.gz
diff --git a/packaging/macos/150-jhbuild-inkdeps.sh b/packaging/macos/150-jhbuild-inkdeps.sh
index bddf4d82f..db4c3b139 100755
--- a/packaging/macos/150-jhbuild-inkdeps.sh
+++ b/packaging/macos/150-jhbuild-inkdeps.sh
@@ -55,11 +55,6 @@ configure_make_makeinstall
get_source $URL_OPENJPEG
cmake_make_makeinstall
-### install libyaml ############################################################
-
-get_source $URL_LIBYAML
-cmake_make_makeinstall -DBUILD_SHARED_LIBS=ON
-
### install CppUnit ############################################################
# required by librevenge
diff --git a/packaging/macos/210-inkscape-build.sh b/packaging/macos/210-inkscape-build.sh
index 12497df71..d2f054630 100755
--- a/packaging/macos/210-inkscape-build.sh
+++ b/packaging/macos/210-inkscape-build.sh
@@ -56,9 +56,6 @@ install_name_tool -change @rpath/libpoppler.85.dylib $LIB_DIR/libpoppler.85.dyli
install_name_tool -change @rpath/libpoppler-glib.8.dylib $LIB_DIR/libpoppler-glib.8.dylib $BIN_DIR/inkscape
install_name_tool -change @rpath/libpoppler.85.dylib $LIB_DIR/libpoppler.85.dylib $LIB_DIR/inkscape/libinkscape_base.dylib
install_name_tool -change @rpath/libpoppler-glib.8.dylib $LIB_DIR/libpoppler-glib.8.dylib $LIB_DIR/inkscape/libinkscape_base.dylib
-# LibYAML
-install_name_tool -change @rpath/libyaml.dylib $LIB_DIR/libyaml.dylib $BIN_DIR/inkscape
-install_name_tool -change @rpath/libyaml.dylib $LIB_DIR/libyaml.dylib $LIB_DIR/inkscape/libinkscape_base.dylib
# OpenMP
install_name_tool -change @rpath/libomp.dylib $LIB_DIR/libomp.dylib $BIN_DIR/inkscape
install_name_tool -change @rpath/libomp.dylib $LIB_DIR/libomp.dylib $LIB_DIR/inkscape/libinkscape_base.dylib