From c3d14fe9accdf0b091e42f26a66ed7626ba8c24b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 May 2023 11:19:44 +0100 Subject: gentoo auto-resync : 01:05:2023 - 11:19:44 --- media-gfx/inkscape/Manifest | 4 +- .../files/inkscape-1.2.2-fix-compile.patch | 46 +++++ media-gfx/inkscape/inkscape-1.2.2-r1.ebuild | 197 +++++++++++++++++++++ media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +- 4 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch create mode 100644 media-gfx/inkscape/inkscape-1.2.2-r1.ebuild (limited to 'media-gfx/inkscape') diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 933b38522f51..261a80da3bf1 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,7 +1,9 @@ AUX inkscape-1.2.1-poppler-22.09.0.patch 3129 BLAKE2B ad2125d617b7e06618ec97301add563fbf1aa99873a6da144438ac94cd79e715be3f7403e3af7769bbd13614bccbe855ac3c76dcac9f533fb745a6c538444b54 SHA512 937dd6662e86ee13d04ff5c2007d71f10bf7ed84f8a8a8162138d054076b85d9b2c835f55dc217b7abd688ee4524711f3ef907a5dce641beacd0e9f8c6514de9 +AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f EBUILD inkscape-1.2.1-r2.ebuild 5251 BLAKE2B fe6bfdbdc8de16ead4e418b91ac13a188d67c3607e7ddf3fa875b749df77894a4de8f96a6be990ae158c222d32ba4e3c2f6242e82224393d40cf98477a97b22c SHA512 070d799f453068cd4c1604fffbae7922373aeb386e9b7522c7860bba61ba82f4a81e342fd494a97b94931f8608d1e29ae48b05d076c89950b50fb7e942ec4a7a -EBUILD inkscape-1.2.2.ebuild 5192 BLAKE2B 8e08e2c45a8ec683d6b5e0adad6e8d4baf752fa8266b2b69f87cc9d60ac72797628d93a2e21177164a3440ffc3696d029bc037eba68781ea37df568e697bf389 SHA512 c8115344d566d53ff1639a718fa28eec479e9ebb47a084de4272865fd1725ed1c6cc86c53739813b89f5efeaae79cd5017575c8c06375fe55826c4674dbefe5b +EBUILD inkscape-1.2.2-r1.ebuild 5251 BLAKE2B fd6ec2774783bd2a1aee418e6b8cfcafb9e40d2374efa2abcbd0d91b55a5066804c942d5e719277fa3f858f3877e035a9ffc8e895f4d18f10a11196af1940c10 SHA512 56f5545f6793d330a7a6d00a2695696621ec280fe886f53985283d38848bf931cec49884fe3e979dfc7b47850e27eab6836bc1bad840ca6a87d4f713fd564643 +EBUILD inkscape-1.2.2.ebuild 5191 BLAKE2B c58c4b176348764e9029041bca751ea6cea29835496a1404e7ecb6e11974f254bd3e2b1c0b0ebf32b3882d35113ce507261b552438ac4367335ac52e675f9dea SHA512 d4376393b1c826464497783a694d4884079362e4dd0f4762fc059aec1a4b35b3eeab3a350a3b56307e390809e7f416f558796564daaaeb14a905bdb5aac1d700 EBUILD inkscape-9999.ebuild 5097 BLAKE2B de3a9a36fbb8e9c2b0b1695e1fc93780f5bfa7882f42c30c612ed449b532c23a53b96a63c354fc45c10488fe792d8855ed641c238a5f6aed63b319387525e8b2 SHA512 6bd47fdd4984b1f6b4cdc0888540414102b6be7351802aa5f7565189793f308ba1f96588b1663cef19703d0d8a736404014ed918629a664dee4b123061eaff97 MISC metadata.xml 876 BLAKE2B e8998be1909e5848fd13fa4a8c4e2d9a424c818c3a41ebdd0a5807f572f9d0037900ac2516d107b9ab016410c25bc4ca3225e832ef17bd6b345d6471d5b5f0bc SHA512 f9a8581f7f401a40b100f61e67adb032859b2c70bd49eaa60b13a18cf24cc24e3a2704e227cba5590aad4bbaf705f3a4bf8c6ffda75f473c39bb8177af4aca6b diff --git a/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch b/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch new file mode 100644 index 000000000000..c219a6e45273 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch @@ -0,0 +1,46 @@ +https://src.fedoraproject.org/rpms/inkscape/blob/rawhide/f/0001-Fix-build-with-GCC13.patch +https://gitlab.com/inkscape/inkscape/-/merge_requests/5108 +https://gitlab.com/inkscape/inkscape/-/merge_requests/5111 (version which got accepted upstream) +https://bugs.gentoo.org/903867 + +From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Fri, 24 Feb 2023 14:01:18 -0500 +Subject: [PATCH] Fix build with GCC13 + +GCC 13 now complains about this line: +``` +src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists + 111 | {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR} + | ^~~~~~~~ +``` + +However, it is not necessary to strdup the string constant as the value +just needs to exist indefinitely, and it will as a constant. While C +doesn't mind the `const` difference, a simple cast will silence C++'s +higher strictness. + +And in fact, the other use of `GtkTargetEntry` in +`src/ui/drag-and-drop.cpp` does the same cast. + +Signed-off-by: Elliott Sales de Andrade +--- a/src/ui/widget/selected-style.cpp ++++ b/src/ui/widget/selected-style.cpp +@@ -100,14 +100,8 @@ enum ui_drop_target_info { + APP_OSWB_COLOR + }; + +-//TODO: warning: deprecated conversion from string constant to ‘gchar*’ +-// +-//Turn out to be warnings that we should probably leave in place. The +-// pointers/types used need to be read-only. So until we correct the using +-// code, those warnings are actually desired. They say "Hey! Fix this". We +-// definitely don't want to hide/ignore them. --JonCruz + static const GtkTargetEntry ui_drop_target_entries [] = { +- {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR} ++ {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR} + }; + + static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries); +-- +2.39.2 diff --git a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild new file mode 100644 index 000000000000..b608d9a3e9b7 --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" +MY_P="${P/_/}" +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg +openmp postscript readline spell svg2 test visio wpg X" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( virtual/imagemagick-tools ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.54.1:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/boost:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + net-libs/libsoup:2.4 + sci-libs/gsl:= + >=x11-libs/pango-1.44 + x11-libs/gtk+:3[X?] + X? ( x11-libs/libX11 ) + $(python_gen_cond_dep ' + dev-python/cachecontrol[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/lockfile[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( media-libs/libjpeg-turbo:= ) + readline? ( sys-libs/readline:= ) + spell? ( app-text/gspell ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.2-fix-compile.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON + -DBUILD_TESTING=$(usex test) + -DWITH_LIBCDR=$(usex cdr) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=ON + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + -DWITH_X11=$(usex X) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # render_text*: needs patched Cairo / maybe upstream changes + # not yet in a release. + # test_lpe/test_lpe64: precision differences b/c of new GCC? + # cli_export-png-color-mode-gray-8_png_check_output: ditto? + -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" + ) + + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + local extdir="${ED}"/usr/share/${PN}/extensions + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi + + # Empty directory causes sandbox issues, see bug #761915 + rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." +} diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild index fcc109b4a36d..d9588370c24a 100644 --- a/media-gfx/inkscape/inkscape-1.2.2.ebuild +++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="SVG based generic vector-drawing program" -- cgit v1.2.3