From: atk <atk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
Date: Mon, 07 Jun 2021 09:38:51 +0200 [thread overview]
Message-ID: <20210607073851.KpLbcOEp6hyfkDJ3rrDxUaZZmex3tCagdl_ehuFwcMY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31149@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages inkscape-1.1
https://github.com/void-linux/void-packages/pull/31149
WIP: inkscape: update to 1.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31149.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.1-31149.patch --]
[-- Type: text/x-diff, Size: 4903 bytes --]
From 5f5eb2dbab5ae5610fa03f035df1a521cf407ac4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 27 May 2021 17:09:08 +0200
Subject: [PATCH] inkscape: update to 1.1
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
srcpkgs/inkscape/template | 20 +++---
2 files changed, 11 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
deleted file mode 100644
index b959bcd76fdc..000000000000
--- a/srcpkgs/inkscape/patches/glib-extern-C.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/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 6339519c22f9..6763e853edd3 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,14 +1,14 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.0.2
-revision=3
-wrksrc="inkscape-${version}_2021-01-15_e86c870879"
+version=1.1
+revision=1
+wrksrc="${pkgname}-${version}_2021-05-24_c4e8f9ed74"
build_style=cmake
# builds executables then runs checks
# FIXME: some tests still fail on musl
make_check_target=check
hostmakedepends="automake pkg-config libtool intltool gettext
- glib-devel perl-XML-Parser tar which xz"
+ glib-devel perl-XML-Parser which"
makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
@@ -16,17 +16,16 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
short_desc="Vector-based drawing program"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
-# link from https://inkscape.org/release/all/source/archive/
-distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
-checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
+checksum=71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
python_version=3
patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
+ makedepends+=" libatomic-devel libatomic_ops-devel"
fi
post_patch() {
@@ -35,4 +34,7 @@ post_patch() {
# since inkscape uses NULL instead of nullptr
vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
fi
+ # make test font available under the name it is used with
+ cd testfiles/rendering_tests/fonts/
+ ln -s GeomTest-Regular.otf GeomTest.otf
}
next prev parent reply other threads:[~2021-06-07 7:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 15:09 [PR PATCH] " atk
2021-05-27 17:34 ` Chocimier
2021-05-27 17:35 ` Chocimier
2021-05-31 9:57 ` WIP: " atk
2021-06-01 7:58 ` atk
2021-06-04 10:05 ` atk
2021-06-04 10:55 ` atk
2021-06-04 19:13 ` [PR PATCH] [Updated] " atk
2021-06-04 19:14 ` atk
2021-06-05 7:49 ` [PR REVIEW] " ericonr
2021-06-07 7:38 ` atk [this message]
2021-06-07 7:39 ` [PR PATCH] [Updated] " atk
2021-06-07 7:40 ` atk
2021-06-07 8:36 ` atk
2021-06-07 8:53 ` [PR PATCH] [Updated] " atk
2021-06-07 8:53 ` atk
2021-06-07 8:54 ` atk
2021-06-07 10:36 ` atk
2021-06-07 10:59 ` atk
2021-06-07 11:11 ` [PR PATCH] [Updated] " atk
2021-06-07 11:15 ` [PR REVIEW] " ericonr
2021-06-07 11:18 ` ericonr
2021-06-07 11:20 ` [PR REVIEW] " atk
2021-06-07 11:25 ` [PR PATCH] [Updated] " atk
2021-06-07 11:27 ` [PR REVIEW] " ericonr
2021-06-07 11:28 ` ericonr
2021-06-07 11:29 ` [PR PATCH] [Updated] " atk
2021-06-07 11:34 ` atk
2021-06-07 11:34 ` [PR REVIEW] " atk
2021-06-08 12:03 ` atk
2021-06-08 17:45 ` Chocimier
2021-06-08 17:56 ` Chocimier
2021-06-09 11:23 ` [PR PATCH] [Updated] " atk
2021-06-09 11:44 ` atk
2021-06-10 7:35 ` atk
2021-06-10 9:51 ` atk
2021-06-10 14:43 ` [PR REVIEW] " ericonr
2021-06-10 14:43 ` ericonr
2021-06-12 4:01 ` [PR PATCH] [Closed]: " ericonr
2021-06-12 11:22 ` hervyqa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210607073851.KpLbcOEp6hyfkDJ3rrDxUaZZmex3tCagdl_ehuFwcMY@z \
--to=atk@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).