Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] inkscape: update to 1.1
@ 2021-05-27 15:09 atk
  2021-05-27 17:34 ` Chocimier
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: atk @ 2021-05-27 15:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]

There is a new 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

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: 4446 bytes --]

From 5f70a8cb5f0aa1d9d752948d51ef0a0a44bb5098 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                    | 15 +++--
 2 files changed, 7 insertions(+), 73 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..fec4c7617580 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,12 +16,11 @@ 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
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
@ 2021-05-27 17:34 ` Chocimier
  2021-05-27 17:35 ` Chocimier
                   ` (37 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Chocimier @ 2021-05-27 17:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-849813730

Comment:
Cross has to work, try rust build helper.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
  2021-05-27 17:34 ` Chocimier
@ 2021-05-27 17:35 ` Chocimier
  2021-05-31  9:57 ` WIP: " atk
                   ` (36 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Chocimier @ 2021-05-27 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-849813730

Comment:
Cross has to work, ~try rust build helper~.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
  2021-05-27 17:34 ` Chocimier
  2021-05-27 17:35 ` Chocimier
@ 2021-05-31  9:57 ` atk
  2021-06-01  7:58 ` atk
                   ` (35 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-05-31  9:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-851374470

Comment:
The glyph tests are failing due to a font config misconfiguration that stop the arabic/chinese characters to be rendered correctly.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (2 preceding siblings ...)
  2021-05-31  9:57 ` WIP: " atk
@ 2021-06-01  7:58 ` atk
  2021-06-04 10:05 ` atk
                   ` (34 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-01  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-851374470

Comment:
The glyph tests are failing due to a font config misconfiguration that stop the arabic/chinese characters to be rendered correctly. Help would be appreciated.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (3 preceding siblings ...)
  2021-06-01  7:58 ` atk
@ 2021-06-04 10:05 ` atk
  2021-06-04 10:55 ` atk
                   ` (33 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-04 10:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-854550800

Comment:
There seemed to be another issue. An included font was referenced by the wrong name. I'm just trying to run the tests locally again.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (4 preceding siblings ...)
  2021-06-04 10:05 ` atk
@ 2021-06-04 10:55 ` atk
  2021-06-04 19:13 ` [PR PATCH] [Updated] " atk
                   ` (32 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-04 10:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-854550800

Comment:
There seemed to be another issue. An included font was referenced by the wrong name. I'm just trying to run the tests locally again. Update: the asian glyphs seem to be still missing.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (5 preceding siblings ...)
  2021-06-04 10:55 ` atk
@ 2021-06-04 19:13 ` atk
  2021-06-04 19:14 ` atk
                   ` (31 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-04 19:13 UTC (permalink / raw)
  To: ml

[-- 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: 4763 bytes --]

From 7707ee4c9d21a151216d28d7fc71205abf6253f7 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                    | 19 +++---
 2 files changed, 11 insertions(+), 73 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..c9cf5cd85297 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,12 +16,11 @@ 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
 
@@ -35,4 +34,8 @@ 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
+	pushd testfiles/rendering_tests/fonts/
+	ln -s GeomTest-Regular.otf GeomTest.otf
+	popd
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (6 preceding siblings ...)
  2021-06-04 19:13 ` [PR PATCH] [Updated] " atk
@ 2021-06-04 19:14 ` atk
  2021-06-05  7:49 ` [PR REVIEW] " ericonr
                   ` (30 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-04 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-854946856

Comment:
I believe the remaining issues are down to UTF or font misconfiguration. Not sure what it is, but investigation continues.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (7 preceding siblings ...)
  2021-06-04 19:14 ` atk
@ 2021-06-05  7:49 ` ericonr
  2021-06-07  7:38 ` [PR PATCH] [Updated] " atk
                   ` (29 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-05  7:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r645957958

Comment:
Just use `cd`, it should only happen inside the function...

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (8 preceding siblings ...)
  2021-06-05  7:49 ` [PR REVIEW] " ericonr
@ 2021-06-07  7:38 ` atk
  2021-06-07  7:39 ` atk
                   ` (28 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  7:38 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (9 preceding siblings ...)
  2021-06-07  7:38 ` [PR PATCH] [Updated] " atk
@ 2021-06-07  7:39 ` atk
  2021-06-07  7:40 ` atk
                   ` (27 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  7:39 UTC (permalink / raw)
  To: ml

[-- 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 ce6b1c7c0a78cd5f667d7e12e9992e1441b333a1 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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (10 preceding siblings ...)
  2021-06-07  7:39 ` atk
@ 2021-06-07  7:40 ` atk
  2021-06-07  8:36 ` atk
                   ` (26 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  7:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855680023

Comment:
Tried to fix the template and aarch64 issues, having another look at the fonts issue later.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (11 preceding siblings ...)
  2021-06-07  7:40 ` atk
@ 2021-06-07  8:36 ` atk
  2021-06-07  8:53 ` [PR PATCH] [Updated] " atk
                   ` (25 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  8:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855727488

Comment:
I have to admit I'm a bit stumped. I added the dependency of libatomic_ops-devel, which should have resolved the issue, but it did not. Any idea how that could happen?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (12 preceding siblings ...)
  2021-06-07  8:36 ` atk
@ 2021-06-07  8:53 ` atk
  2021-06-07  8:53 ` atk
                   ` (24 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  8:53 UTC (permalink / raw)
  To: ml

[-- 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: 4830 bytes --]

From 7d0b0cc67d4b250db346348d849ffbec767fdd3e 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..50e62403a534 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,26 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-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
 
@@ -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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (13 preceding siblings ...)
  2021-06-07  8:53 ` [PR PATCH] [Updated] " atk
@ 2021-06-07  8:53 ` atk
  2021-06-07  8:54 ` atk
                   ` (23 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  8:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855727488

Comment:
I have to admit I'm a bit stumped. I added the dependency of libatomic_ops-devel, which should have resolved the issue, but it did not. Any idea how that could happen? Ah, XbPW_TARGET_NO_ATOMIC_8 seems to be false in all cases.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (14 preceding siblings ...)
  2021-06-07  8:53 ` atk
@ 2021-06-07  8:54 ` atk
  2021-06-07 10:36 ` atk
                   ` (22 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07  8:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855727488

Comment:
I have to admit I'm a bit stumped. I added the dependency of libatomic_ops-devel, which should have resolved the issue, but it did not. Any idea how that could happen? Ah, XBPS_TARGET_NO_ATOMIC_8 seems to be false in all cases.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (15 preceding siblings ...)
  2021-06-07  8:54 ` atk
@ 2021-06-07 10:36 ` atk
  2021-06-07 10:59 ` atk
                   ` (21 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 10:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855814417

Comment:
Now on to the last font issues. Installing the missing fonts as test dependencies should in theory fix this.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (16 preceding siblings ...)
  2021-06-07 10:36 ` atk
@ 2021-06-07 10:59 ` atk
  2021-06-07 11:11 ` [PR PATCH] [Updated] " atk
                   ` (20 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 10:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855827976

Comment:
That's strange: if I install all the missing fonts and run the tests, they fail locally, yet if I compare the expected output with the actual rendering, it's identical pixel by pixel. Should I simply disable the four failing tests for now?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (17 preceding siblings ...)
  2021-06-07 10:59 ` atk
@ 2021-06-07 11:11 ` atk
  2021-06-07 11:15 ` [PR REVIEW] " ericonr
                   ` (19 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:11 UTC (permalink / raw)
  To: ml

[-- 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: 4941 bytes --]

From 58aaac35e6ba28c556ab516beb7dc15aac66ddd5 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                    | 23 ++++---
 2 files changed, 13 insertions(+), 75 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..57dcdb2a7083 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,27 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
 depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+checkdepends="$depends gtest-devel ImageMagick cantarell-fonts noto-fonts-cjk-20190416_2
+ dejavu-fonts-ttf"
 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
 
@@ -35,4 +35,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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (18 preceding siblings ...)
  2021-06-07 11:11 ` [PR PATCH] [Updated] " atk
@ 2021-06-07 11:15 ` ericonr
  2021-06-07 11:18 ` ericonr
                   ` (18 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-07 11:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r646494652

Comment:
Why are you specifying the version for `noto-fonts-cjk`? That will break whenever it's updated.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (19 preceding siblings ...)
  2021-06-07 11:15 ` [PR REVIEW] " ericonr
@ 2021-06-07 11:18 ` ericonr
  2021-06-07 11:20 ` [PR REVIEW] " atk
                   ` (17 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-07 11:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855839758

Comment:
Please pull in the depends change in #31336

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (20 preceding siblings ...)
  2021-06-07 11:18 ` ericonr
@ 2021-06-07 11:20 ` atk
  2021-06-07 11:25 ` [PR PATCH] [Updated] " atk
                   ` (16 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r646497639

Comment:
I only used the package that I found for the font. Can I use `noto-fonts-cjk` instead?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (21 preceding siblings ...)
  2021-06-07 11:20 ` [PR REVIEW] " atk
@ 2021-06-07 11:25 ` atk
  2021-06-07 11:27 ` [PR REVIEW] " ericonr
                   ` (15 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:25 UTC (permalink / raw)
  To: ml

[-- 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: 5049 bytes --]

From 094a0080266fe42d1576bbdfc6237647ec7c6bba 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                    | 26 ++++----
 2 files changed, 15 insertions(+), 76 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..ba582f796559 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,28 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
+checkdepends="$depends gtest-devel ImageMagick cantarell-fonts noto-fonts-cjk-20190416_2
+ dejavu-fonts-ttf"
 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
 
@@ -35,4 +36,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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (22 preceding siblings ...)
  2021-06-07 11:25 ` [PR PATCH] [Updated] " atk
@ 2021-06-07 11:27 ` ericonr
  2021-06-07 11:28 ` ericonr
                   ` (14 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-07 11:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r646502086

Comment:
Yes.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (23 preceding siblings ...)
  2021-06-07 11:27 ` [PR REVIEW] " ericonr
@ 2021-06-07 11:28 ` ericonr
  2021-06-07 11:29 ` [PR PATCH] [Updated] " atk
                   ` (13 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-07 11:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-855846487

Comment:
Please expand your commit message to explain the pillow change and that the package is being adopted.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (24 preceding siblings ...)
  2021-06-07 11:28 ` ericonr
@ 2021-06-07 11:29 ` atk
  2021-06-07 11:34 ` atk
                   ` (12 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:29 UTC (permalink / raw)
  To: ml

[-- 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: 5154 bytes --]

From 52c9f1b752921bdcaf359c299fd602a2b53b7995 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

- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
  idk, failed.
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
 srcpkgs/inkscape/template                    | 26 ++++----
 2 files changed, 15 insertions(+), 76 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..ba582f796559 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,28 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
+checkdepends="$depends gtest-devel ImageMagick cantarell-fonts noto-fonts-cjk-20190416_2
+ dejavu-fonts-ttf"
 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
 
@@ -35,4 +36,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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (25 preceding siblings ...)
  2021-06-07 11:29 ` [PR PATCH] [Updated] " atk
@ 2021-06-07 11:34 ` atk
  2021-06-07 11:34 ` [PR REVIEW] " atk
                   ` (11 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:34 UTC (permalink / raw)
  To: ml

[-- 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: 5143 bytes --]

From d86cc9b5a317017661c59115efa75aa357ee1773 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

- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
  idk, failed.
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
 srcpkgs/inkscape/template                    | 26 ++++----
 2 files changed, 15 insertions(+), 76 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..99a878c64e9d 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,28 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
+checkdepends="$depends gtest-devel ImageMagick cantarell-fonts noto-fonts-cjk
+ dejavu-fonts-ttf"
 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
 
@@ -35,4 +36,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
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (26 preceding siblings ...)
  2021-06-07 11:34 ` atk
@ 2021-06-07 11:34 ` atk
  2021-06-08 12:03 ` atk
                   ` (10 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-07 11:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r646506470

Comment:
ah, that works. Thanks!

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (27 preceding siblings ...)
  2021-06-07 11:34 ` [PR REVIEW] " atk
@ 2021-06-08 12:03 ` atk
  2021-06-08 17:45 ` Chocimier
                   ` (9 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-08 12:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-856704663

Comment:
I haven't found a way to make those tests pass yet. Should I keep searching or merely disable them? I tested the glyph rendering manually; apart from missing fonts, I could not find any issues.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (28 preceding siblings ...)
  2021-06-08 12:03 ` atk
@ 2021-06-08 17:45 ` Chocimier
  2021-06-08 17:56 ` Chocimier
                   ` (8 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Chocimier @ 2021-06-08 17:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-856967578

Comment:
There _are_ differences in kerning in test 299, maybe due to dependencies version. Disabling those test with comment seems fine.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (29 preceding siblings ...)
  2021-06-08 17:45 ` Chocimier
@ 2021-06-08 17:56 ` Chocimier
  2021-06-09 11:23 ` [PR PATCH] [Updated] " atk
                   ` (7 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Chocimier @ 2021-06-08 17:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-856967578

Comment:
There _are_ differences in hinting in test 299, maybe due to dependencies version. Disabling those test with comment seems fine.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (30 preceding siblings ...)
  2021-06-08 17:56 ` Chocimier
@ 2021-06-09 11:23 ` atk
  2021-06-09 11:44 ` atk
                   ` (6 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-09 11:23 UTC (permalink / raw)
  To: ml

[-- 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: 5199 bytes --]

From c27e9a8ff25db335481428ef1052fada51ca9ee5 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

- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
  idk, failed.
- skip glyph tests that fail due to hinting issues
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
 srcpkgs/inkscape/template                    | 24 +++++---
 2 files changed, 14 insertions(+), 75 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..a31a91003fb7 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,27 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
 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
 
@@ -35,4 +35,8 @@ post_patch() {
 		# since inkscape uses NULL instead of nullptr
 		vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
 	fi
+	# disable glyph tests that fail due to different hinting
+	vsed -e
+	  "s/(test-glyph-y-pos|test-rtl-vertical|text-glyphs-combining|text-glyphs-vertical)/# $1 - skipped due to hinting issues/g"
+	  -i testfiles/rendering_tests/CMakeLists.txt
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (31 preceding siblings ...)
  2021-06-09 11:23 ` [PR PATCH] [Updated] " atk
@ 2021-06-09 11:44 ` atk
  2021-06-10  7:35 ` atk
                   ` (5 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-09 11:44 UTC (permalink / raw)
  To: ml

[-- 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: 5190 bytes --]

From db7d1f9dd47d3180cf00e3c3ac4d9a8696702a6b 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

- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
  idk, failed.
- skip glyph tests that fail due to hinting issues
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
 srcpkgs/inkscape/template                    | 22 ++++---
 2 files changed, 12 insertions(+), 75 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..9ab545246e19 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,27 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
 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
 
@@ -35,4 +35,6 @@ post_patch() {
 		# since inkscape uses NULL instead of nullptr
 		vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
 	fi
+	# disable glyph tests that fail due to different hinting
+	vsed -e "s/(test-glyph-y-pos|test-rtl-vertical|text-glyphs-combining|text-glyphs-vertical)/# $1 - skipped due to hinting issues/g" -i testfiles/rendering_tests/CMakeLists.txt
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (32 preceding siblings ...)
  2021-06-09 11:44 ` atk
@ 2021-06-10  7:35 ` atk
  2021-06-10  9:51 ` atk
                   ` (4 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-10  7:35 UTC (permalink / raw)
  To: ml

[-- 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: 5233 bytes --]

From 2037d238b7c22187a81f53e489fe64aeff4c81b3 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

- new maintainer for orphaned template
- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
  idk, failed.
- skip glyph tests that fail due to hinting issues
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
 srcpkgs/inkscape/template                    | 22 ++++---
 2 files changed, 12 insertions(+), 75 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..2e0404388146 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,27 +1,27 @@
 # 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"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ glib-devel perl-XML-Parser which"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
+ python3-Pillow"
 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
 
@@ -35,4 +35,6 @@ post_patch() {
 		# since inkscape uses NULL instead of nullptr
 		vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
 	fi
+	# disable glyph tests that fail due to different hinting
+	vsed -e "s/\(test-glyph-y-pos\|test-rtl-vertical\|text-glyphs-combining\|text-glyphs-vertical\)/# \1 - skipped due to hinting issues/" -i testfiles/rendering_tests/CMakeLists.txt
 }

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (33 preceding siblings ...)
  2021-06-10  7:35 ` atk
@ 2021-06-10  9:51 ` atk
  2021-06-10 14:43 ` [PR REVIEW] " ericonr
                   ` (3 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: atk @ 2021-06-10  9:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-858481422

Comment:
Now all that is left are some segfaults on x86_64-musl that I cannot explain. Maybe someone is able to help?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (34 preceding siblings ...)
  2021-06-10  9:51 ` atk
@ 2021-06-10 14:43 ` ericonr
  2021-06-10 14:43 ` ericonr
                   ` (2 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-10 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r649250896

Comment:
Can you split these into two or three lines? `vsed -e \` to make a multiline command.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (35 preceding siblings ...)
  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
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-10 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#discussion_r649251455

Comment:
I don't think removing `inkscape` from here is good, I'd rather leave as is...

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Closed]: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (36 preceding siblings ...)
  2021-06-10 14:43 ` ericonr
@ 2021-06-12  4:01 ` ericonr
  2021-06-12 11:22 ` hervyqa
  38 siblings, 0 replies; 40+ messages in thread
From: ericonr @ 2021-06-12  4:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

There's a closed pull request on the void-packages repository

WIP: inkscape: update to 1.1
https://github.com/void-linux/void-packages/pull/31149

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: WIP: inkscape: update to 1.1
  2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 atk
                   ` (37 preceding siblings ...)
  2021-06-12  4:01 ` [PR PATCH] [Closed]: " ericonr
@ 2021-06-12 11:22 ` hervyqa
  38 siblings, 0 replies; 40+ messages in thread
From: hervyqa @ 2021-06-12 11:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/31149#issuecomment-860039761

Comment:
thank you for your hard work 👏👏👏 @atk @ericonr 

^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2021-06-12 11:22 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 15:09 [PR PATCH] inkscape: update to 1.1 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 ` [PR PATCH] [Updated] " atk
2021-06-07  7:39 ` 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

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git