* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2024-03-04 22:18 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-03-04 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 4f3b5e55d2516361e92aa64612330c0a228a9de5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 22:11:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 22:18:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3b5e55
media-gfx/inkscape: Fix build with >=app-text/poppler-24.03
Fix is pending upstream:
https://gitlab.com/inkscape/inkscape/-/merge_requests/6209
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/inkscape-1.3.2-poppler-24.03.patch | 61 ++++++++++++++++++++++
media-gfx/inkscape/inkscape-1.3.2.ebuild | 3 +-
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch
new file mode 100644
index 000000000000..53cf3fd2b6cd
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch
@@ -0,0 +1,61 @@
+From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Mar 2024 22:59:40 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 525fbfec0..bcd7b1f61 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+ _POPPLER_CONST Function *func) {
+- int type = func->getType();
++ auto type = func->getType();
+ auto space = shading->getColorSpace();
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++ if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) { // Sampled or exponential function
++#else
+ if ( type == 0 || type == 2 ) { // Sampled or exponential function
++#endif
+ GfxColor stop1, stop2;
+ if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
+ return false;
+@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+ _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+ }
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++ } else if ( type == Function::Type::Stitching ) { // Stitching
++#else
+ } else if ( type == 3 ) { // Stitching
++#endif
+ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
+ const double *bounds = stitchingFunc->getBounds();
+ const double *encode = stitchingFunc->getEncode();
+@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ for ( int i = 0 ; i < num_funcs ; i++ ) {
+ svgGetShadingColor(shading, bounds[i + 1], &color);
+ // Add stops
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++ if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) { // process exponential fxn
++#else
+ if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
++#endif
+ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+ if (expE > 1.0) {
+ expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
+--
+2.44.0
+
diff --git a/media-gfx/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
index 5aeb0df4ea69..bcd4aa1ca77c 100644
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2.ebuild
@@ -107,7 +107,8 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.patch
+ "${FILESDIR}"/${P}-libxml2-2.12.patch
+ "${FILESDIR}"/${P}-poppler-24.03.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2024-10-17 7:08 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-10-17 7:08 UTC (permalink / raw
To: gentoo-commits
commit: 0e21aff244a4247a58729df0d641538b1b767296
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 07:04:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 07:06:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e21aff2
media-gfx/inkscape: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/941674
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-1.4-gcc15.patch | 21 +++++++++++++++++++++
media-gfx/inkscape/inkscape-1.4.ebuild | 4 ++++
2 files changed, 25 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch
new file mode 100644
index 000000000000..e27db0be34ef
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/941674
+https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787
+
+From eb6dadcf1a5c660167ba43f3606c8e7cc6529787 Mon Sep 17 00:00:00 2001
+From: Liam <byteslice@airmail.cc>
+Date: Sat, 12 Oct 2024 05:22:29 -0400
+Subject: [PATCH] gobjectptr: fix member name
+
+--- a/src/util/gobjectptr.h
++++ b/src/util/gobjectptr.h
+@@ -20,7 +20,7 @@ public:
+ GObjectPtr() = default;
+ explicit GObjectPtr(T *p, bool add_ref = false) : _p(p) { if (add_ref) _ref(); }
+ GObjectPtr(GObjectPtr const &other) : _p(other._p) { _ref(); }
+- GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other.p; _ref(); } return *this; }
++ GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other._p; _ref(); } return *this; }
+ GObjectPtr(GObjectPtr &&other) noexcept : _p(other._p) { other._p = nullptr; }
+ GObjectPtr &operator=(GObjectPtr &&other) { if (&other != this) { _unref(); _p = other._p; other._p = nullptr; } return *this; }
+ ~GObjectPtr() { _unref(); }
+--
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.4.ebuild b/media-gfx/inkscape/inkscape-1.4.ebuild
index eab33b71e0fe..ddbdde41002c 100644
--- a/media-gfx/inkscape/inkscape-1.4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4.ebuild
@@ -108,6 +108,10 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4-gcc15.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2024-04-05 15:02 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-04-05 15:02 UTC (permalink / raw
To: gentoo-commits
commit: e43923c0e6f0c348fc523af5a5918237611027a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 18:45:22 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 15:02:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43923c0
media-gfx/inkscape: drop 1.2.2-r4, 1.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 -
.../files/inkscape-1.2.2-fix-compile.patch | 46 -----
media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 197 -------------------
media-gfx/inkscape/inkscape-1.3.2.ebuild | 209 ---------------------
4 files changed, 453 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index beebd4bf54b8..53dccb520d73 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
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
deleted file mode 100644
index c219a6e45273..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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 <quantum.analyst@gmail.com>
-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 <quantum.analyst@gmail.com>
---- 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-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
deleted file mode 100644
index 00c5bc63f64e..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 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}"
-# Lots of test failures which need investigating, bug #871621
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- dev-util/glib-utils
- >=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/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/appdirs[${PYTHON_USEDEP}]
- 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 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-fix-compile.patch
- "${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.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() {
- # ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
- filter-lto
- # Aliasing unsafe (bug #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.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
deleted file mode 100644
index bcd4aa1ca77c..000000000000
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-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
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Lots of test failures which need investigating, bug #871621
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- dev-util/glib-utils
- >=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:=[stacktrace(-)]
- 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/popt
- media-gfx/potrace
- media-libs/libepoxy
- 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/appdirs[${PYTHON_USEDEP}]
- 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] )
- )
- jpeg? ( media-libs/libjpeg-turbo:= )
- readline? ( sys-libs/readline:= )
- sourceview? ( x11-libs/gtksourceview:4 )
- 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 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libxml2-2.12.patch
- "${FILESDIR}"/${P}-poppler-24.03.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() {
- # ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
- filter-lto
- # Aliasing unsafe (bug #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_CAIRO=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=OFF
- -DENABLE_LCMS=ON
- -DWITH_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=ON
- -DWITH_GSOURCEVIEW=$(usex sourceview)
- -DWITH_SVG2=$(usex svg2)
- -DWITH_LIBVISIO=$(usex visio)
- -DWITH_LIBWPG=$(usex wpg)
- -DWITH_X11=$(usex X)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- CMAKE_SKIP_TESTS=(
- # 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?
- 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
- )
-
- # bug #871621
- cmake_src_compile tests
- 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."
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2024-01-29 9:37 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-01-29 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 892e038ce84ea5079ab87955e84bc76af2a4eb60
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 09:36:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 09:37:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892e038c
media-gfx/inkscape: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/923247
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.3.2-libxml2-2.12.patch | 29 ++++++++++++++++++++++
media-gfx/inkscape/inkscape-1.3.2.ebuild | 12 ++++++---
media-gfx/inkscape/inkscape-9999.ebuild | 10 ++++----
3 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch b/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch
new file mode 100644
index 000000000000..7e981e36fc1e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/923247
+https://gitlab.com/inkscape/inkscape/-/merge_requests/6089
+
+From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 17 Nov 2023 22:30:42 +0100
+Subject: [PATCH] include missing header file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes build error:
+```
+/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’:
+/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’?
+ 86 | xmlFree(full);
+```
+--- a/src/object/uri.h
++++ b/src/object/uri.h
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_URI_H
+
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+ #include <memory>
+ #include <string>
+
+--
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
index ca758524da42..a59e5ee19170 100644
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,6 +8,9 @@ PYTHON_REQ_USE="xml(+)"
MY_P="${P/_/}"
inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
@@ -16,8 +19,7 @@ else
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/"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -104,7 +106,9 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-cpp/gtest )
"
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.patch
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 0f162519d9ab..698236284069 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,6 +8,9 @@ PYTHON_REQ_USE="xml(+)"
MY_P="${P/_/}"
inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
@@ -16,8 +19,7 @@ else
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/"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -104,8 +106,6 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-cpp/gtest )
"
-S="${WORKDIR}/${MY_P}"
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2022-10-22 14:54 Michał Górny
0 siblings, 0 replies; 21+ messages in thread
From: Michał Górny @ 2022-10-22 14:54 UTC (permalink / raw
To: gentoo-commits
commit: a7bbd31eec03cae2ceda10443ec58e2f0e6ce804
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 14:51:22 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 14:54:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7bbd31e
media-gfx/inkscape: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 -
.../files/inkscape-1.1.2-r1-poppler-22.03.0.patch | 43 -----
.../files/inkscape-1.1.2-r1-poppler-22.04.0.patch | 130 --------------
media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 188 ---------------------
4 files changed, 362 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 43b58482d8b7..e27b5a4f3503 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
deleted file mode 100644
index 4083c9426644..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gitlab.com/inkscape/inkscape/-/commit/f7857a4fc2b916e64d9689ccc89914ad19f3ef0a.patch
-https://bugs.gentoo.org/843275
-
-From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
-(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75)
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
-
- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
- // glib gstdio.c
-- GooString *filename_goo = new GooString(uri);
-- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
-+ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
-
- if (!pdf_doc->isOk()) {
- int error = pdf_doc->getErrorCode();
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
-GitLab
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
deleted file mode 100644
index 8e507d0ebcf4..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch
-https://bugs.gentoo.org/835661
-
-From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
-
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
-- GfxFont *font = res->lookupFont(args[0].getName());
-+ auto font = res->lookupFont(args[0].getName());
-
- if (!font) {
- // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- fflush(stdout);
- }
-
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
- font->incRefCnt();
-+#endif
- state->setFont(font, args[1].getNum());
- fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
-- GfxFont *font;
- int wMode;
- double riseX, riseY;
- CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
- int len, n, uLen;
-
-- font = state->getFont();
-+ auto font = state->getFont();
- wMode = font->getWMode();
-
- builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
- //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
- if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- code, u, uLen)) {*/
-- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
-- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- pushResources(resDict);
-- }
-+ }
- if (charProc.isStream()) {
- //parse(&charProc, gFalse); // TODO: parse into SVG font
- } else {
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
-
- void SvgBuilder::_init() {
- _font_style = nullptr;
-- _current_font = nullptr;
- _font_specification = nullptr;
- _font_scaling = 1;
- _need_font_update = true;
-@@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) {
- _need_font_update = false;
- updateTextMatrix(state); // Ensure that we have a text matrix built
-
-- if (_font_style) {
-- //sp_repr_css_attr_unref(_font_style);
-- }
- _font_style = sp_repr_css_attr_new();
-- GfxFont *font = state->getFont();
-+ auto font = state->getFont();
- // Store original name
- if (font->getName()) {
- _font_specification = font->getName()->getCString();
-@@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) {
- sp_repr_css_set_property(_font_style, "writing-mode", "tb");
- }
-
-- _current_font = font;
- _invalidated_style = true;
- }
-
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -203,7 +203,6 @@ private:
- std::vector<SvgGraphicsState> _state_stack;
-
- SPCSSAttr *_font_style; // Current font style
-- GfxFont *_current_font;
- const char *_font_specification;
- double _font_scaling;
- bool _need_font_update;
-GitLab
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
deleted file mode 100644
index 502e42c4c678..000000000000
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg"
-
-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/libX11
- >=x11-libs/pango-1.37.2
- x11-libs/gtk+:3
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_USEDEP}]
- media-gfx/scour[${PYTHON_USEDEP}]
- ')
- cdr? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- media-libs/libcdr
- )
- dbus? ( dev-libs/dbus-glib )
- 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.1.2-r1-poppler-22.03.0.patch" # bug 835424
- "${FILESDIR}/${PN}-1.1.2-r1-poppler-22.04.0.patch" # bug 835661 / bug 843275
-)
-
-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_DBUS=$(usex dbus)
- -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)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build -j1 check
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2022-09-03 4:25 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-09-03 4:25 UTC (permalink / raw
To: gentoo-commits
commit: 477f855ab8b07386d15b74308a13ac4eae0d0d6d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 04:25:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 04:25:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477f855a
media-gfx/inkscape: update Poppler 22.09.0 patch
Switch to revision sent upstream.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +-
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r1.ebuild} | 4 ----
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r2.ebuild} | 0
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
index 87583019d6e3..80d071d51b0b 100644
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
}
}
+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum());
++ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
+#else
state->setLineDash(dash, length, args[1].getNum());
+#endif
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
similarity index 98%
copy from media-gfx/inkscape/inkscape-1.2.1.ebuild
copy to media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
index a0df591ee0d9..e2183428d93b 100644
--- a/media-gfx/inkscape/inkscape-1.2.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
@@ -108,10 +108,6 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
similarity index 100%
rename from media-gfx/inkscape/inkscape-1.2.1.ebuild
rename to media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2022-09-03 1:43 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-09-03 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 9c7be06f13a9bb7b07fe368a22ad78549884ceb5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 01:43:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 01:43:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7be06f
Revert "media-gfx/inkscape: update Poppler 22.09.0 patch"
Didn't mean to push.
This reverts commit 767edb76006523baca227ff79909323ec202583d.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +-
media-gfx/inkscape/inkscape-1.2.1-r1.ebuild | 193 ---------------------
...scape-1.2.1-r2.ebuild => inkscape-1.2.1.ebuild} | 0
3 files changed, 1 insertion(+), 194 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
index 80d071d51b0b..87583019d6e3 100644
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
}
}
+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
++ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum());
+#else
state->setLineDash(dash, length, args[1].getNum());
+#endif
diff --git a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
deleted file mode 100644
index e2183428d93b..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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"
-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-1.65:=
- 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}"
-
-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.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1.ebuild
similarity index 100%
rename from media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
rename to media-gfx/inkscape/inkscape-1.2.1.ebuild
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2022-05-26 2:47 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-05-26 2:47 UTC (permalink / raw
To: gentoo-commits
commit: 9951345352e2afdb9832c31657a38a19b00a9b52
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 02:23:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 26 02:47:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99513453
media-gfx/inkscape: fixup X11 patch
Bug: https://github.com/gentoo/gentoo/pull/20181
Closes: https://bugs.gentoo.org/768663
Signed-off-by: Sam James <sam <AT> gentoo.org>
...patch => inkscape-1.1.2-automagic-libX11.patch} | 41 +++++++---------------
media-gfx/inkscape/inkscape-1.1.2-r2.ebuild | 2 +-
2 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.0.2-automagic-libX11.patch b/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
similarity index 78%
rename from media-gfx/inkscape/files/inkscape-1.0.2-automagic-libX11.patch
rename to media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
index b8f93642088d..fe104415fb89 100644
--- a/media-gfx/inkscape/files/inkscape-1.0.2-automagic-libX11.patch
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
@@ -5,45 +5,35 @@ Subject: [PATCH] CMake: Fix automagic dependency on X11
Related: https://bugs.gentoo.org/768663
Related: https://github.com/gentoo/gentoo/pull/20181
----
- CMakeLists.txt | 3 +++
- CMakeScripts/DefineDependsandFlags.cmake | 13 +++++++----
- src/ege-color-prof-tracker.cpp | 28 ++++++++++++------------
- 3 files changed, 26 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5cb3f7fbd..2a04d86fbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ project(inkscape)
- set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME inkscape) # needs to be before any install() commands
+@@ -36,6 +36,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME inkscape) # needs to be before any inst
+ include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
include(CMakeScripts/ConfigPaths.cmake)
+include(CMakeDependentOption)
set(PROJECT_NAME inkscape)
-@@ -127,6 +128,7 @@ option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON)
+@@ -126,6 +127,7 @@ option(WITH_GSPELL "Compile with support of gspell" ON)
option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)
option(WITH_ASAN "Compile with Clang's AddressSanitizer (for debugging purposes)" OFF)
+cmake_dependent_option(WITH_X11 "Compile with X11 support" ON "UNIX; NOT APPLE" OFF)
+ option(WITH_INTERNAL_2GEOM "Prefer internal copy of lib2geom" OFF)
option(WITH_FUZZ "Compile for fuzzing purpose (use 'make fuzz' only)" OFF)
- mark_as_advanced(WITH_FUZZ)
-@@ -284,6 +286,7 @@ message("WITH_LIBWPG: ${WITH_LIBWPG}")
+@@ -285,6 +287,7 @@ message("WITH_LIBWPG: ${WITH_LIBWPG}")
message("WITH_NLS: ${WITH_NLS}")
message("WITH_OPENMP: ${WITH_OPENMP}")
message("WITH_JEMALLOC: ${WITH_JEMALLOC}")
+message("WITH_X11: ${WITH_X11}")
+ message("WITH_INTERNAL_2GEOM: ${WITH_INTERNAL_2GEOM}")
message("WITH_PROFILING: ${WITH_PROFILING}")
- message("BUILD_TESTING: ${BUILD_TESTING}")
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index 1b5ed0d349..ef3f321977 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -384,12 +384,17 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
+@@ -403,12 +403,17 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
@@ -65,8 +55,6 @@ index 1b5ed0d349..ef3f321977 100644
# end Dependencies
-diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
-index 0b118f1a57..6fb721c2f3 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -46,11 +46,11 @@
@@ -83,7 +71,7 @@ index 0b118f1a57..6fb721c2f3 100644
#include "ege-color-prof-tracker.h"
#include "helper/sp-marshal.h"
-@@ -68,24 +68,24 @@ static void ege_color_prof_tracker_set_property( GObject* obj, guint propId, con
+@@ -69,24 +69,24 @@ static void ege_color_prof_tracker_dispose(GObject *);
class ScreenTrack {
public:
@@ -112,7 +100,7 @@ index 0b118f1a57..6fb721c2f3 100644
static guint signals[LAST_SIGNAL] = {0};
-@@ -296,10 +296,10 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
+@@ -323,10 +323,10 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
int numMonitors = gdk_display_get_n_monitors(display);
@@ -125,7 +113,7 @@ index 0b118f1a57..6fb721c2f3 100644
tracked_screen->trackers= new std::vector<EgeColorProfTracker *>;
tracked_screen->trackers->push_back(tracker );
tracked_screen->profiles = g_ptr_array_new();
-@@ -309,14 +309,14 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
+@@ -336,14 +336,14 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
g_signal_connect( G_OBJECT(screen), "size-changed", G_CALLBACK( screen_size_changed_cb ), tracker );
@@ -142,7 +130,7 @@ index 0b118f1a57..6fb721c2f3 100644
}
}
-@@ -408,13 +408,13 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
+@@ -411,13 +411,13 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
if ( numMonitors > (gint)tracked_screen->profiles->len ) {
for ( guint i = tracked_screen->profiles->len; i < (guint)numMonitors; i++ ) {
g_ptr_array_add( tracked_screen->profiles, nullptr );
@@ -158,7 +146,7 @@ index 0b118f1a57..6fb721c2f3 100644
}
} else if ( numMonitors < (gint)tracked_screen->profiles->len ) {
/* g_message("The count of monitors decreased, remove some"); */
-@@ -422,7 +422,7 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
+@@ -425,7 +425,7 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
}
}
@@ -167,7 +155,7 @@ index 0b118f1a57..6fb721c2f3 100644
GdkFilterReturn x11_win_filter(GdkXEvent *xevent,
GdkEvent *event,
gpointer data)
-@@ -615,7 +615,7 @@ static void set_profile( guint monitor, const guint8* data, guint len )
+@@ -618,7 +618,7 @@ static void set_profile( guint monitor, const guint8* data, guint len )
}
}
}
@@ -176,6 +164,3 @@ index 0b118f1a57..6fb721c2f3 100644
/*
Local Variables:
mode:c++
---
-2.26.3
-
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
index bbf39788284b..3d6f15bd5aa9 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
@@ -110,7 +110,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.03.0.patch" # bug 835424
"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.04.0.patch" # bug 835661 / bug 843275
- "${FILESDIR}/inkscape-1.0.2-automagic-libX11.patch" # bug 768663
+ "${FILESDIR}/${PN}-1.1.2-automagic-libX11.patch" # bug 768663
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2022-05-08 17:42 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-05-08 17:42 UTC (permalink / raw
To: gentoo-commits
commit: ea7abbfe5d1f6fbe2f25979b00e3d36651e0a041
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 17:41:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 8 17:42:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7abbfe
media-gfx/inkscape: fix build with Poppler 22.04.0
Also, switch out the 22.03.0 patch with the variant in upstream's
1.1.x branch so that 22.04.x patch applies (from same place).
Closes: https://bugs.gentoo.org/843275
Closes: https://bugs.gentoo.org/835661
Bug: https://bugs.gentoo.org/835424
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.1.2-r1-poppler-22.03.0.patch | 43 +++++
.../files/inkscape-1.1.2-r1-poppler-22.04.0.patch | 130 +++++++++++++++
media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 184 +++++++++++++++++++++
3 files changed, 357 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
new file mode 100644
index 000000000000..4083c9426644
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
@@ -0,0 +1,43 @@
+https://gitlab.com/inkscape/inkscape/-/commit/f7857a4fc2b916e64d9689ccc89914ad19f3ef0a.patch
+https://bugs.gentoo.org/843275
+
+From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75)
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+
+ // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+ // glib gstdio.c
+- GooString *filename_goo = new GooString(uri);
+- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
+
+ if (!pdf_doc->isOk()) {
+ int error = pdf_doc->getErrorCode();
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+GitLab
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
new file mode 100644
index 000000000000..8e507d0ebcf4
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
@@ -0,0 +1,130 @@
+https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch
+https://bugs.gentoo.org/835661
+
+From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+- GfxFont *font = res->lookupFont(args[0].getName());
++ auto font = res->lookupFont(args[0].getName());
+
+ if (!font) {
+ // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ fflush(stdout);
+ }
+
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ font->incRefCnt();
++#endif
+ state->setFont(font, args[1].getNum());
+ fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+- GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+ int len, n, uLen;
+
+- font = state->getFont();
++ auto font = state->getFont();
+ wMode = font->getWMode();
+
+ builder->beginString(state);
+@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+ if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ code, u, uLen)) {*/
+- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
++ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
+ pushResources(resDict);
+- }
++ }
+ if (charProc.isStream()) {
+ //parse(&charProc, gFalse); // TODO: parse into SVG font
+ } else {
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
++#else
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
+
+ void SvgBuilder::_init() {
+ _font_style = nullptr;
+- _current_font = nullptr;
+ _font_specification = nullptr;
+ _font_scaling = 1;
+ _need_font_update = true;
+@@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) {
+ _need_font_update = false;
+ updateTextMatrix(state); // Ensure that we have a text matrix built
+
+- if (_font_style) {
+- //sp_repr_css_attr_unref(_font_style);
+- }
+ _font_style = sp_repr_css_attr_new();
+- GfxFont *font = state->getFont();
++ auto font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+ _font_specification = font->getName()->getCString();
+@@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) {
+ sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+ }
+
+- _current_font = font;
+ _invalidated_style = true;
+ }
+
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -203,7 +203,6 @@ private:
+ std::vector<SvgGraphicsState> _state_stack;
+
+ SPCSSAttr *_font_style; // Current font style
+- GfxFont *_current_font;
+ const char *_font_specification;
+ double _font_scaling;
+ bool _need_font_update;
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..92895f6cd959
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-util/glib-utils
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+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-1.65:=
+ 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/libX11
+ >=x11-libs/pango-1.37.2
+ x11-libs/gtk+:3
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_USEDEP}]
+ media-gfx/scour[${PYTHON_USEDEP}]
+ ')
+ cdr? (
+ app-text/libwpg:0.3
+ dev-libs/librevenge
+ media-libs/libcdr
+ )
+ dbus? ( dev-libs/dbus-glib )
+ exif? ( media-libs/libexif )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ jpeg? ( virtual/jpeg:0 )
+ 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.1.2-r1-poppler-22.03.0.patch" # bug 835424
+ "${FILESDIR}/${PN}-1.1.2-r1-poppler-22.04.0.patch" # bug 835661 / bug 843275
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+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_DBUS=$(usex dbus)
+ -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)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build -j1 check
+}
+
+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."
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2021-12-17 14:55 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2021-12-17 14:55 UTC (permalink / raw
To: gentoo-commits
commit: db724c7e56116d93a86cc9fde1cc044b89074c69
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 6 09:57:25 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 14:55:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db724c7e
media-gfx/inkscape: Drop 1.0.2-r2
Broken by current stable app-text/poppler.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 -
media-gfx/inkscape/files/glib-2.67.3.patch | 65 -----------
media-gfx/inkscape/inkscape-1.0.2-r2.ebuild | 161 ----------------------------
3 files changed, 227 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6e34122c13f6..56c86013d34f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
-DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
diff --git a/media-gfx/inkscape/files/glib-2.67.3.patch b/media-gfx/inkscape/files/glib-2.67.3.patch
deleted file mode 100644
index b959bcd76fdc..000000000000
--- a/media-gfx/inkscape/files/glib-2.67.3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Wed, 17 Feb 2021 09:13:49 +0000
-Subject: [PATCH] Fix build with glib 2.67.3.
-
-As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
-blocks. It was indirectly included by both "types.h" and "color.h".
-"types.h" already does not need to be wrapped in an extern "C" block,
-"color.h" does but can be modified not to, so with that changed they can
-be moved out.
----
- src/3rdparty/autotrace/autotrace.h | 6 +++---
- src/3rdparty/autotrace/color.h | 7 +++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
-index 2ce6f272a9..e56be9a74c 100644
---- a/src/3rdparty/autotrace/autotrace.h
-+++ b/src/3rdparty/autotrace/autotrace.h
-@@ -23,6 +23,9 @@
-
- #include <stdio.h>
-
-+#include "types.h"
-+#include "color.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-@@ -35,9 +38,6 @@ extern "C" {
- * Typedefs
- * ===================================================================== */
-
--#include "types.h"
--#include "color.h"
--
- /* Third degree is the highest we deal with. */
- enum _at_polynomial_degree {
- AT_LINEARTYPE = 1,
-diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
-index e50ab30ae0..88651db9f7 100644
---- a/src/3rdparty/autotrace/color.h
-+++ b/src/3rdparty/autotrace/color.h
-@@ -24,6 +24,10 @@
- #include <glib.h>
- #include <glib-object.h>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- typedef struct _at_color at_color;
- struct _at_color {
- guint8 r;
-@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
- GType at_color_get_type(void);
- #define AT_TYPE_COLOR (at_color_get_type ())
-
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
- #endif /* not AT_COLOR_H */
---
-GitLab
-
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
deleted file mode 100644
index 0a9dc6de2d53..000000000000
--- a/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="xml"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-util/glib-utils
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-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/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/libpng:0=
- net-libs/libsoup:2.4
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/pango-1.37.2
- x11-libs/gtk+:3
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_USEDEP}]
- media-gfx/scour[${PYTHON_USEDEP}]
- ')
- cdr? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- media-libs/libcdr
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- jemalloc? ( dev-libs/jemalloc )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:3
- )
- 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}
- >=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2021-01-15_e86c870879
-
-PATCHES=(
- "${FILESDIR}"/glib-2.67.3.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-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
- -DENABLE_POPPLER=ON
- -DWITH_NLS=ON
- -DENABLE_POPPLER_CAIRO=ON
- -DWITH_PROFILING=OFF
- -DWITH_LIBCDR=$(usex cdr)
- -DWITH_DBUS=$(usex dbus)
- -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_JEMALLOC=$(usex jemalloc)
- -DENABLE_LCMS=$(usex lcms)
- -DWITH_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=$(usex !static-libs)
- -DWITH_SVG2=$(usex svg2)
- -DWITH_LIBVISIO=$(usex visio)
- -DWITH_LIBWPG=$(usex wpg)
- )
-
- cmake_src_configure
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2021-11-06 21:06 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-11-06 21:06 UTC (permalink / raw
To: gentoo-commits
commit: 22cd821e55975b479094132da6a319e1fb15f3cd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 21:06:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 21:06:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cd821e
media-gfx/inkscape: fix build with Poppler 21.11.0
Closes: https://bugs.gentoo.org/822129
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.1-poppler-21.11.0.patch | 20 ++++++++++++++++++++
media-gfx/inkscape/inkscape-1.1.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
new file mode 100644
index 00000000000..7b02253d5f9
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
@@ -0,0 +1,20 @@
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 1 Nov 2021 21:45:38 +0200
+Subject: [PATCH] Fix build with poppler 21.11.0
+
+GfxFont::tag is now of type std::string instead of GooString *.
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ }
+ if (printCommands) {
+ printf(" font: tag=%s name='%s' %g\n",
++#if POPPLER_CHECK_VERSION(21,11,0)
++ font->getTag().c_str(),
++#else
+ font->getTag()->getCString(),
++#endif
+ font->getName() ? font->getName()->getCString() : "???",
+ args[1].getNum());
+ fflush(stdout);
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index e62f8efdec2..0a00c0afef4 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -110,6 +110,7 @@ pkg_pretend() {
src_prepare() {
# Backport from master
eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch
+ eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch
cmake_src_prepare
sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2021-04-14 19:28 Mikle Kolyada
0 siblings, 0 replies; 21+ messages in thread
From: Mikle Kolyada @ 2021-04-14 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 984290cc2e0b62865121379e9f621a2eba4b6b66
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 19:28:33 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 19:28:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984290cc
media-gfx/inkscape: Drop old
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 -
.../inkscape/files/missing_atomic_include.patch | 10 --
media-gfx/inkscape/inkscape-1.0.1-r1.ebuild | 161 ---------------------
3 files changed, 172 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 2455bcce911..595bd98db34 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
diff --git a/media-gfx/inkscape/files/missing_atomic_include.patch b/media-gfx/inkscape/files/missing_atomic_include.patch
deleted file mode 100644
index b298550c5c8..00000000000
--- a/media-gfx/inkscape/files/missing_atomic_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ui/tool/node.cpp 2020-05-01 15:18:52.000000000 +0200
-+++ b/src/ui/tool/node.cpp 2020-08-18 01:25:05.266412299 +0200
-@@ -7,6 +7,7 @@
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-+#include <atomic>
- #include <iostream>
- #include <stdexcept>
- #include <boost/utility.hpp>
diff --git a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
deleted file mode 100644
index 861ac2210cd..00000000000
--- a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}/missing_atomic_include.patch"
-)
-
-BDEPEND="
- dev-util/glib-utils
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-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/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/libpng:0=
- net-libs/libsoup
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/pango-1.37.2
- x11-libs/gtk+:3
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- media-gfx/scour[${PYTHON_MULTI_USEDEP}]
- ')
- cdr? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- media-libs/libcdr
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- jemalloc? ( dev-libs/jemalloc )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:3
- )
- 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_MULTI_USEDEP}]
- ')
- dia? ( app-office/dia )
- postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2020-09-07_3bc2e813f5
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-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
- -DENABLE_POPPLER=ON
- -DWITH_NLS=ON
- -DENABLE_POPPLER_CAIRO=ON
- -DWITH_PROFILING=OFF
- -DWITH_LIBCDR=$(usex cdr)
- -DWITH_DBUS=$(usex dbus)
- -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_JEMALLOC=$(usex jemalloc)
- -DENABLE_LCMS=$(usex lcms)
- -DWITH_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=$(usex !static-libs)
- -DWITH_SVG2=$(usex svg2)
- -DWITH_LIBVISIO=$(usex visio)
- -DWITH_LIBWPG=$(usex wpg)
- )
-
- cmake_src_configure
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2020-04-25 13:24 Andreas K. Hüttel
0 siblings, 0 replies; 21+ messages in thread
From: Andreas K. Hüttel @ 2020-04-25 13:24 UTC (permalink / raw
To: gentoo-commits
commit: ef6415751e610f63bdcbc60b133a84376d877785
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 13:23:21 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 13:23:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef641575
media-gfx/inkscape: Fix build against glibmm-2.62, bug 715394
Patch by Matt Whitlock
Closes: https://bugs.gentoo.org/715394
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch | 14 ++++++++++++++
media-gfx/inkscape/inkscape-0.92.4-r2.ebuild | 1 +
media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 1 +
3 files changed, 16 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch
new file mode 100644
index 00000000000..7a35d8d55ad
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch
@@ -0,0 +1,14 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2019-01-15 04:29:27.000000000 +0000
++++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000
+@@ -879,10 +879,6 @@
+ if test "x$enable_strict_build" != "xno"; then
+ CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS"
+
+- # Ensure that no deprecated glibmm symbols are introduced.
+- # lp:inkscape builds cleanly with this option at r10957
+- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS"
+-
+ dnl Pango 1.32.4 uses a deprecated Glib symbol:
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843
+ dnl
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
index bc73e6c6f57..f6599b277d7 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
+ "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394
)
S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
index 912e7bba247..223078d3cfa 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
+ "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2020-01-06 10:31 Andreas K. Hüttel
0 siblings, 0 replies; 21+ messages in thread
From: Andreas K. Hüttel @ 2020-01-06 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 63a3936462dd26cc99802cb9a8263fd157796fb8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 10:29:32 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 10:31:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a39364
media-gfx/inkscape: Fix build with Poppler 0.83.0 and 0.84.0
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/inkscape-0.92.4-poppler-0.83.0.patch | 92 ++++++++++++++++++++++
media-gfx/inkscape/inkscape-0.92.4.ebuild | 3 +-
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch
new file mode 100644
index 00000000000..bcfb1cd482e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch
@@ -0,0 +1,92 @@
+From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Tue, 3 Dec 2019 00:17:05 +0100
+Subject: [PATCH] Fix build with Poppler 0.83.0
+
+Fixed for gentoo by dilfridge@gentoo.org
+
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp 2019-01-15 05:29:27.000000000 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp 2020-01-06 10:55:05.105063212 +0100
+@@ -689,12 +689,12 @@
+ //
+ gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
+ if (poppler_datadir != NULL) {
+- globalParams = new GlobalParams(poppler_datadir);
++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
+ } else {
+- globalParams = new GlobalParams();
++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+ }
+ #else
+- globalParams = new GlobalParams();
++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+ #endif // ENABLE_OSX_APP_LOCATIONS
+ }
+
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:53:44.947229010 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:56:49.611773932 +0100
+@@ -272,7 +272,7 @@
+ ClipHistoryEntry *save();
+ ClipHistoryEntry *restore();
+ GBool hasSaves() { return saved != NULL; }
+- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
++ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
+ GfxPath *getClipPath() { return clipPath; }
+ GfxClipType getClipType() { return clipType; }
+
+@@ -3394,7 +3394,7 @@
+ }
+ }
+
+-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
++void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {
+ // Free previous clip path
+ if (clipPath) {
+ delete clipPath;
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:53:44.947229010 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:55:05.107063491 +0100
+@@ -3,6 +3,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++#define _POPPLER_CONST_83 const
++#else
++#define _POPPLER_CONST_83
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 82, 0)
+ #define _POPPLER_CONST_82 const
+ #else
+@@ -15,6 +21,12 @@
+ #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
+ #endif
+
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args))
++#else
++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
++#endif
++
+
+ #if POPPLER_CHECK_VERSION(0, 72, 0)
+ #define getCString c_str
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:53:44.948229017 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:55:05.107063491 +0100
+@@ -264,10 +264,10 @@
+ /**
+ * \brief Generates a SVG path string from poppler's data structure
+ */
+-static gchar *svgInterpretPath(GfxPath *path) {
++static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
+ Inkscape::SVG::PathString pathString;
+ for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
+- GfxSubpath *subpath = path->getSubpath(i);
++ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
+ if (subpath->getNumPoints() > 0) {
+ pathString.moveTo(subpath->getX(0), subpath->getY(0));
+ int j = 1;
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 87203911632..912f6b6098b 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -99,6 +99,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.48.4-epython.patch"
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
+ "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2019-12-11 9:20 Miroslav Šulc
0 siblings, 0 replies; 21+ messages in thread
From: Miroslav Šulc @ 2019-12-11 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 8f7e9907cbdc7b5b2a620ed93b092693de1cf43c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 09:20:34 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 09:20:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7e9907
media-gfx/inkscape-1.0_beta2: bump
removed patches that are already applied by upstream
Bug: https://bugs.gentoo.org/696794
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/inkscape/Manifest | 2 +-
....0_beta1-avoid-reordering-cmake-cxx-flags.patch | 130 ---------------------
.../files/inkscape-1.0_beta1-poppler-0.82.patch | 70 -----------
...-1.0_beta1.ebuild => inkscape-1.0_beta2.ebuild} | 12 +-
4 files changed, 6 insertions(+), 208 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 983a7b02312..e36ab94e6b0 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,2 @@
DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
-DIST inkscape-1.0beta1.tar.bz2 31096177 BLAKE2B 72769d0e15f20fcc5cdf81987896e7d354c2c71fc31feaa18dfff12df2791d2ed85be4451e76e8191c5f469b2e70fd03f4888270e67628c50978a3fd30c41264 SHA512 35b3ba46d76b55eb268209631ea652b3512d3aaf07f577543081c311acff13b0a667ecf069e9f1c2f47dc16525df952cfb9ca29e9a3078f9096ee7865b917245
+DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
deleted file mode 100644
index bd78bc58232..00000000000
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 09319f688e10d47f9fc9be2b6feb831fb132660a Mon Sep 17 00:00:00 2001
-From: Patrick Storz <eduard.braun2@gmx.de>
-Date: Sat, 12 Oct 2019 15:56:14 +0200
-Subject: [PATCH] CMake: Avoid reordering CMAKE_CXX_FLAGS
-
-Order matters; the reordering caused the _FORTIFY_SOURCE flag to be
-always undefined (as we flipped a "-U" and "-D")
-
-Also skip removing duplicates to avoid similar pitfalls (we kept
-only the first occurrence but should've kept the last)
-It did not work properly anyway (we still had duplicates in the end)
-and was only required as we wrote the final CMAKE_CXX_FLAGS back to
-cache and consequently appended new flags with every run of CMAKE.
----
- CMakeLists.txt | 13 -----------
- CMakeScripts/CanonicalizeFlagsVar.cmake | 11 ----------
- CMakeScripts/DefineDependsandFlags.cmake | 28 ++++++++++++++----------
- 3 files changed, 17 insertions(+), 35 deletions(-)
- delete mode 100644 CMakeScripts/CanonicalizeFlagsVar.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b30f013f38..aa14e13e01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,19 +207,6 @@ if(GMOCK_PRESENT)
- endif()
- endif()
-
--# -----------------------------------------------------------------------------
--# Canonicalize the flags to speed up recompilation using ccache/etc.
--# This should be the last thing we do:
--# -----------------------------------------------------------------------------
--include(CMakeScripts/CanonicalizeFlagsVar.cmake)
--canonicalize_flags_var("${CMAKE_CXX_FLAGS}" _new_cxx)
--set(CMAKE_CXX_FLAGS "${_new_cxx}" CACHE STRING "" FORCE)
--canonicalize_flags_var("${CMAKE_CXX_FLAGS_DEBUG}" _new_cxx)
--set(CMAKE_CXX_FLAGS_DEBUG "${_new_cxx}" CACHE STRING "" FORCE)
--# message(FATAL_ERROR "CMAKE_CXX_FLAGS = <${CMAKE_CXX_FLAGS}>")
--
--
--
-
- # -----------------------------------------------------------------------------
- # Clean Targets
-diff --git a/CMakeScripts/CanonicalizeFlagsVar.cmake b/CMakeScripts/CanonicalizeFlagsVar.cmake
-deleted file mode 100644
-index ddc5b7b5d3..0000000000
---- a/CMakeScripts/CanonicalizeFlagsVar.cmake
-+++ /dev/null
-@@ -1,11 +0,0 @@
--# This file is copyright by Shlomi Fish, 2016.
--#
--# This file is licensed under the MIT/X11 license:
--# https://opensource.org/licenses/mit-license.php
--
--macro (canonicalize_flags_var in_val out_var)
-- string(REPLACE " " ";" _c "${in_val}")
-- list(REMOVE_DUPLICATES _c)
-- list(SORT _c)
-- string(REPLACE ";" " " "${out_var}" "${_c}")
--endmacro()
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index 996100b4d7..9dd7f7785f 100644
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -2,6 +2,7 @@ set(INKSCAPE_LIBS "")
- set(INKSCAPE_INCS "")
- set(INKSCAPE_INCS_SYS "")
- set(INKSCAPE_CXX_FLAGS "")
-+set(INKSCAPE_CXX_FLAGS_DEBUG "")
-
- list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR}
- ${PROJECT_SOURCE_DIR}/src
-@@ -98,7 +99,7 @@ list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
- add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
-
- find_package(DoubleConversion REQUIRED) # lib2geom dependency
--
-+
- if(WITH_JEMALLOC)
- find_package(JeMalloc)
- if (JEMALLOC_FOUND)
-@@ -369,14 +370,6 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
- list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
- list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
-
--list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
--foreach(flag ${INKSCAPE_CXX_FLAGS})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE)
--endforeach()
--foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
-- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}" CACHE STRING "" FORCE)
--endforeach()
--
- # Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly
- find_package(X11)
- if(X11_FOUND)
-@@ -386,14 +379,27 @@ endif(X11_FOUND)
-
- # end Dependencies
-
-+
-+
-+# Set include directories and CXX flags
-+# (INKSCAPE_LIBS are set as target_link_libraries for inkscape_base in src/CMakeLists.txt)
-+
-+foreach(flag ${INKSCAPE_CXX_FLAGS})
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-+endforeach()
-+foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
-+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}")
-+endforeach()
-+
- list(REMOVE_DUPLICATES INKSCAPE_LIBS)
- list(REMOVE_DUPLICATES INKSCAPE_INCS_SYS)
-
--# C/C++ Flags
- include_directories(${INKSCAPE_INCS})
- include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
-
--include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
-+include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake) # TODO: Check if this needs to be "hidden" here
-
- unset(INKSCAPE_INCS)
- unset(INKSCAPE_INCS_SYS)
-+unset(INKSCAPE_CXX_FLAGS)
-+unset(INKSCAPE_CXX_FLAGS_DEBUG)
---
-2.22.0
-
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch
deleted file mode 100644
index 4c5bff4977a..00000000000
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
-From: Thomas Holder <thomas@thomas-holder.de>
-Date: Sat, 26 Oct 2019 14:39:31 +0200
-Subject: [PATCH] fix poppler 0.82.0 build
-
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp | 2 +-
- src/extension/internal/pdfinput/svg-builder.h | 2 +-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 4f798e35bf..4eae275757 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2405,7 +2405,7 @@ void PdfParser::doShowText(GooString *s) {
- int wMode;
- double riseX, riseY;
- CharCode code;
-- Unicode *u = nullptr;
-+ Unicode _POPPLER_CONST_82 *u = nullptr;
- double x, y, dx, dy, tdx, tdy;
- double originX, originY, tOriginX, tOriginY;
- double oldCTM[6], newCTM[6];
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 5e8bc4ae90..01834007e8 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+#define _POPPLER_CONST_82 const
-+#else
-+#define _POPPLER_CONST_82
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 76, 0)
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 14727eba5f..a7134684a0 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1395,7 +1395,7 @@ void SvgBuilder::beginString(GfxState *state) {
- void SvgBuilder::addChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
-- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
-+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
-
-
- bool is_space = ( uLen == 1 && u[0] == 32 );
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index c42d694dec..050465d4bf 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -142,7 +142,7 @@ public:
- void addChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
-- CharCode code, int nBytes, Unicode *u, int uLen);
-+ CharCode code, int nBytes, Unicode const *u, int uLen);
- void beginTextObject(GfxState *state);
- void endTextObject(GfxState *state);
-
---
-2.22.0
diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
similarity index 90%
rename from media-gfx/inkscape/inkscape-1.0_beta1.ebuild
rename to media-gfx/inkscape/inkscape-1.0_beta2.ebuild
index 06558305609..d88a546fcfb 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
@@ -6,12 +6,12 @@ EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
PYTHON_REQ_USE="xml"
MY_P="${P/_/}"
+RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
DESCRIPTION="SVG based generic vector-drawing program"
HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/14917/${MY_P}.tar.bz2"
-#SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+SRC_URI="https://inkscape.org/gallery/item/16197/${MY_P}${RELEASE_SUFFIX}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -93,15 +93,13 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.65
"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}${RELEASE_SUFFIX}"
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${P}-detect-imagemagick.patch
- "${FILESDIR}"/${P}-do-not-compress-man.patch
- "${FILESDIR}"/${P}-poppler-0.82.patch
- "${FILESDIR}"/${P}-avoid-reordering-cmake-cxx-flags.patch
+ "${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
+ "${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2019-11-07 8:11 Lars Wendler
0 siblings, 0 replies; 21+ messages in thread
From: Lars Wendler @ 2019-11-07 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 259b9bc5efe4e4b4d9463ad120d55f2a5812e769
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 08:08:18 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 08:11:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259b9bc5
media-gfx/inkscape: Attempt to fix build against imagemagick
Bug: https://bugs.gentoo.org/656730
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch | 2 +-
media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
index 141878b2bcd..db069d1e87c 100644
--- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
+++ b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
@@ -74,7 +74,7 @@ diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac
+
+magick_ok="no"
+if test "x$enable_magick" = "xyes"; then
-+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
++ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no)
+ if test "x$magick_ok" = "xyes"; then
+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
+ fi
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 08369700fb9..c38fe42d1a6 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( dev-libs/dbus-glib )
exif? ( media-libs/libexif )
gnome? ( >=gnome-base/gnome-vfs-2.0 )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
+ imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
spell? (
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2019-01-11 0:37 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-01-11 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 62a49104f21107582f9644db33427910f50527da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 00:27:36 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 00:37:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a49104
media-gfx/inkscape: Fix build with poppler-0.72
Closes: https://bugs.gentoo.org/674812
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 +
.../files/inkscape-0.92.3-poppler-0.64-2.patch | 160 ---------
.../files/inkscape-0.92.3-poppler-0.64.patch | 121 -------
.../files/inkscape-0.92.3-poppler-0.65.patch | 29 --
.../files/inkscape-0.92.3-poppler-0.69.patch | 400 ---------------------
.../files/inkscape-0.92.3-poppler-0.71.patch | 31 --
media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 16 +-
7 files changed, 10 insertions(+), 748 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 00b2e31f116..53e6179245b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,4 @@
DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
+DIST inkscape-0.92.3-poppler-patches.tar.xz 7508 BLAKE2B afb639e9149256d0a7d534c28f3c51cb6adf0bfdb458be1c729475f235cd363e3e6b50033f7d377eaeae9f564b33e710ac01fc323821f5b4a97ffc73edc342a5 SHA512 0011ca503e786520c756ff4578c0db55aadf907bf6479837fa35e7a035695ff7e0aaf8f878f5354730ac75808d36c5e34ae15d32a1af37134ce881edd810c4a5
DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch
deleted file mode 100644
index 4608bc79ecd..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 66d05776ea2d403f2f48437f70d096a09724dfec Mon Sep 17 00:00:00 2001
-From: Eduard Braun <eduard.braun2@gmx.de>
-Date: Wed, 5 Sep 2018 00:31:06 +0200
-Subject: [PATCH] Modified fix for compatibility with poppler 0.64
-
-This is slightly uglier than f0697de012598ea84edafea9a326e5e101eccd2a
-but avoids duplicating strings (which is unnecessary and leaked memory).
-
-It's also closer to what upstream intended with the changes in 0.64.
-
-(cherry picked from commit 722e121361d0f784083d10e897155b7d4e44e515)
----
- .../internal/pdfinput/pdf-parser.cpp | 19 ++++++++++++++++---
- src/extension/internal/pdfinput/pdf-parser.h | 6 ++++++
- .../internal/pdfinput/svg-builder.cpp | 6 +++---
- src/extension/internal/pdfinput/svg-builder.h | 4 ++--
- 4 files changed, 27 insertions(+), 8 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index a3aa3213a1..ea9f902e09 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -36,6 +36,7 @@ extern "C" {
- #include "pdf-parser.h"
- #include "util/units.h"
-
-+#include "glib/poppler-features.h"
- #include "goo/gmem.h"
- #include "goo/GooString.h"
- #include "GlobalParams.h"
-@@ -2581,7 +2582,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
- }
- }
-
-+#if POPPLER_CHECK_VERSION(0,64,0)
- void PdfParser::doShowText(const GooString *s) {
-+#else
-+void PdfParser::doShowText(GooString *s) {
-+#endif
- GfxFont *font;
- int wMode;
- double riseX, riseY;
-@@ -2594,7 +2599,11 @@ void PdfParser::doShowText(const GooString *s) {
- Object charProc;
- Dict *resDict;
- Parser *oldParser;
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+ const char *p;
-+#else
- char *p;
-+#endif
- int len, n, uLen;
-
- font = state->getFont();
-@@ -2630,7 +2639,7 @@ void PdfParser::doShowText(const GooString *s) {
- double lineX = state->getLineX();
- double lineY = state->getLineY();
- oldParser = parser;
-- p = g_strdup(s->getCString());
-+ p = s->getCString();
- len = s->getLength();
- while (len > 0) {
- n = font->getNextChar(p, len, &code,
-@@ -2685,7 +2694,7 @@ void PdfParser::doShowText(const GooString *s) {
-
- } else {
- state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-- p = g_strdup(s->getCString());
-+ p = s->getCString();
- len = s->getLength();
- while (len > 0) {
- n = font->getNextChar(p, len, &code,
-@@ -2731,7 +2740,11 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
- {
- Object obj1, obj2, obj3, refObj;
-
-- char *name = g_strdup(args[0].getName());
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+ const char *name = args[0].getName();
-+#else
-+ char *name = args[0].getName();
-+#endif
- #if defined(POPPLER_NEW_OBJECT_API)
- if ((obj1 = res->lookupXObject(name)).isNull()) {
- #else
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index f985b15cad..ed28274f42 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -25,6 +25,7 @@ namespace Inkscape {
- // TODO clean up and remove using:
- using Inkscape::Extension::Internal::SvgBuilder;
-
-+#include "glib/poppler-features.h"
- #include "goo/gtypes.h"
- #include "Object.h"
-
-@@ -287,7 +288,12 @@ private:
- void opMoveShowText(Object args[], int numArgs);
- void opMoveSetShowText(Object args[], int numArgs);
- void opShowSpaceText(Object args[], int numArgs);
-+#if POPPLER_CHECK_VERSION(0,64,0)
- void doShowText(const GooString *s);
-+#else
-+ void doShowText(GooString *s);
-+#endif
-+
-
- // XObject operators
- void opXObject(Object args[], int numArgs);
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 617861928d..767c8af4d4 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) {
- GfxFont *font = state->getFont();
- // Store original name
- if (font->getName()) {
-- _font_specification = g_strdup(font->getName()->getCString());
-+ _font_specification = font->getName()->getCString();
- } else {
-- _font_specification = (char*) "Arial";
-+ _font_specification = "Arial";
- }
-
- // Prune the font name to get the correct font family name
-@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) {
- char *font_family = NULL;
- char *font_style = NULL;
- char *font_style_lowercase = NULL;
-- char *plus_sign = strstr(_font_specification, "+");
-+ const char *plus_sign = strstr(_font_specification, "+");
- if (plus_sign) {
- font_family = g_strdup(plus_sign + 1);
- _font_specification = plus_sign + 1;
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index ed2a4d48e0..55daacee74 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -80,7 +80,7 @@ struct SvgGlyph {
- bool style_changed; // Set to true if style has to be reset
- SPCSSAttr *style;
- int render_mode; // Text render mode
-- char *font_specification; // Pointer to current font specification
-+ const char *font_specification; // Pointer to current font specification
- };
-
- /**
-@@ -202,7 +202,7 @@ private:
-
- SPCSSAttr *_font_style; // Current font style
- GfxFont *_current_font;
-- char *_font_specification;
-+ const char *_font_specification;
- double _font_scaling;
- bool _need_font_update;
- Geom::Affine _text_matrix;
---
-2.19.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
deleted file mode 100644
index b31786add1b..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From f0697de012598ea84edafea9a326e5e101eccd2a Mon Sep 17 00:00:00 2001
-From: Eduard Braun <eduard.braun2@gmx.de>
-Date: Tue, 24 Apr 2018 19:18:26 +0200
-Subject: [PATCH] Fix compilation with poppler 0.64
-
-(cherry picked from commit a600c6438fef2f4c06f9a4a7d933d99fb054a973)
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++-----
- src/extension/internal/pdfinput/pdf-parser.h | 2 +-
- src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
- src/extension/internal/pdfinput/svg-builder.h | 3 +--
- 4 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 604b7f8079..721524e10a 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
- }
- }
-
--void PdfParser::doShowText(GooString *s) {
-+void PdfParser::doShowText(const GooString *s) {
- GfxFont *font;
- int wMode;
- double riseX, riseY;
-@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
- font = state->getFont();
- wMode = font->getWMode();
-
-- builder->beginString(state, s);
-+ builder->beginString(state);
-
- // handle a Type 3 char
- if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
-@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
- double lineX = state->getLineX();
- double lineY = state->getLineY();
- oldParser = parser;
-- p = s->getCString();
-+ p = g_strdup(s->getCString());
- len = s->getLength();
- while (len > 0) {
- n = font->getNextChar(p, len, &code,
-@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
-
- } else {
- state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-- p = s->getCString();
-+ p = g_strdup(s->getCString());
- len = s->getLength();
- while (len > 0) {
- n = font->getNextChar(p, len, &code,
-@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
- {
- Object obj1, obj2, obj3, refObj;
-
-- char *name = args[0].getName();
-+ char *name = g_strdup(args[0].getName());
- #if defined(POPPLER_NEW_OBJECT_API)
- if ((obj1 = res->lookupXObject(name)).isNull()) {
- #else
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index e28fecc2e1..f985b15cad 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -287,7 +287,7 @@ private:
- void opMoveShowText(Object args[], int numArgs);
- void opMoveSetShowText(Object args[], int numArgs);
- void opShowSpaceText(Object args[], int numArgs);
-- void doShowText(GooString *s);
-+ void doShowText(const GooString *s);
-
- // XObject operators
- void opXObject(Object args[], int numArgs);
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index a448be6397..617861928d 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
- GfxFont *font = state->getFont();
- // Store original name
- if (font->getName()) {
-- _font_specification = font->getName()->getCString();
-+ _font_specification = g_strdup(font->getName()->getCString());
- } else {
- _font_specification = (char*) "Arial";
- }
-@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
- _glyphs.clear();
- }
-
--void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
-+void SvgBuilder::beginString(GfxState *state) {
- if (_need_font_update) {
- updateFont(state);
- }
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index ad15c9c06f..ed2a4d48e0 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -29,7 +29,6 @@ namespace Inkscape {
- #include <glibmm/ustring.h>
-
- #include "CharTypes.h"
--class GooString;
- class Function;
- class GfxState;
- struct GfxColor;
-@@ -136,7 +135,7 @@ public:
- void clearSoftMask(GfxState *state);
-
- // Text handling
-- void beginString(GfxState *state, GooString *s);
-+ void beginString(GfxState *state);
- void endString(GfxState *state);
- void addChar(GfxState *state, double x, double y,
- double dx, double dy,
---
-2.17.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
deleted file mode 100644
index 86d9e48396d..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001
-From: Jan Palus <atler@pld-linux.org>
-Date: Fri, 25 May 2018 00:30:17 +0200
-Subject: [PATCH] Fix compilation with poppler 0.65.0
-
-replace unused includes with one that is actually used
-
-Signed-off-by: Jan Palus <atler@pld-linux.org>
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 6c498f9..caaeca1 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -37,8 +37,7 @@ extern "C" {
- #include "util/units.h"
-
- #include "goo/gmem.h"
--#include "goo/GooTimer.h"
--#include "goo/GooHash.h"
-+#include "goo/GooString.h"
- #include "GlobalParams.h"
- #include "CharTypes.h"
- #include "Object.h"
---
-2.17.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
deleted file mode 100644
index 593ba242db4..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-From 96781f5cea8af9777d87e056506b2bce660c397e Mon Sep 17 00:00:00 2001
-From: Thomas Holder <thomas@thomas-holder.de>
-Date: Fri, 28 Sep 2018 18:05:30 +0000
-Subject: [PATCH] fix 1789208 poppler 0.69
-
----
- CMakeScripts/DefineDependsandFlags.cmake | 12 -----
- src/extension/internal/pdfinput/pdf-input.cpp | 2 +-
- src/extension/internal/pdfinput/pdf-input.h | 1 +
- .../internal/pdfinput/pdf-parser.cpp | 46 ++++++++-----------
- src/extension/internal/pdfinput/pdf-parser.h | 12 +++--
- .../pdfinput/poppler-transition-api.h | 39 ++++++++++++++++
- .../internal/pdfinput/svg-builder.cpp | 22 ++++-----
- src/extension/internal/pdfinput/svg-builder.h | 3 +-
- 8 files changed, 80 insertions(+), 57 deletions(-)
- create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
-
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index c0fce145be..c1244055d5 100644
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
- set(HAVE_POPPLER_GLIB ON)
- endif()
- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.26.0")
-- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
-- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.29.0")
-- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
-- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.58.0")
-- set(POPPLER_NEW_OBJECT_API ON)
-- endif()
- else()
- set(ENABLE_POPPLER_CAIRO OFF)
- endif()
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index e3115620e3..9621e306a0 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- dlg->getImportSettings(prefs);
-
- // Apply crop settings
-- PDFRectangle *clipToBox = NULL;
-+ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
- double crop_setting;
- sp_repr_get_double(prefs, "cropTo", &crop_setting);
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
-index 6e36603c31..73bbfe2a71 100644
---- a/src/extension/internal/pdfinput/pdf-input.h
-+++ b/src/extension/internal/pdfinput/pdf-input.h
-@@ -15,6 +15,7 @@
- #endif
-
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
-
- #include <gtkmm/dialog.h>
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index ea9f902e09..4a7fd8a5e5 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
- int /*pageNum*/,
- int rotate,
- Dict *resDict,
-- PDFRectangle *box,
-- PDFRectangle *cropBox) :
-+ _POPPLER_CONST PDFRectangle *box,
-+ _POPPLER_CONST PDFRectangle *cropBox) :
- xref(xrefA),
- builder(builderA),
- subPage(gFalse),
-@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
- builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
- Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
-
-- double *ctm = state->getCTM();
-+ const double *ctm = state->getCTM();
- double scaledCTM[6];
- for (int i = 0; i < 6; ++i) {
- baseMatrix[i] = ctm[i];
-@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
- PdfParser::PdfParser(XRef *xrefA,
- Inkscape::Extension::Internal::SvgBuilder *builderA,
- Dict *resDict,
-- PDFRectangle *box) :
-+ _POPPLER_CONST PDFRectangle *box) :
- xref(xrefA),
- builder(builderA),
- subPage(gTrue),
-@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
-
- void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
- PdfOperator *op;
-- char *name;
-+ const char *name;
- Object *argPtr;
- int i;
-
-@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
- (this->*op->func)(argPtr, numArgs);
- }
-
--PdfOperator* PdfParser::findOp(char *name) {
-+PdfOperator* PdfParser::findOp(const char *name) {
- int a = -1;
- int b = numOps;
- int cmp = -1;
-@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
- GBool stroke, GBool eoFill) {
- GfxShading *shading;
- GfxPath *savedPath;
-- double *ctm, *btm, *ptm;
-+ const double *ctm, *btm, *ptm;
- double m[6], ictm[6], m1[6];
- double xMin, yMin, xMax, yMax;
- double det;
-@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
- GfxColor color0M, color1M, colorM0, colorM1, colorMM;
- GfxColor colors2[4];
- double functionColorDelta = colorDeltas[pdfFunctionShading-1];
-- double *matrix;
-+ const double *matrix;
- double xM, yM;
- int nComps, i, j;
-
-@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
- }
- }
-
--void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
-+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
- GfxPatch patch00 = blankPatch();
- GfxPatch patch01 = blankPatch();
- GfxPatch patch10 = blankPatch();
-@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
- double x, y, dx, dy, tdx, tdy;
- double originX, originY, tOriginX, tOriginY;
- double oldCTM[6], newCTM[6];
-- double *mat;
-+ const double *mat;
- Object charProc;
- Dict *resDict;
- Parser *oldParser;
-@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
- Stream *PdfParser::buildImageStream() {
- Object dict;
- Object obj;
-- char *key;
- Stream *str;
-
- // build dictionary
-@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
- obj.free();
- #endif
- } else {
-- key = copyString(obj.getName());
--#if defined(POPPLER_NEW_OBJECT_API)
-- obj = parser->getObj();
--#else
-- obj.free();
-- parser->getObj(&obj);
--#endif
-- if (obj.isEOF() || obj.isError()) {
-- gfree(key);
-+ Object obj2;
-+ _POPPLER_CALL(obj2, parser->getObj);
-+ if (obj2.isEOF() || obj2.isError()) {
-+ _POPPLER_FREE(obj);
- break;
- }
--#if defined(POPPLER_NEW_OBJECT_API)
-- dict.dictAdd(key, std::move(obj));
-+ _POPPLER_DICTADD(dict, obj.getName(), obj2);
-+ _POPPLER_FREE(obj);
-+ _POPPLER_FREE(obj2);
- }
-- obj = parser->getObj();
--#else
-- dict.dictAdd(key, &obj);
-- }
-- parser->getObj(&obj);
--#endif
-+ _POPPLER_CALL(obj, parser->getObj);
- }
- if (obj.isEOF()) {
- error(errSyntaxError, getPos(), "End of file in inline image");
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index ed28274f42..0a04c81d46 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -9,6 +9,7 @@
- #define PDF_PARSER_H
-
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
-
- #ifdef USE_GCC_PRAGMAS
- #pragma interface
-@@ -128,11 +129,14 @@ public:
-
- // Constructor for regular output.
- PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
-- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
-+ Dict *resDict,
-+ _POPPLER_CONST PDFRectangle *box,
-+ _POPPLER_CONST PDFRectangle *cropBox);
-
- // Constructor for a sub-page object.
- PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
-- Dict *resDict, PDFRectangle *box);
-+ Dict *resDict,
-+ _POPPLER_CONST PDFRectangle *box);
-
- virtual ~PdfParser();
-
-@@ -186,7 +190,7 @@ private:
-
- void go(GBool topLevel);
- void execOp(Object *cmd, Object args[], int numArgs);
-- PdfOperator *findOp(char *name);
-+ PdfOperator *findOp(const char *name);
- GBool checkArg(Object *arg, TchkType type);
- int getPos();
-
-@@ -257,7 +261,7 @@ private:
- double x2, double y2, GfxColor *color2,
- int nComps, int depth);
- void doPatchMeshShFill(GfxPatchMeshShading *shading);
-- void fillPatch(GfxPatch *patch, int nComps, int depth);
-+ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
- void doEndPath();
-
- // path clipping operators
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-new file mode 100644
-index 0000000000..898e64bf2b
---- /dev/null
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -0,0 +1,39 @@
-+#ifndef SEEN_POPPLER_TRANSITION_API_H
-+#define SEEN_POPPLER_TRANSITION_API_H
-+
-+#include <glib/poppler-features.h>
-+
-+#if POPPLER_CHECK_VERSION(0,70,0)
-+#define _POPPLER_CONST const
-+#else
-+#define _POPPLER_CONST
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0,69,0)
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
-+#elif POPPLER_CHECK_VERSION(0,58,0)
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
-+#else
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0,58,0)
-+#define POPPLER_NEW_OBJECT_API
-+#define _POPPLER_FREE(obj)
-+#define _POPPLER_CALL(ret, func) (ret = func())
-+#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
-+#else
-+#define _POPPLER_FREE(obj) (obj).free()
-+#define _POPPLER_CALL(ret, func) (*func(&ret))
-+#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0, 29, 0)
-+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0, 25, 0)
-+#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
-+#endif
-+
-+#endif
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 767c8af4d4..d449d1af52 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
- if ( pattern != NULL ) {
- if ( pattern->getType() == 2 ) { // Shading pattern
- GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
-- double *ptm;
-+ const double *ptm;
- double m[6] = {1, 0, 0, 1, 0, 0};
- double det;
-
-@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
-
- Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
- // Set pattern transform matrix
-- double *p2u = tiling_pattern->getMatrix();
-+ const double *p2u = tiling_pattern->getMatrix();
- double m[6] = {1, 0, 0, 1, 0, 0};
- double det;
- det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908
-@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
- pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
- // Set pattern tiling
- // FIXME: don't ignore XStep and YStep
-- double *bbox = tiling_pattern->getBBox();
-+ const double *bbox = tiling_pattern->getBBox();
- sp_repr_set_svg_double(pattern_node, "x", 0.0);
- sp_repr_set_svg_double(pattern_node, "y", 0.0);
- sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
-@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
- */
- gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
- Inkscape::XML::Node *gradient;
-- Function *func;
-+ _POPPLER_CONST Function *func;
- int num_funcs;
- bool extend0, extend1;
-
-@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
-
- #define INT_EPSILON 8
- bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
-- Function *func) {
-+ _POPPLER_CONST Function *func) {
- int type = func->getType();
- if ( type == 0 || type == 2 ) { // Sampled or exponential function
- GfxRGB stop1, stop2;
-@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
- _addStopToGradient(gradient, 1.0, &stop2, 1.0);
- }
- } else if ( type == 3 ) { // Stitching
-- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
-- double *bounds = stitchingFunc->getBounds();
-- double *encode = stitchingFunc->getEncode();
-+ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
-+ const double *bounds = stitchingFunc->getBounds();
-+ const double *encode = stitchingFunc->getEncode();
- int num_funcs = stitchingFunc->getNumFuncs();
-
- // Add stops from all the stitched functions
-@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
- svgGetShadingColorRGB(shading, bounds[i + 1], &color);
- // Add stops
- if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
-- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
-+ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
- if (expE > 1.0) {
- expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
- if (encode[2*i] == 0) { // normal sequence
-@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
- Inkscape::CSSOStringStream os_font_size;
- double css_font_size = _font_scaling * state->getFontSize();
- if ( font->getType() == fontType3 ) {
-- double *font_matrix = font->getFontMatrix();
-+ const double *font_matrix = font->getFontMatrix();
- if ( font_matrix[0] != 0.0 ) {
- css_font_size *= font_matrix[3] / font_matrix[0];
- }
-@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
- void SvgBuilder::updateTextMatrix(GfxState *state) {
- _flushText();
- // Update text matrix
-- double *text_matrix = state->getTextMat();
-+ const double *text_matrix = state->getTextMat();
- double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
- double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
- double max_scale;
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index 55daacee74..34b42e17b8 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -15,6 +15,7 @@
- #endif
-
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
-
- class SPDocument;
- namespace Inkscape {
-@@ -174,7 +175,7 @@ private:
- void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
- GfxRGB *color, double opacity);
- bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
-- Function *func);
-+ _POPPLER_CONST Function *func);
- gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
- bool is_stroke=false);
- // Image/mask creation
---
-2.19.1
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
deleted file mode 100644
index fe6ee81260c..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 493aa253fe5c5b1879c0aa26bdad0aa84ba5d6db Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 7 Nov 2018 16:36:22 +0100
-Subject: [PATCH] Fix build with poppler-0.71.0
-
-Fix blatantly backported from
-https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
----
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 6ed911b04b..4437052593 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -3,6 +3,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(0,71,0)
-+typedef bool GBool;
-+#define gTrue true
-+#define gFalse false
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0,70,0)
- #define _POPPLER_CONST const
- #else
---
-2.19.1
-
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index f07d0bbf1f7..82f1004b75f 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,8 @@ MY_P="${P/_/}"
DESCRIPTION="SVG based generic vector-drawing program"
HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -98,11 +99,12 @@ PATCHES=(
"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
"${FILESDIR}/${PN}-0.48.4-epython.patch"
"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
- "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
- "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
- "${FILESDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
- "${FILESDIR}/${PN}-0.92.3-poppler-0.69.patch"
- "${FILESDIR}/${PN}-0.92.3-poppler-0.71.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.64.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.65.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.69.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.71.patch"
+ "${WORKDIR}/${PN}-0.92.3-poppler-0.72.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2018-11-07 15:48 Lars Wendler
0 siblings, 0 replies; 21+ messages in thread
From: Lars Wendler @ 2018-11-07 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 026648c3ec7fb83f0eeba6ec332322adc43db360
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 15:48:30 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 15:48:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026648c3
media-gfx/inkscape: Fixed compilation with >=app-text/poppler-0.69.0
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/inkscape-0.92.3-poppler-0.69.patch | 400 +++++++++++++++++++++
.../files/inkscape-0.92.3-poppler-0.71.patch | 31 ++
media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +
3 files changed, 433 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
new file mode 100644
index 00000000000..593ba242db4
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
@@ -0,0 +1,400 @@
+From 96781f5cea8af9777d87e056506b2bce660c397e Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Fri, 28 Sep 2018 18:05:30 +0000
+Subject: [PATCH] fix 1789208 poppler 0.69
+
+---
+ CMakeScripts/DefineDependsandFlags.cmake | 12 -----
+ src/extension/internal/pdfinput/pdf-input.cpp | 2 +-
+ src/extension/internal/pdfinput/pdf-input.h | 1 +
+ .../internal/pdfinput/pdf-parser.cpp | 46 ++++++++-----------
+ src/extension/internal/pdfinput/pdf-parser.h | 12 +++--
+ .../pdfinput/poppler-transition-api.h | 39 ++++++++++++++++
+ .../internal/pdfinput/svg-builder.cpp | 22 ++++-----
+ src/extension/internal/pdfinput/svg-builder.h | 3 +-
+ 8 files changed, 80 insertions(+), 57 deletions(-)
+ create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
+
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index c0fce145be..c1244055d5 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
+ set(HAVE_POPPLER_GLIB ON)
+ endif()
+ endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.26.0")
+- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
+- endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.29.0")
+- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+- endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.58.0")
+- set(POPPLER_NEW_OBJECT_API ON)
+- endif()
+ else()
+ set(ENABLE_POPPLER_CAIRO OFF)
+ endif()
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index e3115620e3..9621e306a0 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+ dlg->getImportSettings(prefs);
+
+ // Apply crop settings
+- PDFRectangle *clipToBox = NULL;
++ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
+ double crop_setting;
+ sp_repr_get_double(prefs, "cropTo", &crop_setting);
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
+index 6e36603c31..73bbfe2a71 100644
+--- a/src/extension/internal/pdfinput/pdf-input.h
++++ b/src/extension/internal/pdfinput/pdf-input.h
+@@ -15,6 +15,7 @@
+ #endif
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ #include <gtkmm/dialog.h>
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index ea9f902e09..4a7fd8a5e5 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
+ int /*pageNum*/,
+ int rotate,
+ Dict *resDict,
+- PDFRectangle *box,
+- PDFRectangle *cropBox) :
++ _POPPLER_CONST PDFRectangle *box,
++ _POPPLER_CONST PDFRectangle *cropBox) :
+ xref(xrefA),
+ builder(builderA),
+ subPage(gFalse),
+@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
+ builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
+ Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
+
+- double *ctm = state->getCTM();
++ const double *ctm = state->getCTM();
+ double scaledCTM[6];
+ for (int i = 0; i < 6; ++i) {
+ baseMatrix[i] = ctm[i];
+@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
+ PdfParser::PdfParser(XRef *xrefA,
+ Inkscape::Extension::Internal::SvgBuilder *builderA,
+ Dict *resDict,
+- PDFRectangle *box) :
++ _POPPLER_CONST PDFRectangle *box) :
+ xref(xrefA),
+ builder(builderA),
+ subPage(gTrue),
+@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
+
+ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+ PdfOperator *op;
+- char *name;
++ const char *name;
+ Object *argPtr;
+ int i;
+
+@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+ (this->*op->func)(argPtr, numArgs);
+ }
+
+-PdfOperator* PdfParser::findOp(char *name) {
++PdfOperator* PdfParser::findOp(const char *name) {
+ int a = -1;
+ int b = numOps;
+ int cmp = -1;
+@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
+ GBool stroke, GBool eoFill) {
+ GfxShading *shading;
+ GfxPath *savedPath;
+- double *ctm, *btm, *ptm;
++ const double *ctm, *btm, *ptm;
+ double m[6], ictm[6], m1[6];
+ double xMin, yMin, xMax, yMax;
+ double det;
+@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
+ GfxColor color0M, color1M, colorM0, colorM1, colorMM;
+ GfxColor colors2[4];
+ double functionColorDelta = colorDeltas[pdfFunctionShading-1];
+- double *matrix;
++ const double *matrix;
+ double xM, yM;
+ int nComps, i, j;
+
+@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
+ }
+ }
+
+-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
+ GfxPatch patch00 = blankPatch();
+ GfxPatch patch01 = blankPatch();
+ GfxPatch patch10 = blankPatch();
+@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
+ double x, y, dx, dy, tdx, tdy;
+ double originX, originY, tOriginX, tOriginY;
+ double oldCTM[6], newCTM[6];
+- double *mat;
++ const double *mat;
+ Object charProc;
+ Dict *resDict;
+ Parser *oldParser;
+@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
+ Stream *PdfParser::buildImageStream() {
+ Object dict;
+ Object obj;
+- char *key;
+ Stream *str;
+
+ // build dictionary
+@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
+ obj.free();
+ #endif
+ } else {
+- key = copyString(obj.getName());
+-#if defined(POPPLER_NEW_OBJECT_API)
+- obj = parser->getObj();
+-#else
+- obj.free();
+- parser->getObj(&obj);
+-#endif
+- if (obj.isEOF() || obj.isError()) {
+- gfree(key);
++ Object obj2;
++ _POPPLER_CALL(obj2, parser->getObj);
++ if (obj2.isEOF() || obj2.isError()) {
++ _POPPLER_FREE(obj);
+ break;
+ }
+-#if defined(POPPLER_NEW_OBJECT_API)
+- dict.dictAdd(key, std::move(obj));
++ _POPPLER_DICTADD(dict, obj.getName(), obj2);
++ _POPPLER_FREE(obj);
++ _POPPLER_FREE(obj2);
+ }
+- obj = parser->getObj();
+-#else
+- dict.dictAdd(key, &obj);
+- }
+- parser->getObj(&obj);
+-#endif
++ _POPPLER_CALL(obj, parser->getObj);
+ }
+ if (obj.isEOF()) {
+ error(errSyntaxError, getPos(), "End of file in inline image");
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index ed28274f42..0a04c81d46 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.h
++++ b/src/extension/internal/pdfinput/pdf-parser.h
+@@ -9,6 +9,7 @@
+ #define PDF_PARSER_H
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ #ifdef USE_GCC_PRAGMAS
+ #pragma interface
+@@ -128,11 +129,14 @@ public:
+
+ // Constructor for regular output.
+ PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
+- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
++ Dict *resDict,
++ _POPPLER_CONST PDFRectangle *box,
++ _POPPLER_CONST PDFRectangle *cropBox);
+
+ // Constructor for a sub-page object.
+ PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
+- Dict *resDict, PDFRectangle *box);
++ Dict *resDict,
++ _POPPLER_CONST PDFRectangle *box);
+
+ virtual ~PdfParser();
+
+@@ -186,7 +190,7 @@ private:
+
+ void go(GBool topLevel);
+ void execOp(Object *cmd, Object args[], int numArgs);
+- PdfOperator *findOp(char *name);
++ PdfOperator *findOp(const char *name);
+ GBool checkArg(Object *arg, TchkType type);
+ int getPos();
+
+@@ -257,7 +261,7 @@ private:
+ double x2, double y2, GfxColor *color2,
+ int nComps, int depth);
+ void doPatchMeshShFill(GfxPatchMeshShading *shading);
+- void fillPatch(GfxPatch *patch, int nComps, int depth);
++ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
+ void doEndPath();
+
+ // path clipping operators
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+new file mode 100644
+index 0000000000..898e64bf2b
+--- /dev/null
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -0,0 +1,39 @@
++#ifndef SEEN_POPPLER_TRANSITION_API_H
++#define SEEN_POPPLER_TRANSITION_API_H
++
++#include <glib/poppler-features.h>
++
++#if POPPLER_CHECK_VERSION(0,70,0)
++#define _POPPLER_CONST const
++#else
++#define _POPPLER_CONST
++#endif
++
++#if POPPLER_CHECK_VERSION(0,69,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
++#elif POPPLER_CHECK_VERSION(0,58,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
++#else
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
++#endif
++
++#if POPPLER_CHECK_VERSION(0,58,0)
++#define POPPLER_NEW_OBJECT_API
++#define _POPPLER_FREE(obj)
++#define _POPPLER_CALL(ret, func) (ret = func())
++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
++#else
++#define _POPPLER_FREE(obj) (obj).free()
++#define _POPPLER_CALL(ret, func) (*func(&ret))
++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 29, 0)
++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 25, 0)
++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
++#endif
++
++#endif
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 767c8af4d4..d449d1af52 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
+ if ( pattern != NULL ) {
+ if ( pattern->getType() == 2 ) { // Shading pattern
+ GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
+- double *ptm;
++ const double *ptm;
+ double m[6] = {1, 0, 0, 1, 0, 0};
+ double det;
+
+@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+
+ Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
+ // Set pattern transform matrix
+- double *p2u = tiling_pattern->getMatrix();
++ const double *p2u = tiling_pattern->getMatrix();
+ double m[6] = {1, 0, 0, 1, 0, 0};
+ double det;
+ det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908
+@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+ pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
+ // Set pattern tiling
+ // FIXME: don't ignore XStep and YStep
+- double *bbox = tiling_pattern->getBBox();
++ const double *bbox = tiling_pattern->getBBox();
+ sp_repr_set_svg_double(pattern_node, "x", 0.0);
+ sp_repr_set_svg_double(pattern_node, "y", 0.0);
+ sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
+@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+ */
+ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
+ Inkscape::XML::Node *gradient;
+- Function *func;
++ _POPPLER_CONST Function *func;
+ int num_funcs;
+ bool extend0, extend1;
+
+@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
+
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+- Function *func) {
++ _POPPLER_CONST Function *func) {
+ int type = func->getType();
+ if ( type == 0 || type == 2 ) { // Sampled or exponential function
+ GfxRGB stop1, stop2;
+@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ _addStopToGradient(gradient, 1.0, &stop2, 1.0);
+ }
+ } else if ( type == 3 ) { // Stitching
+- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
+- double *bounds = stitchingFunc->getBounds();
+- double *encode = stitchingFunc->getEncode();
++ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
++ const double *bounds = stitchingFunc->getBounds();
++ const double *encode = stitchingFunc->getEncode();
+ int num_funcs = stitchingFunc->getNumFuncs();
+
+ // Add stops from all the stitched functions
+@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ svgGetShadingColorRGB(shading, bounds[i + 1], &color);
+ // Add stops
+ if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
+- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
++ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+ if (expE > 1.0) {
+ expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
+ if (encode[2*i] == 0) { // normal sequence
+@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ Inkscape::CSSOStringStream os_font_size;
+ double css_font_size = _font_scaling * state->getFontSize();
+ if ( font->getType() == fontType3 ) {
+- double *font_matrix = font->getFontMatrix();
++ const double *font_matrix = font->getFontMatrix();
+ if ( font_matrix[0] != 0.0 ) {
+ css_font_size *= font_matrix[3] / font_matrix[0];
+ }
+@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
+ void SvgBuilder::updateTextMatrix(GfxState *state) {
+ _flushText();
+ // Update text matrix
+- double *text_matrix = state->getTextMat();
++ const double *text_matrix = state->getTextMat();
+ double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
+ double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
+ double max_scale;
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index 55daacee74..34b42e17b8 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -15,6 +15,7 @@
+ #endif
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ class SPDocument;
+ namespace Inkscape {
+@@ -174,7 +175,7 @@ private:
+ void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
+ GfxRGB *color, double opacity);
+ bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+- Function *func);
++ _POPPLER_CONST Function *func);
+ gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
+ bool is_stroke=false);
+ // Image/mask creation
+--
+2.19.1
+
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
new file mode 100644
index 00000000000..fe6ee81260c
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
@@ -0,0 +1,31 @@
+From 493aa253fe5c5b1879c0aa26bdad0aa84ba5d6db Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 7 Nov 2018 16:36:22 +0100
+Subject: [PATCH] Fix build with poppler-0.71.0
+
+Fix blatantly backported from
+https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
+---
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 6ed911b04b..4437052593 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -3,6 +3,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(0,71,0)
++typedef bool GBool;
++#define gTrue true
++#define gFalse false
++#endif
++
+ #if POPPLER_CHECK_VERSION(0,70,0)
+ #define _POPPLER_CONST const
+ #else
+--
+2.19.1
+
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index c022c704d3a..bc4433cc996 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -101,6 +101,8 @@ PATCHES=(
"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
"${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
"${FILESDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
+ "${FILESDIR}/${PN}-0.92.3-poppler-0.69.patch"
+ "${FILESDIR}/${PN}-0.92.3-poppler-0.71.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2018-05-25 9:35 Lars Wendler
0 siblings, 0 replies; 21+ messages in thread
From: Lars Wendler @ 2018-05-25 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 71d24a3fbd8beda6755d42591454ba29221f29f0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 09:33:55 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 25 09:35:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d24a3f
media-gfx/inkscape: Fixed build against ~app-text/poppler-0.65.0
Bug: https://bugs.gentoo.org/656266
Package-Manager: Portage-2.3.39, Repoman-2.3.9
.../files/inkscape-0.92.3-poppler-0.65.patch | 29 ++++++++++++++++++++++
media-gfx/inkscape/inkscape-0.92.3.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
new file mode 100644
index 00000000000..86d9e48396d
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
@@ -0,0 +1,29 @@
+From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 25 May 2018 00:30:17 +0200
+Subject: [PATCH] Fix compilation with poppler 0.65.0
+
+replace unused includes with one that is actually used
+
+Signed-off-by: Jan Palus <atler@pld-linux.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 6c498f9..caaeca1 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -37,8 +37,7 @@ extern "C" {
+ #include "util/units.h"
+
+ #include "goo/gmem.h"
+-#include "goo/GooTimer.h"
+-#include "goo/GooHash.h"
++#include "goo/GooString.h"
+ #include "GlobalParams.h"
+ #include "CharTypes.h"
+ #include "Object.h"
+--
+2.17.0
+
diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
index 97020416d36..89ad5363774 100644
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.48.4-epython.patch"
"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
+ "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2018-03-31 5:12 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2018-03-31 5:12 UTC (permalink / raw
To: gentoo-commits
commit: 07a4b2a3a4db18a38a7f73ac2177b9c4171fb9ec
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 05:10:22 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 05:11:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a4b2a3
media-gfx/inkscape: remove old
media-gfx/inkscape/Manifest | 2 -
.../files/inkscape-0.91-fix-gtkmm-2.48.patch | 63 --------
.../files/inkscape-0.91_pre3-automagic.patch | 154 ------------------
.../files/inkscape-0.91_pre3-desktop.patch | 20 ---
media-gfx/inkscape/inkscape-0.91-r3.ebuild | 176 --------------------
media-gfx/inkscape/inkscape-0.91-r4.ebuild | 179 ---------------------
media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 173 --------------------
7 files changed, 767 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index f44a0ae2f97..00b2e31f116 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,3 @@
-DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650d980ef455106d40ae17555d4792a532df493dab23dad2d3c7cdcc68f59391228bae76ebd30f03cf66cbb4fd0ae65 SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
-DIST inkscape-0.92.1.tar.bz2 31222684 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0
DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
diff --git a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch b/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch
deleted file mode 100644
index f9c06601e83..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000
-+++ b/src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000
-@@ -146,8 +146,6 @@
- void _setClipboardColor(guint32);
- void _userWarn(SPDesktop *, char const *);
-
-- void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
--
- // private properites
- SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
- Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
-@@ -1302,9 +1300,7 @@
- */
- Glib::ustring ClipboardManagerImpl::_getBestTarget()
- {
-- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
-- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
-- _inkscape_wait_for_targets(targets);
-+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
-
- // clipboard target debugging snippet
- /*
-@@ -1456,39 +1452,6 @@
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
- }
-
--
--// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
--//
--// https://bugs.launchpad.net/inkscape/+bug/296778
--// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
--//
--// for details. Until this has been fixed upstream we will use our own implementation
--// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
--void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
--{
-- //Get a newly-allocated array of atoms:
-- GdkAtom* targets = NULL;
-- gint n_targets = 0;
-- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
-- if (!test || (targets == NULL)) {
-- return;
-- }
--
-- //Add the targets to the C++ container:
-- for (int i = 0; i < n_targets; i++)
-- {
-- //Convert the atom to a string:
-- gchar* const atom_name = gdk_atom_name(targets[i]);
--
-- Glib::ustring target;
-- if (atom_name) {
-- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-- }
--
-- listTargets.push_back(target);
-- }
--}
--
- /* #######################################
- ClipboardManager class
- ####################################### */
-
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
deleted file mode 100644
index e29b7e9f787..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Respect configure option for openmp and add configure options for aspell,
-gtkspell, imagemagick, jpeg, and exif.
-
---- inkscape-0.91pre3/configure.ac
-+++ inkscape-0.91pre3/configure.ac
-@@ -233,19 +233,28 @@
- dnl Check for OpenMP
- dnl ******************************
- AC_OPENMP
--if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
-- openmp_ok=yes
-- dnl We have it, now set up the flags
-- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+openmp_ok="no"
-+if test "x$enable_openmp" = "xyes"; then
-+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
-+ openmp_ok=yes
-+ dnl We have it, now set up the flags
-+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+ fi
- fi
-
- dnl ******************************
- dnl Check for libexif
- dnl ******************************
--PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
--if test "x$exif_ok" = "xyes"; then
-- AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+AC_ARG_ENABLE(exif,
-+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]),
-+ enable_exif=$enableval,enable_exif=no)
-+
-+if test "x$enable_exif" = "xyes"; then
-+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
-+ if test "x$exif_ok" = "xyes"; then
-+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+ fi
- fi
- AC_SUBST(EXIF_LIBS)
- AC_SUBST(EXIF_CFLAGS)
-@@ -253,10 +262,16 @@
- dnl ******************************
- dnl Check for libjpeg
- dnl ******************************
--AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
--if test "x$jpeg_ok" = "xyes"; then
-- LIBS="-ljpeg $LIBS"
-- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+AC_ARG_ENABLE(jpeg,
-+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]),
-+ enable_jpeg=$enableval,enable_jpeg=no)
-+
-+if test "x$enable_jpeg" = "xyes"; then
-+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
-+ if test "x$jpeg_ok" = "xyes"; then
-+ LIBS="-ljpeg $LIBS"
-+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+ fi
- fi
-
- dnl This check is to get a FIONREAD definition on Solaris 8
-@@ -675,9 +690,16 @@
- dnl Check for ImageMagick Magick++
- dnl ******************************
-
--PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
--if test "x$magick_ok" = "xyes"; then
-- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
-+AC_ARG_ENABLE(magick,
-+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]),
-+ enable_magick=$enableval,enable_magick=no)
-+
-+magick_ok="no"
-+if test "x$enable_magick" = "xyes"; then
-+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
-+ if test "x$magick_ok" = "xyes"; then
-+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
-+ fi
- fi
- AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
-
-@@ -712,6 +734,10 @@
- AC_DEFINE(WITH_GLIBMM_2_32,1,[Build with Glibmm 2.32 or higher])
- fi
-
-+
-+AC_ARG_WITH([gtkspell],
-+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
-+
- dnl *********************************
- dnl Allow experimental GTK+3 build
- dnl *********************************
-@@ -723,11 +749,13 @@
- if test "x$enable_gtk3" = "xyes"; then
-
- ink_spell_pkg=
-- if pkg-config --exists gtkspell-3.0; then
-- ink_spell_pkg=gtkspell-3.0
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ if test "x$with_gtkspell" = "xyes"; then
-+ if pkg-config --exists gtkspell-3.0; then
-+ ink_spell_pkg=gtkspell-3.0
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ fi
- fi
--
-+
- PKG_CHECK_MODULES(GTK,
- gtkmm-3.0 >= 3.2
- gdkmm-3.0 >= 3.2
-@@ -800,11 +828,13 @@
- else
-
- ink_spell_pkg=
-- if pkg-config --exists gtkspell-2.0; then
-- ink_spell_pkg=gtkspell-2.0
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ if test "x$with_gtkspell" = "xyes"; then
-+ if pkg-config --exists gtkspell-2.0; then
-+ ink_spell_pkg=gtkspell-2.0
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ fi
- fi
--
-+
- PKG_CHECK_MODULES(GTK,
- gtk+-2.0 >= 2.24
- $ink_spell_pkg
-@@ -928,12 +958,17 @@
- dnl **************************
- dnl Check for aspell
- dnl ******************************
--AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
--if test "x$aspell_ok" = "xyes"; then
-- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
-- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
--else
-- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
-+AC_ARG_WITH([aspell],
-+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes])
-+
-+if test "x$with_aspell" = "xyes"; then
-+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
-+ if test "x$aspell_ok" = "xyes"; then
-+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
-+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
-+ else
-+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
-+ fi
- fi
-
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
deleted file mode 100644
index f02fa1a8aca..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- inkscape-0.91pre3/inkscape.desktop.in
-+++ inkscape-0.91pre3/inkscape.desktop.in
-@@ -5,7 +5,7 @@
- _X-GNOME-FullName=Inkscape Vector Graphics Editor
- _Comment=Create and edit Scalable Vector Graphics images
- Type=Application
--Categories=Graphics;VectorGraphics;GTK;
-+Categories=Graphics;2DGraphics;VectorGraphics;GTK;
- MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
- Exec=inkscape %F
- TryExec=inkscape
-@@ -14,7 +14,7 @@
- Icon=inkscape
- X-Ayatana-Desktop-Shortcuts=Drawing
-
--[Drawing Shortcut Group]
-+[X-Drawing Shortcut Group]
- _Name=New Drawing
- Exec=inkscape
- TargetEnvironment=Unity
diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
deleted file mode 100644
index e66661ffc32..00000000000
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
- || (
- ( app-text/libwpg:0.3 dev-libs/librevenge )
- ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
- )
-"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- >=app-text/poppler-0.26.0:=[cairo]
- >=dev-cpp/glibmm-2.48
- >=dev-cpp/gtkmm-2.18.0:2.4
- >=dev-cpp/cairomm-1.9.8
- >=dev-libs/boehm-gc-7.1:=
- >=dev-libs/glib-2.28
- >=dev-libs/libsigc++-2.0.12
- >=dev-libs/libxml2-2.6.20
- >=dev-libs/libxslt-1.0.15
- dev-libs/popt
- dev-python/lxml[${PYTHON_USEDEP}]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/gtk+-2.10.7:2
- >=x11-libs/pango-1.24
- cdr? (
- media-libs/libcdr
- ${WPG_DEPS}
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- gnome? ( >=gnome-base/gnome-vfs-2.0 )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:2
- )
- visio? (
- media-libs/libvisio
- ${WPG_DEPS}
- )
- wpg? ( ${WPG_DEPS} )
-"
-
-# 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}
- dev-python/numpy[${PYTHON_USEDEP}]
- media-gfx/uniconvertor
- dia? ( app-office/dia )
- latex? (
- media-gfx/pstoedit[plotutils]
- app-text/dvipsk
- app-text/texlive-core
- )
- postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.36
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
- "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
- "${FILESDIR}/${PN}-0.91_pre3-desktop.patch"
- "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
- "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
- "${FILESDIR}/${PN}-0.48.4-epython.patch"
- "${FILESDIR}/${PN}-0.91-fix-gtkmm-2.48.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i "s#@EPYTHON@#${EPYTHON}#" \
- src/extension/implementation/script.cpp || die
-
- eautoreconf
-
- # bug 421111
- python_fix_shebang share/extensions
-}
-
-src_configure() {
- # aliasing unsafe wrt #310393
- append-flags -fno-strict-aliasing
- # enable c++11 as needed for sigc++-2.6, #566318
- # remove it when upstream solves the issue
- # https://bugs.launchpad.net/inkscape/+bug/1488079
- append-cxxflags -std=c++11
-
- econf \
- $(use_enable static-libs static) \
- $(use_enable nls) \
- $(use_enable openmp) \
- $(use_enable exif) \
- $(use_enable jpeg) \
- $(use_enable lcms) \
- --enable-poppler-cairo \
- $(use_enable wpg) \
- $(use_enable visio) \
- $(use_enable cdr) \
- $(use_enable dbus dbusapi) \
- $(use_enable imagemagick magick) \
- $(use_with gnome gnome-vfs) \
- $(use_with inkjar) \
- $(use_with spell gtkspell) \
- $(use_with spell aspell)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
deleted file mode 100644
index 26296f1bf53..00000000000
--- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- >=app-text/poppler-0.26.0:=[cairo]
- >=dev-cpp/glibmm-2.48
- >=dev-cpp/gtkmm-2.18.0:2.4
- >=dev-cpp/cairomm-1.9.8
- >=dev-libs/boehm-gc-7.1:=
- >=dev-libs/glib-2.28
- >=dev-libs/libsigc++-2.0.12
- >=dev-libs/libxml2-2.6.20
- >=dev-libs/libxslt-1.0.15
- dev-libs/popt
- dev-python/lxml[${PYTHON_USEDEP}]
- media-gfx/potrace
- media-gfx/scour[${PYTHON_USEDEP}]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/gtk+-2.10.7:2
- >=x11-libs/pango-1.24
- cdr? (
- media-libs/libcdr
- app-text/libwpg:0.3
- dev-libs/librevenge
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- gnome? ( >=gnome-base/gnome-vfs-2.0 )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:2
- )
- visio? (
- media-libs/libvisio
- app-text/libwpg:0.3
- dev-libs/librevenge
- )
- 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}
- dev-python/numpy[${PYTHON_USEDEP}]
- media-gfx/uniconvertor
- dia? ( app-office/dia )
- latex? (
- media-gfx/pstoedit[plotutils]
- app-text/dvipsk
- app-text/texlive-core
- )
- postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.36
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
- "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
- "${FILESDIR}/${PN}-0.91_pre3-desktop.patch"
- "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
- "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
- "${FILESDIR}/${PN}-0.48.4-epython.patch"
- "${FILESDIR}/${PN}-0.91-fix-gtkmm-2.48.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i "s#@EPYTHON@#${EPYTHON}#" \
- src/extension/implementation/script.cpp || die
-
- eautoreconf
-
- # bug 421111
- python_fix_shebang share/extensions
-}
-
-src_configure() {
- # aliasing unsafe wrt #310393
- append-flags -fno-strict-aliasing
- # enable c++11 as needed for sigc++-2.6, #566318
- # remove it when upstream solves the issue
- # https://bugs.launchpad.net/inkscape/+bug/1488079
- append-cxxflags -std=c++11
-
- econf \
- $(use_enable static-libs static) \
- $(use_enable nls) \
- $(use_enable openmp) \
- $(use_enable exif) \
- $(use_enable jpeg) \
- $(use_enable lcms) \
- --enable-poppler-cairo \
- $(use_enable wpg) \
- $(use_enable visio) \
- $(use_enable cdr) \
- $(use_enable dbus dbusapi) \
- $(use_enable imagemagick magick) \
- $(use_with gnome gnome-vfs) \
- $(use_with inkjar) \
- $(use_with spell gtkspell) \
- $(use_with spell aspell)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
deleted file mode 100644
index 3a632ccb1ac..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
- || (
- ( app-text/libwpg:0.3 dev-libs/librevenge )
- ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
- )
-"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- >=app-text/poppler-0.26.0:=[cairo]
- >=dev-cpp/glibmm-2.48
- >=dev-cpp/gtkmm-2.18.0:2.4
- >=dev-cpp/cairomm-1.9.8
- >=dev-libs/boehm-gc-7.1:=
- >=dev-libs/glib-2.28
- >=dev-libs/libsigc++-2.0.12
- >=dev-libs/libxml2-2.6.20
- >=dev-libs/libxslt-1.0.15
- dev-libs/popt
- dev-python/lxml[${PYTHON_USEDEP}]
- media-gfx/potrace
- media-gfx/scour[${PYTHON_USEDEP}]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/gtk+-2.10.7:2
- >=x11-libs/pango-1.24
- cdr? (
- media-libs/libcdr
- ${WPG_DEPS}
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- gnome? ( >=gnome-base/gnome-vfs-2.0 )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:2
- )
- visio? (
- media-libs/libvisio
- ${WPG_DEPS}
- )
- wpg? ( ${WPG_DEPS} )
-"
-
-# 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}
- dev-python/numpy[${PYTHON_USEDEP}]
- media-gfx/uniconvertor
- dia? ( app-office/dia )
- latex? (
- media-gfx/pstoedit[plotutils]
- app-text/dvipsk
- app-text/texlive-core
- )
- postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.36
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.92.1-automagic.patch"
- "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
- "${FILESDIR}/${PN}-0.92.1-desktop.patch"
- "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
- "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
- "${FILESDIR}/${PN}-0.48.4-epython.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i "s#@EPYTHON@#${EPYTHON}#" \
- src/extension/implementation/script.cpp || die
-
- eautoreconf
-
- # bug 421111
- python_fix_shebang share/extensions
-}
-
-src_configure() {
- # aliasing unsafe wrt #310393
- append-flags -fno-strict-aliasing
-
- econf \
- $(use_enable static-libs static) \
- $(use_enable nls) \
- $(use_enable openmp) \
- $(use_enable exif) \
- $(use_enable jpeg) \
- $(use_enable lcms) \
- --enable-poppler-cairo \
- $(use_enable wpg) \
- $(use_enable visio) \
- $(use_enable cdr) \
- $(use_enable dbus dbusapi) \
- $(use_enable imagemagick magick) \
- $(use_with gnome gnome-vfs) \
- $(use_with inkjar) \
- $(use_with spell gtkspell) \
- $(use_with spell aspell)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
@ 2017-05-12 19:41 Andreas Hüttel
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Hüttel @ 2017-05-12 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 026776c9488a9cd15f24e66e38efa3ea4df156fe
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 19:11:04 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 12 19:11:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026776c9
media-gfx/inkscape: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/inkscape/Manifest | 1 -
.../inkscape/files/inkscape-0.48.0-spell.patch | 45 --------
.../inkscape/files/inkscape-0.48.2-libwpg.patch | 25 -----
.../inkscape/files/inkscape-0.48.3.1-desktop.patch | 11 --
.../files/inkscape-0.48.4-automake-1.13.patch | 21 ----
.../files/inkscape-0.48.4-gc74-configure.patch | 15 ---
.../files/inkscape-0.48.4-poppler-0.29.0.patch | 98 -----------------
media-gfx/inkscape/inkscape-0.48.5-r1.ebuild | 119 ---------------------
8 files changed, 335 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 8712c76e8bc..a2881475517 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284
DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch
deleted file mode 100644
index 946222276b7..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- inkscape-0.48.0/configure.ac.orig 2010-10-26 21:22:06.000000000 +0200
-+++ inkscape-0.48.0/configure.ac 2010-10-26 21:33:39.000000000 +0200
-@@ -433,10 +433,15 @@
- fi
- AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes")
-
-+AC_ARG_WITH([gtkspell],
-+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
-+
- ink_spell_pkg=
--if pkg-config --exists gtkspell-2.0; then
-- ink_spell_pkg=gtkspell-2.0
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+if test "x$with_gtkspell" = "xyes"; then
-+ if pkg-config --exists gtkspell-2.0; then
-+ ink_spell_pkg=gtkspell-2.0
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ fi
- fi
-
- dnl ******************************
-@@ -758,12 +763,17 @@
- dnl **************************
- dnl Check for aspell
- dnl ******************************
--AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
--if test "x$aspell_ok" = "xyes"; then
-- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
-- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
--else
-- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
-+AC_ARG_WITH([aspell],
-+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes])
-+
-+if test "x$with_aspell" = "xyes"; then
-+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
-+ if test "x$aspell_ok" = "xyes"; then
-+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
-+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
-+ else
-+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
-+ fi
- fi
-
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
diff --git a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
deleted file mode 100644
index 998ce41ab3a..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- inkscape-0.48.2/configure.ac.orig
-+++ inkscape-0.48.2/configure.ac
-@@ -713,14 +713,14 @@
-
- with_libwpg=no
-
--PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
--if test "x$with_libwpg01" = "xyes"; then
-- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
-- with_libwpg=yes
-- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
-- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
--fi
--AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
-+#PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
-+#if test "x$with_libwpg01" = "xyes"; then
-+# AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
-+# with_libwpg=yes
-+# AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
-+# AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
-+#fi
-+#AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
-
- PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
- if test "x$with_libwpg02" = "xyes"; then
diff --git a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
deleted file mode 100644
index ea5f214cafc..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.48.3.1/inkscape.desktop.in
-+++ inkscape-0.48.3.1/inkscape.desktop.in
-@@ -5,7 +5,7 @@
- _X-GNOME-FullName=Inkscape Vector Graphics Editor
- _Comment=Create and edit Scalable Vector Graphics images
- Type=Application
--Categories=Graphics;VectorGraphics;GTK;
-+Categories=Graphics;2DGraphics;VectorGraphics;GTK;
- MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
- Exec=inkscape %F
- TryExec=inkscape
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch
deleted file mode 100644
index 6d649da99de..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Apr 25 15:06:01 UTC 2013
-Subject: fix building with automake-1.3
-
---- inkscape-0.48.4/configure.ac
-+++ inkscape-0.48.4/configure.ac
-@@ -21,12 +21,12 @@
- export CC CXX
- ])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_LANG(C++)
- AC_ISC_POSIX
- AC_PROG_CXX
--AM_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_AS
- AC_PROG_RANLIB
- AC_PROG_INTLTOOL(0.22)
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
deleted file mode 100644
index 3ef7ce2c98b..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- inkscape-0.48.4/configure.ac 2013-12-31 00:38:18.592732496 +0400
-+++ inkscape-0.48.4/configure.ac 2013-12-31 00:39:13.558730872 +0400
-@@ -263,7 +263,11 @@
- # include <gc.h>
- #endif
- #include <stdio.h>
-- extern unsigned GC_version;
-+ #if (GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 4)
-+ unsigned GC_version = GC_get_version();
-+ #else
-+ extern unsigned GC_version;
-+ #endif
- int main(void){
- unsigned min = ((6 << 16) | (4 << 8) | 0);
- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF);
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
deleted file mode 100644
index bcfea9b77ad..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
- configure.ac | 5 ++++
- src/extension/internal/pdfinput/pdf-parser.cpp | 32 +++++++++++++++++++++-----
- 2 files changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8e1ae2..d62c989 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then
- AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
- fi
-
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor="no"
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index b6edbfb..3fbf237 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object args[], int numArgs) {
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-@@ -1085,7 +1087,13 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) {
-
- state->setFillPattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -1126,7 +1134,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) {
-
- state->setStrokePattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -2756,7 +2770,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
- }
- }
- if (!obj1.isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- colorSpace = GfxColorSpace::parse(&obj1, NULL);
-@@ -2847,7 +2863,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
- obj2.free();
- }
- }
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) {
- if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
diff --git a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
deleted file mode 100644
index 9acd1850da3..00000000000
--- a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-GCONF_DEBUG=no
-
-inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome postscript inkjar lcms nls spell wmf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-text/libwpd:0.9
- app-text/libwpg:0.2
- >=app-text/poppler-0.12.3-r3:=[cairo,xpdf-headers(+)]
- dev-cpp/glibmm
- >=dev-cpp/gtkmm-2.18.0:2.4
- >=dev-libs/boehm-gc-6.4
- >=dev-libs/glib-2.6.5
- >=dev-libs/libsigc++-2.0.12
- >=dev-libs/libxml2-2.6.20
- >=dev-libs/libxslt-1.0.15
- dev-libs/popt
- dev-python/lxml[${PYTHON_USEDEP}]
- media-gfx/imagemagick[cxx]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/gtk+-2.10.7:2
- >=x11-libs/pango-1.4.0
- gnome? ( >=gnome-base/gnome-vfs-2.0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:2
- )"
-
-# 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}
- dev-python/numpy[${PYTHON_USEDEP}]
- media-gfx/uniconvertor
- dia? ( app-office/dia )
- postscript? ( app-text/ghostscript-gpl )
- wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- >=dev-util/intltool-0.29
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-src_prepare() {
- gnome2_src_prepare
- epatch \
- "${FILESDIR}"/${PN}-0.48.0-spell.patch \
- "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
- "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
- "${FILESDIR}"/${PN}-0.48.4-epython.patch \
- "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
- "${FILESDIR}"/${PN}-0.48.4-gc74-configure.patch \
- "${FILESDIR}"/${PN}-0.48.4-poppler-0.29.0.patch
-
- sed -i \
- -e "s#@EPYTHON@#${EPYTHON}#" \
- src/extension/implementation/script.cpp || die
-
- eautoreconf
-
- # bug 421111
- python_fix_shebang share/extensions
-}
-
-src_configure() {
- G2CONF="${G2CONF}
- --without-perl
- --enable-poppler-cairo
- $(use_with gnome gnome-vfs)
- $(use_with inkjar)
- $(use_enable lcms)
- $(use_enable nls)
- $(use_with spell aspell)
- $(use_with spell gtkspell)"
-
- # aliasing unsafe wrt #310393
- append-flags -fno-strict-aliasing
- gnome2_src_configure
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- gnome2_src_install
- python_optimize "${ED}"/usr/share/${PN}/extensions
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2024-10-17 7:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-04 22:18 [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-10-17 7:08 Sam James
2024-04-05 15:02 Andreas Sturmlechner
2024-01-29 9:37 Sam James
2022-10-22 14:54 Michał Górny
2022-09-03 4:25 Sam James
2022-09-03 1:43 Sam James
2022-05-26 2:47 Sam James
2022-05-08 17:42 Sam James
2021-12-17 14:55 Andreas Sturmlechner
2021-11-06 21:06 Sam James
2021-04-14 19:28 Mikle Kolyada
2020-04-25 13:24 Andreas K. Hüttel
2020-01-06 10:31 Andreas K. Hüttel
2019-12-11 9:20 Miroslav Šulc
2019-11-07 8:11 Lars Wendler
2019-01-11 0:37 Andreas Sturmlechner
2018-11-07 15:48 Lars Wendler
2018-05-25 9:35 Lars Wendler
2018-03-31 5:12 Tim Harder
2017-05-12 19:41 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox