fix(x11/inkscape): fix openmp-related crash, fix(main/graphicsmagick) fix static library

This commit is contained in:
termux-pacman-bot
2024-10-26 11:35:47 +00:00
parent 86d1f8d8c9
commit c444e31dcd
3 changed files with 14 additions and 1 deletions

View File

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of image processing tools"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.3.45"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
# Bandwith limited on main ftp site, so it's asked to use sourceforge instead:
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=dcea5167414f7c805557de2d7a47a9b3147bcbf617b91f5f0f4afe5e6543026b
@@ -23,4 +23,6 @@ termux_step_pre_configure() {
sed -i "s/-lomp/-l:libomp.a/g" configure.ac
autoreconf -fi
popd
CFLAGS+=" -fPIC"
CXXFLAGS+=" -fPIC"
}

View File

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Free and open source vector graphics editor"
TERMUX_PKG_LICENSE="GPL-3.0-or-later"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.4"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://media.inkscape.org/dl/resources/file/inkscape-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=c59a85453b699addebcd51c1dc07684dd96a10c8aec716b19551db50562e13f5
TERMUX_PKG_DEPENDS="boost, double-conversion, fontconfig, freetype, gdk-pixbuf, graphicsmagick, glib, gsl, gspell, gtk3, gtkmm3, gtksourceview4, harfbuzz, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libgc, libglibmm-2.4, libiconv, libjpeg-turbo, libpangomm-1.4, libpng, libsigc++-2.0, libsoup, libx11, libxml2, libxslt, littlecms, pango, poppler, potrace, readline, zlib"

View File

@@ -0,0 +1,10 @@
+++ ./CMakeScripts/DefineDependsandFlags.cmake
@@ -394,7 +394,7 @@
endif()
if(MAGICK_FOUND)
sanitize_ldflags_for_libs(MAGICK_LDFLAGS)
- list(APPEND INKSCAPE_LIBS ${MAGICK_LDFLAGS})
+ list(APPEND INKSCAPE_LIBS -Wl,-Bstatic ${MAGICK_LDFLAGS} -Wl,-Bdynamic -ljasper -lheif -lwebp -ljxl_threads -ljxl -lwebpmux -lz)
add_definitions(${MAGICK_CFLAGS_OTHER})
list(APPEND INKSCAPE_INCS_SYS ${MAGICK_INCLUDE_DIRS})