From 6820f8afdf47579faf7e5ee48f587a2e12f4d26a Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Sun, 24 Mar 2024 23:24:37 +0100 Subject: [PATCH] inkscape: update runtime dependencies --- components/image/inkscape/inkscape.p5m | 7 +++---- components/image/inkscape/Makefile | 8 +++----- components/image/inkscape/pkg5 | 1 + 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/components/image/inkscape/Makefile b/components/image/inkscape/Makefile index 1d6ee37..975a939 100644 --- a/components/image/inkscape/Makefile +++ b/components/image/inkscape/Makefile @@ -15,12 +15,13 @@ # BUILD_STYLE= cmake +USE_PARALLEL_BUILD= yes USE_DEFAULT_TEST_TRANSFORMS= yes include ../../../make-rules/shared-macros.mk COMPONENT_NAME= inkscape COMPONENT_VERSION= 1.3.2 -COMPONENT_REVISION= 2 +COMPONENT_REVISION= 3 # COMPONENT_ITEM_NO is part of the download path # (find it on https://inkscape.org/release/1.3/platforms/ under "Download") # eg. https://inkscape.org/gallery/item/42328/inkscape-1.3.tar.xz @@ -47,8 +48,6 @@ PATH = $(PATH.gnu) -LDFLAGS += $(JPEG_LDFLAGS) - CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release CMAKE_OPTIONS += -DCMAKE_ENABLE_LCMS=ON CMAKE_OPTIONS += -DLCMS2_INCLUDE_DIR=$(USRINCDIR)/lcms2 @@ -63,8 +62,6 @@ CMAKE_OPTIONS += -DCMAKE_ENABLE_BINRELOC=OFF CMAKE_OPTIONS += -DWITH_GNOME_VFS=ON CMAKE_OPTIONS += -DWITH_OPENMP=ON -CMAKE_OPTIONS += -DJPEG_INCLUDE_DIR=$(JPEG_INCDIR) -CMAKE_OPTIONS += -DJPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so # Auto-generated dependencies REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG) @@ -72,6 +69,7 @@ REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG) REQUIRED_PACKAGES += developer/gsl REQUIRED_PACKAGES += image/graphicsmagick +REQUIRED_PACKAGES += image/library/libjpeg-turbo REQUIRED_PACKAGES += image/library/libpng16 REQUIRED_PACKAGES += image/potrace REQUIRED_PACKAGES += library/c++/glibmm diff --git a/components/image/inkscape/inkscape.p5m b/components/image/inkscape/inkscape.p5m index bd3f5fa..cf1c8e5 100644 --- a/components/image/inkscape/inkscape.p5m +++ b/components/image/inkscape/inkscape.p5m @@ -40,10 +40,9 @@ depend type=require fmri=library/python/requests-$(PYV) depend type=require fmri=library/python/six-$(PYV) depend type=require fmri=library/python/virtualenv-$(PYV) -# enable following when available for openindiana -# depend type=require fmri=library/python/cssselect-$(PYV) -# depend type=require fmri=library/python/numpy-$(PYV) -# depend type=require fmri=library/python/scour-$(PYV) +depend type=require fmri=library/python/cssselect-$(PYV) +depend type=require fmri=library/python/numpy-$(PYV) +depend type=require fmri=library/python/scour-$(PYV) file path=usr/bin/inkscape file path=usr/bin/inkview diff --git a/components/image/inkscape/pkg5 b/components/image/inkscape/pkg5 index c3f7c0e..ad7e579 100644 --- a/components/image/inkscape/pkg5 +++ b/components/image/inkscape/pkg5 @@ -2,6 +2,7 @@ "dependencies": [ "developer/gsl", "image/graphicsmagick", + "image/library/libjpeg-turbo", "image/library/libjpeg8-turbo", "image/library/libpng16", "image/potrace", -- Gitblit v1.9.3