Commit 5dc92fdb authored by Patrick Storz's avatar Patrick Storz 🦄

Remove unused libyaml dependency

This was required by xverbs, which were removed in
  db05b842
parent 85b552ea
Pipeline #64909176 failed with stages
in 121 minutes and 12 seconds
......@@ -115,7 +115,6 @@ option(WITH_LIBCDR "Compile with support of libcdr for CorelDRAW Diagrams" ON)
option(WITH_LIBVISIO "Compile with support of libvisio for Microsoft Visio Diagrams" ON)
option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON)
option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
option(WITH_YAML "Compile with YAML support (enables xverbs)" ON)
option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)
option(WITH_FUZZ "Compile for fuzzing purpose (use 'make fuzz' only)" OFF)
......@@ -308,7 +307,6 @@ message("WITH_LIBWPG: ${WITH_LIBWPG}")
message("WITH_NLS: ${WITH_NLS}")
message("WITH_OPENMP: ${WITH_OPENMP}")
message("WITH_PROFILING: ${WITH_PROFILING}")
message("WITH_YAML: ${WITH_YAML}")
message("WITH_JEMALLOC: ${WITH_JEMALLOC}")
if(WIN32)
......
......@@ -347,18 +347,6 @@ pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 )
list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
if(WITH_YAML)
find_package(yaml)
if(YAML_FOUND)
set (WITH_YAML ON)
list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS})
list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES})
else(YAML_FOUND)
set(WITH_YAML OFF)
message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled")
endif()
endif()
list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
foreach(flag ${INKSCAPE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE)
......
......@@ -116,7 +116,6 @@ if(WIN32)
${MINGW_BIN}/libwpg-0.[0-9]*.dll
${MINGW_BIN}/libxml2-[0-9]*.dll
${MINGW_BIN}/libxslt-[0-9]*.dll
${MINGW_BIN}/libyaml-0-[0-9]*.dll
${MINGW_BIN}/libzstd.dll
${MINGW_BIN}/nss[0-9]*.dll
${MINGW_BIN}/nssutil[0-9]*.dll
......
# - Try to find the YAML library
# Once done this will define
#
# YAML_FOUND - system has yaml
# YAML_INCLUDE_DIR - the yaml include directory
# YAML_LIBRARIES - the libraries needed to use yaml
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
# in cache already
SET(YAML_FOUND TRUE)
else (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
IF (NOT WIN32)
FIND_PACKAGE(PkgConfig)
IF (PKG_CONFIG_FOUND)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
pkg_check_modules(_YAML_PC QUIET yaml-1)
ENDIF (PKG_CONFIG_FOUND)
ENDIF (NOT WIN32)
FIND_PATH(YAML_INCLUDE_DIR yaml.h
/usr/include
/usr/local/include
)
FIND_LIBRARY(YAML_LIBRARIES NAMES yaml
PATHS)
if (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
set(YAML_FOUND TRUE)
endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
if (YAML_FOUND)
if (NOT YAML_FIND_QUIETLY)
message(STATUS "Found YAML: ${YAML_LIBRARIES}")
endif (NOT YAML_FIND_QUIETLY)
else (YAML_FOUND)
if (YAML_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find YAML")
endif (YAML_FIND_REQUIRED)
endif (YAML_FOUND)
MARK_AS_ADVANCED(YAML_INCLUDE_DIR YAML_LIBRARIES)
endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
......@@ -61,8 +61,7 @@ $ARCH-libvisio \
$ARCH-libwpg \
$ARCH-aspell \
$ARCH-aspell-en \
$ARCH-gtkspell3 \
$ARCH-libyaml
$ARCH-gtkspell3
# install ImageMagick (as Inkscape requires old version ImageMagick 6 we have to specify it explicitly)
# to prevent future updates:
......
......@@ -120,7 +120,4 @@
/* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
#cmakedefine LPE_ENABLE_TEST_EFFECTS 1
/* Build using libyaml (for xverbs) */
#cmakedefine WITH_YAML 1
#endif /* _CONFIG_H_ */
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -543,10 +543,6 @@ ConcreteInkscapeApplication<T>::ConcreteInkscapeApplication()
this->add_main_option_entry(T::OPTION_TYPE_STRING, "export-background", 'b', N_("Export: Background color for exported bitmaps (any SVG color string)."), N_("COLOR")); // Bxx
this->add_main_option_entry(T::OPTION_TYPE_DOUBLE, "export-background-opacity", 'y', N_("Export: Background opacity for exported bitmaps (either 0.0 to 1.0 or 1 to 255)."), N_("VALUE")); // Bxx
#ifdef WITH_YAML
this->add_main_option_entry(T::OPTION_TYPE_FILENAME, "xverbs", '\0', N_("Process: xverb command file."), N_("XVERBS-FILENAME"));
#endif // WITH_YAML
#ifdef WITH_DBUS
this->add_main_option_entry(T::OPTION_TYPE_BOOL, "dbus-listen", '\0', N_("D-Bus: Enter a listening loop for D-Bus messages in console mode."), "");
this->add_main_option_entry(T::OPTION_TYPE_STRING, "dbus-name", '\0', N_("D-Bus: Specify the D-Bus name (default is 'org.inkscape')."), N_("BUS-NAME"));
......@@ -1101,7 +1097,7 @@ ConcreteInkscapeApplication<T>::shell2()
* Options are processed in the order they appear in this function.
* We process in order: Print -> GUI -> Open -> Query -> Process -> Export.
* For each file without GUI: Open -> Query -> Process -> Export
* More flexible processing can be done via actions or xverbs.
* More flexible processing can be done via actions.
*/
template<class T>
int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment