summaryrefslogtreecommitdiff
path: root/media-gfx/inkscape
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/Manifest6
-rw-r--r--media-gfx/inkscape/files/glib-2.67.3.patch65
-rw-r--r--media-gfx/inkscape/files/missing_atomic_include.patch10
-rw-r--r--media-gfx/inkscape/inkscape-1.0.1-r1.ebuild161
-rw-r--r--media-gfx/inkscape/inkscape-1.0.2-r1.ebuild6
5 files changed, 72 insertions, 176 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3344f3c76232..ed0531c4bfbd 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,5 @@
-AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
-DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
+AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
-EBUILD inkscape-1.0.1-r1.ebuild 4141 BLAKE2B 09e9fd9978b22e2a7fd25562570c37b7283dd53641571a113cb32fad32bd4a4e2a33686d56a7a630895cb728933e9bbd28c0a50b1950a180219d3ae3823443a7 SHA512 70636fd302b86c1da68d240c0febb15720e0ae0f51901fc9189b41d0f35cadae2790c5bfe2d5a221b40d3ecb108419a060a255092cb2280f7128da35f71fc313
-EBUILD inkscape-1.0.2-r1.ebuild 4108 BLAKE2B ac7e2d31b2501d803a0aaa837f9d43781537bc6cb9ac9b6739a0111e51250f199b2a93fc24b5ff0af68c5571ada89799dd50914c5fba7c2d3b7bf63f6a5928db SHA512 9bc3c6556758de0e8d4ba85863f3dd04ca37b73922ee3b1264c57ed9c5214d56887eaa2fa1a3120353c1871db727400cef56c27bc905cd9256e7bff6717d784b
+EBUILD inkscape-1.0.2-r1.ebuild 4150 BLAKE2B 756fec945d62135590e0347adcbb98436159c487134b883ec5316d7140062377e638c3275b092a13baff70a692ed287f1081271163fa39ae5bdb6720dba2526d SHA512 bb997baf9aa3d21325af5be627908d7ff20a019f23fe680954d85e1b48c579c9bb4902f1d5f6de820a6415243e7b4c997f496ca877bacc8bc64debb80a51afee
EBUILD inkscape-9999.ebuild 4062 BLAKE2B 95b6edfd2512eb33365bf8c19968a51f02cea399569caeca8f20bf6a000936fd7c2932e2fe389c05b931084e9133f01ef6cd8a28d6e8cc9137a5538e9254f151 SHA512 f871de44af448c640f208637bb65eba87dfde5d992e1f7886ba54b31e322054f2069d818fb5b6032d4b5a59177ec9e2cf46f0ce964ec90f56d6370146ed55fd0
MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/files/glib-2.67.3.patch b/media-gfx/inkscape/files/glib-2.67.3.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/media-gfx/inkscape/files/glib-2.67.3.patch
@@ -0,0 +1,65 @@
+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/files/missing_atomic_include.patch b/media-gfx/inkscape/files/missing_atomic_include.patch
deleted file mode 100644
index b298550c5c89..000000000000
--- 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 861ac2210cd7..000000000000
--- 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."
-}
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 6e4e248cea3a..d70335ea2fbb 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ 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 ~s390 ~sparc ~x86"
+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"
@@ -100,6 +100,10 @@ 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"