Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] inkscape: update to 1.1.2
@ 2022-02-07  4:11 hervyqa
  2022-02-07  5:15 ` hervyqa
                   ` (55 more replies)
  0 siblings, 56 replies; 57+ messages in thread
From: hervyqa @ 2022-02-07  4:11 UTC (permalink / raw)
  To: ml

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

There is a new pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 1268 bytes --]

From 971c3899f2357b9eb616481a72b377b3667445da Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.1.2

---
 srcpkgs/inkscape/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..49cff7effdb9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,8 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.1.2
+revision=1
+wrksrc="inkscape-${version}_2022-02-04_0a00cf5339"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -21,7 +21,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
@ 2022-02-07  5:15 ` hervyqa
  2022-02-23 16:11 ` tibequadorian
                   ` (54 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-02-07  5:15 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1031083011

Comment:
Success, except x86_64-musl.
cc @ericonr 

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

* Re: inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
  2022-02-07  5:15 ` hervyqa
@ 2022-02-23 16:11 ` tibequadorian
  2022-02-23 23:32 ` hervyqa
                   ` (53 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tibequadorian @ 2022-02-23 16:11 UTC (permalink / raw)
  To: ml

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

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1048948711

Comment:
https://gitlab.com/inkscape/inkscape/-/issues/2241

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

* Re: inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
  2022-02-07  5:15 ` hervyqa
  2022-02-23 16:11 ` tibequadorian
@ 2022-02-23 23:32 ` hervyqa
  2022-02-23 23:33 ` hervyqa
                   ` (52 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-02-23 23:32 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1049330885

Comment:
> https://gitlab.com/inkscape/inkscape/-/issues/2241

yes, I already know about this issue. previous versions of inkscape also failed on the x86_64-musl version (#34478), but it was merged.

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

* Re: inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (2 preceding siblings ...)
  2022-02-23 23:32 ` hervyqa
@ 2022-02-23 23:33 ` hervyqa
  2022-02-23 23:38 ` hervyqa
                   ` (51 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-02-23 23:33 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1049330885

Comment:
> https://gitlab.com/inkscape/inkscape/-/issues/2241

yes, I already know about this issue. previous versions of inkscape also failed on the x86_64-musl (#34478), but it was merged.

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

* Re: inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (3 preceding siblings ...)
  2022-02-23 23:33 ` hervyqa
@ 2022-02-23 23:38 ` hervyqa
  2022-05-18  3:41 ` [PR PATCH] [Updated] " hervyqa
                   ` (50 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-02-23 23:38 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1049334412

Comment:
or maybe it's better to wait for the final 1.2 release as well this march.

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (4 preceding siblings ...)
  2022-02-23 23:38 ` hervyqa
@ 2022-05-18  3:41 ` hervyqa
  2022-05-18  3:59 ` [PR PATCH] [Updated] inkscape: update to 1.2 hervyqa
                   ` (49 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  3:41 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 1264 bytes --]

From 49bc7104a2a4d65374cb0777478a2a04ceff5da8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..d9bc947ca9bf 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,8 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+wrksrc="inkscape-${version}_2022-05-15_dc2aedaf03"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -21,7 +21,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (5 preceding siblings ...)
  2022-05-18  3:41 ` [PR PATCH] [Updated] " hervyqa
@ 2022-05-18  3:59 ` hervyqa
  2022-05-18  4:12 ` hervyqa
                   ` (48 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  3:59 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 1417 bytes --]

From 4f7c02dba91382375201b73d3f7f6d0ab850512d Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..c8af052865f2 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,8 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+wrksrc="inkscape-${version}_2022-05-15_dc2aedaf03"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -20,8 +20,8 @@ short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_2022-05-15_dc2aedaf03.tar.xz"
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (6 preceding siblings ...)
  2022-05-18  3:59 ` [PR PATCH] [Updated] inkscape: update to 1.2 hervyqa
@ 2022-05-18  4:12 ` hervyqa
  2022-05-18  5:05 ` hervyqa
                   ` (47 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  4:12 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 1420 bytes --]

From 96071f3c9f546e9930d04db45e96ba8fb69469b4 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..1467bd4b936d 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,9 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_tag="2022-05-15_dc2aedaf03"
+wrksrc="inkscape-${version}_${_tag}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -20,8 +21,8 @@ short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_${_tag}.tar.xz"
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (7 preceding siblings ...)
  2022-05-18  4:12 ` hervyqa
@ 2022-05-18  5:05 ` hervyqa
  2022-05-18  5:38 ` hervyqa
                   ` (46 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  5:05 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1129570164

Comment:
Test error. Need help :)

## i686

```
The following tests FAILED: 

2864	 30 - test_lpe (Failed) 

2865Errors while running CTest 

2866ninja: build stopped: subcommand failed. 

2867=> ERROR: inkscape-1.2_1: do_check: '${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}' exited with 1 

2868=> ERROR: in do_check() at common/build-style/cmake.sh:119 

2869Error: Process completed with exit code 1.
```

## x86_64-musl

```
The following tests FAILED: 

2258	 3 - test_drag-and-drop-svgz (SEGFAULT) 

2259	 25 - test_svg-extension (SEGFAULT) 

2260	 30 - test_lpe (SEGFAULT) 

2261	 31 - test_lpe64 (SEGFAULT) 

2262Errors while running CTest 

2263ninja: build stopped: subcommand failed. 

2264=> ERROR: inkscape-1.2_1: do_check: '${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}' exited with 1 

2265=> ERROR: in do_check() at common/build-style/cmake.sh:119 

2266Error: Process completed with exit code 1.
```


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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (8 preceding siblings ...)
  2022-05-18  5:05 ` hervyqa
@ 2022-05-18  5:38 ` hervyqa
  2022-05-18  8:52 ` [PR PATCH] [Updated] " hervyqa
                   ` (45 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  5:38 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1129570164

Comment:
Test error. Need help :)

## i686

```
The following tests FAILED:
	 30 - test_lpe (Failed)
Errors while running CTest
ninja: build stopped: subcommand failed.
=> ERROR: inkscape-1.2_1: do_check: '${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}' exited with 1
=> ERROR:   in do_check() at common/build-style/cmake.sh:119
Error: Process completed with exit code 1.
```
## x86_64

```
The following tests FAILED:
	 30 - test_lpe (Failed)
Errors while running CTest
ninja: build stopped: subcommand failed.
=> ERROR: inkscape-1.2_1: do_check: '${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}' exited with 1
=> ERROR:   in do_check() at common/build-style/cmake.sh:119
Error: Process completed with exit code 1.
```

## x86_64-musl

```
The following tests FAILED:
	  3 - test_drag-and-drop-svgz (SEGFAULT)
	 25 - test_svg-extension (SEGFAULT)
	 30 - test_lpe (SEGFAULT)
	 31 - test_lpe64 (SEGFAULT)
Errors while running CTest
ninja: build stopped: subcommand failed.
=> ERROR: inkscape-1.2_1: do_check: '${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}' exited with 1
=> ERROR:   in do_check() at common/build-style/cmake.sh:119
Error: Process completed with exit code 1.
```


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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (9 preceding siblings ...)
  2022-05-18  5:38 ` hervyqa
@ 2022-05-18  8:52 ` hervyqa
  2022-05-19 14:50 ` ericonr
                   ` (44 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-18  8:52 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)





A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2087 bytes --]

From f1e8bea2788f006dd42a85c1b44ace1b4902a236 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..ddbddccfe9d5 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,9 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_tag="2022-05-15_dc2aedaf03"
+wrksrc="inkscape-${version}_${_tag}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +14,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lockfile python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_${_tag}.tar.xz"
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (10 preceding siblings ...)
  2022-05-18  8:52 ` [PR PATCH] [Updated] " hervyqa
@ 2022-05-19 14:50 ` ericonr
  2022-05-20  4:34 ` hervyqa
                   ` (43 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-05-19 14:50 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1131824821

Comment:
hmm, nice that they managed to fix most of the segfaults on musl

I guess we need to report `test_lpe` to upstream, probably. Or try to look at what it does.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (11 preceding siblings ...)
  2022-05-19 14:50 ` ericonr
@ 2022-05-20  4:34 ` hervyqa
  2022-05-21 15:54 ` ericonr
                   ` (42 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-20  4:34 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1132450531

Comment:
> I guess we need to report `test_lpe` to upstream, probably. Or try to look at what it does.

LPE (Live Path Effect) is used to manipulate path objects easily. There are many types of LPE, but in this LPE test does not mention which LPE failed to be tested.

```
The following tests FAILED:
	 30 - test_lpe (Failed)
```
Maybe one of them failed the test, but I don't know which one.

![Screenshot_20220520_112858](https://user-images.githubusercontent.com/45872139/169450713-e8aa4e3c-19c8-4b0e-9349-3db7d90621d6.png)

source: https://gitlab.com/inkscape/inkscape/-/blob/master/testfiles/src/lpe-test.cpp

```cpp
// A) FILE BASED TESTS
// TEST_F(LPETest, Bool_multi_px_1_1)                          { run(); }
// TEST_F(LPETest, Bool_multi_mm_1_1)                          { run(); }
TEST_F(LPETest, AttachPath_0_92_5_mixed)                    { run(); }
TEST_F(LPETest, AttachPath_mm_1_0_2)                        { run(); }
TEST_F(LPETest, AttachPath_px_1_0_2)                        { run(); }
TEST_F(LPETest, BoundingBox_mixed_0_92_5)                   { run(); }
TEST_F(LPETest, BoundingBox_mm_1_0_2)                       { run(); }
TEST_F(LPETest, BoundingBox_px_1_0_2)                       { run(); }
TEST_F(LPETest, CloneOriginal_mixed_0_92_5)                 { run(); }
// linked item is broken in 1.0.2 because group cliboard items, use same version of 1.1 but resaved in 1.2 to get comapat in 1.0.1 or before the group clipboard is added
TEST_F(LPETest, CloneOriginal_boken_1_0_2)                  { run(); }
TEST_F(LPETest, CloneOriginal_mixed_px_1_1)                 { run(); }
TEST_F(LPETest, CloneOriginal_mixed_mm_1_1)                 { run(); }
TEST_F(LPETest, ConstructGrid_mixed_0_92_5)                 { run(); }
TEST_F(LPETest, ConstructGrid_mm_1_0_2)                     { run(); }
TEST_F(LPETest, ConstructGrid_px_1_0_2)                     { run(); }
TEST_F(LPETest, Transform2Points_path_0_92_5)               { run(); }
TEST_F(LPETest, Transform2Points_multi_px_1_0_2)            { run(); }
TEST_F(LPETest, Transform2Points_multi_mm_1_0_2)            { run(); }
TEST_F(LPETest, VonCoch_path_0_92_5)                        { run(); }
TEST_F(LPETest, VonCoch_multi_px_1_0_2)                     { run(); }
TEST_F(LPETest, VonCoch_multi_mm_1_0_2)                     { run(); }
TEST_F(LPETest, StitchSubPaths_path_0_92_5)                 { run(); }
TEST_F(LPETest, StitchSubPaths_multi_px_1_0_2)              { run(); }
TEST_F(LPETest, StitchSubPaths_multi_mm_1_0_2)              { run(); }
TEST_F(LPETest, Spiro_mixed_0_92_5)                         { run(); }
TEST_F(LPETest, Spiro_mm_1_0_2)                             { run(); }
TEST_F(LPETest, Spiro_px_1_0_2)                             { run(); }
TEST_F(LPETest, Slice_multi_px_1_1)                         { run(); }
TEST_F(LPETest, Slice_multi_mm_1_1)                         { run(); }
TEST_F(LPETest, Simplify_path_0_92_5)                       { run(); }
TEST_F(LPETest, Simplify_multi_px_1_0_2)                    { run(); }
TEST_F(LPETest, Simplify_multi_mm_1_0_2)                    { run(); }
TEST_F(LPETest, ShowHandles_path_0_92_5)                    { run(); }
TEST_F(LPETest, ShowHandles_multi_px_1_0_2)                 { run(); }
TEST_F(LPETest, ShowHandles_multi_mm_1_0_2)                 { run(); }
TEST_F(LPETest, Ruler_path_0_92_5)                          { run(); }
TEST_F(LPETest, Ruler_multi_px_1_0_2)                       { run(); }
TEST_F(LPETest, Ruler_multi_mm_1_0_2)                       { run(); }
TEST_F(LPETest, RoughHatches_path_0_92_5)                   { run(); }
TEST_F(LPETest, RoughHatches_multi_px_1_0_2)                { run(); }
TEST_F(LPETest, RoughHatches_multi_mm_1_0_2)                { run(); }
// Rougen Test till 1.1 fail because wrong implementation of rand on the LPE
TEST_F(LPETest, Roughen_path_1_1)                           { run(); }
TEST_F(LPETest, EllipseFromPoints_multi_px_1_0_2)           { run(); }
TEST_F(LPETest, EllipseFromPoints_multi_mm_1_0_2)           { run(); }
TEST_F(LPETest, PowerMask_multi_px_1_0_2)                   { run(); }
TEST_F(LPETest, PowerMask_multi_mm_1_0_2)                   { run(); }
TEST_F(LPETest, PowerClip_multi_px_1_0_2)                   { run(); }
TEST_F(LPETest, PowerClip_multi_mm_1_0_2)                   { run(); }
TEST_F(LPETest, PerspectiveEnvelope_mixed_0_92_5)           { run(); }
TEST_F(LPETest, PerspectiveEnvelope_multi_mm_1_0_2)         { run(); }
TEST_F(LPETest, PerspectiveEnvelope_multi_px_1_0_2)         { run(); }
TEST_F(LPETest, Offset_multi_px_1_0_2)                      { run(); }
TEST_F(LPETest, Offset_multi_mm_1_0_2)                      { run(); }
TEST_F(LPETest, Offset_multi_px_1_1)                        { run(); }
TEST_F(LPETest, MirrorSymmetry_path_0_92_5)                 { run(); }
TEST_F(LPETest, MirrorSymmetry_multi_px_1_0_2)              { run(); }
TEST_F(LPETest, MirrorSymmetry_multi_mm_1_0_2)              { run(); }
TEST_F(LPETest, MeasureSegments_multi_px_1_0_2)             { run(); }
TEST_F(LPETest, MeasureSegments_multi_mm_1_0_2)             { run(); }
TEST_F(LPETest, Lattice2_path_0_92_5)                       { run(); }
TEST_F(LPETest, Lattice2_multi_px_1_0_2)                    { run(); }
TEST_F(LPETest, Lattice2_multi_mm_1_0_2)                    { run(); }
TEST_F(LPETest, Knot_path_0_92_5)                           { run(); }
TEST_F(LPETest, Knot_multi_px_1_0_2)                        { run(); }
TEST_F(LPETest, Knot_multi_mm_1_0_2)                        { run(); }
TEST_F(LPETest, JoinType_multi_px_1_0_2)                    { run(); }
TEST_F(LPETest, JoinType_multi_mm_1_0_2)                    { run(); }
TEST_F(LPETest, Interpolate_path_0_92_5)                    { run(); }
TEST_F(LPETest, Interpolate_multi_px_1_0_2)                 { run(); }
TEST_F(LPETest, Interpolate_multi_mm_1_0_2)                 { run(); }
TEST_F(LPETest, InterpolatePoints_path_0_92_5)              { run(); }
TEST_F(LPETest, InterpolatePoints_multi_px_1_0_2)           { run(); }
TEST_F(LPETest, InterpolatePoints_multi_mm_1_0_2)           { run(); }
TEST_F(LPETest, Gears_path_0_92_5)                          { run(); }
TEST_F(LPETest, Gears_multi_px_1_0_2)                       { run(); }
TEST_F(LPETest, Gears_multi_mm_1_0_2)                       { run(); }
TEST_F(LPETest, FilletChamfer_multi_px_1_0_2)               { run(); }
TEST_F(LPETest, FilletChamfer_multi_mm_1_0_2)               { run(); }
// NEED to test on 0.92 no working one here (gnome 40)
// TEST_F(LPETest, FillBetweenStrokes_path_0_92_5)          { run(); }
TEST_F(LPETest, FillBetweenStrokes_path_multi_px_1_0_2)     { run(); }
TEST_F(LPETest, FillBetweenStrokes_path_multi_mm_1_0_2)     { run(); }
// NEED to test on 0.92 no working one here (gnome 40)
// TEST_F(LPETest, FillBetweenMany_multi_0_92_5)               { run(); }
TEST_F(LPETest, FillBetweenMany_multi_px_1_0_2)             { run(); }
TEST_F(LPETest, FillBetweenMany_multi_mm_1_0_2)             { run(); }
TEST_F(LPETest, Ellipse5pts_path_0_92_5)                    { run(); }
TEST_F(LPETest, Ellipse5pts_ellipse_px_1_0_2)               { run(); }
TEST_F(LPETest, Ellipse5pts_ellipse_mm_1_0_2)               { run(); }
TEST_F(LPETest, DashedStroke_multi_px_1_0_2)                { run(); }
TEST_F(LPETest, DashedStroke_multi_mm_1_0_2)                { run(); }
TEST_F(LPETest, RotateCopies_multi_mm_1_0_2)                { run(); }
TEST_F(LPETest, RotateCopies_multi_px_1_0_2)                { run(); }
```

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (12 preceding siblings ...)
  2022-05-20  4:34 ` hervyqa
@ 2022-05-21 15:54 ` ericonr
  2022-05-21 15:55 ` ericonr
                   ` (41 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-05-21 15:54 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1133659609

Comment:
9ac33cf7099aba595fe6b5a3412c795fc9a9313b removed python3-lockfile, we can't depend on it

https://pypi.org/project/lockfile/ says it's deprecated.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (13 preceding siblings ...)
  2022-05-21 15:54 ` ericonr
@ 2022-05-21 15:55 ` ericonr
  2022-05-21 23:05 ` hervyqa
                   ` (40 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-05-21 15:55 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1133659609

Comment:
9ac33cf7099aba595fe6b5a3412c795fc9a9313b removed python3-lockfile, we can't depend on it (or at least not without reintroducing it)


https://pypi.org/project/lockfile/ says it's deprecated.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (14 preceding siblings ...)
  2022-05-21 15:55 ` ericonr
@ 2022-05-21 23:05 ` hervyqa
  2022-05-21 23:11 ` [PR PATCH] [Updated] " hervyqa
                   ` (39 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-21 23:05 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1133780817

Comment:
I just found out `python3-lockfile` is included in the removed packages. But it is necessary to open `extension`> `management extension`. Alright, I delete the dependencies. I think the extension is lacking.

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (15 preceding siblings ...)
  2022-05-21 23:05 ` hervyqa
@ 2022-05-21 23:11 ` hervyqa
  2022-05-21 23:19 ` hervyqa
                   ` (38 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-21 23:11 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect python3-lockfile` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2070 bytes --]

From df05aaa8a6ff1880b52d5ebf68e94a8483920569 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..e2510eb4df57 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,9 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_tag="2022-05-15_dc2aedaf03"
+wrksrc="inkscape-${version}_${_tag}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +14,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_${_tag}.tar.xz"
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (16 preceding siblings ...)
  2022-05-21 23:11 ` [PR PATCH] [Updated] " hervyqa
@ 2022-05-21 23:19 ` hervyqa
  2022-05-22  1:59 ` ericonr
                   ` (37 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-21 23:19 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1133780817

Comment:
I just found out `python3-lockfile` is included in the removed packages. But it is necessary to open `extension`> `management extension`. Alright, I delete the dependencies. I think the extension is lacking.

![Screenshot_20220522_061906](https://user-images.githubusercontent.com/45872139/169671952-679dbf75-a367-4375-8810-ab6646f3d07a.png)



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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (17 preceding siblings ...)
  2022-05-21 23:19 ` hervyqa
@ 2022-05-22  1:59 ` ericonr
  2022-05-23 14:10 ` hervyqa
                   ` (36 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-05-22  1:59 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1133801062

Comment:
IMO, if you're up for it, we can add the package back, just need to increase the revision. Or ask inkscape to not depend on a deprecated package.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (18 preceding siblings ...)
  2022-05-22  1:59 ` ericonr
@ 2022-05-23 14:10 ` hervyqa
  2022-05-23 14:12 ` hervyqa
                   ` (35 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-23 14:10 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1134729415

Comment:
Still waiting for a reply from the Inkscape developer [PR](https://gitlab.com/inkscape/extras/extension-manager/-/issues/26).
So far the performance version 1.2 is far better than before.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (19 preceding siblings ...)
  2022-05-23 14:10 ` hervyqa
@ 2022-05-23 14:12 ` hervyqa
  2022-05-25  1:46 ` ericonr
                   ` (34 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-23 14:12 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1134729415

Comment:
Still waiting for a reply from the Inkscape developer ([issue](https://gitlab.com/inkscape/extras/extension-manager/-/issues/26)).
So far the performance version 1.2 is far better than before.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (20 preceding siblings ...)
  2022-05-23 14:12 ` hervyqa
@ 2022-05-25  1:46 ` ericonr
  2022-05-27 15:33 ` hsnfirdaus
                   ` (33 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-05-25  1:46 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1136619723

Comment:
At least the LPE test specifically seems to be the same issue plaguing other tests on musl, from my debugging. I guess I should have tested on glibc instead.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (21 preceding siblings ...)
  2022-05-25  1:46 ` ericonr
@ 2022-05-27 15:33 ` hsnfirdaus
  2022-05-27 18:52 ` hervyqa
                   ` (32 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hsnfirdaus @ 2022-05-27 15:33 UTC (permalink / raw)
  To: ml

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1139727789

Comment:
![Screenshot from 2022-05-27 22-12-11](https://user-images.githubusercontent.com/38871578/170731268-04bdda94-5809-45e4-941a-4b507dc5d924.png)
Out of topic, Why my inkscape appmenu is duplicated? is inkscape bug, void linux bug or something wrong with my system? Void Linux x86_64
I try built myself inkscape  1.2 from this template...

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (22 preceding siblings ...)
  2022-05-27 15:33 ` hsnfirdaus
@ 2022-05-27 18:52 ` hervyqa
  2022-05-31 23:36 ` hervyqa
                   ` (31 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-27 18:52 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1139942118

Comment:
seems fine.
![Screenshot_20220528_015113](https://user-images.githubusercontent.com/45872139/170772924-5fefd8da-52c6-43b9-9e43-15f82adb8219.png)



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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (23 preceding siblings ...)
  2022-05-27 18:52 ` hervyqa
@ 2022-05-31 23:36 ` hervyqa
  2022-05-31 23:36 ` hervyqa
                   ` (30 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-31 23:36 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1142739916

Comment:
[Maintainer says:](https://gitlab.com/inkscape/extras/extension-manager/-/issues/25#note_966699805)

> There's two separate issues: we don't package lockfile, because it's not a dependency of cachecontrol (it's only an optional depencency: https://github.com/ionrock/cachecontrol/blob/f93d8af93e6dcc98f6867d2a09d4f68f6acc135f/setup.py#L25). So lockfile needs to be added to pyproject.toml @pulsar17.
>
> Also lockfile is deprecated (https://github.com/ionrock/cachecontrol/issues/109) and hasn't been replaced in cachecontrol since 2016.

---

Currently there is no need to add `python3-lockfile`, because the package is only optional and even then deprecated.  means that inkscape 1.2 is now intentionally not fully supported for extensions manager.

But that's okay, because adding extensions can still be done manually by adding to `~/.config/inkscape/extensions/`


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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (24 preceding siblings ...)
  2022-05-31 23:36 ` hervyqa
@ 2022-05-31 23:36 ` hervyqa
  2022-06-23 10:13 ` [PR PATCH] [Updated] " hervyqa
                   ` (29 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-05-31 23:36 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1142739916

Comment:
[Maintainer says:](https://gitlab.com/inkscape/extras/extension-manager/-/issues/25#note_966699805)

> There's two separate issues: we don't package lockfile, because it's not a dependency of cachecontrol (it's only an optional depencency: https://github.com/ionrock/cachecontrol/blob/f93d8af93e6dcc98f6867d2a09d4f68f6acc135f/setup.py#L25). So lockfile needs to be added to pyproject.toml @pulsar17.
>
> Also lockfile is deprecated (https://github.com/ionrock/cachecontrol/issues/109) and hasn't been replaced in cachecontrol since 2016.

---

Currently there is no need to add `python3-lockfile`, because the package is only optional and even then deprecated.  means that inkscape 1.2 is now intentionally not fully supported for extensions manager.

But that's okay, because adding extensions can still be done manually by adding to `~/.config/inkscape/extensions/`

Cc @ericonr 

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (25 preceding siblings ...)
  2022-05-31 23:36 ` hervyqa
@ 2022-06-23 10:13 ` hervyqa
  2022-06-23 11:24 ` hervyqa
                   ` (28 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-23 10:13 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 3718 bytes --]

From fb360ed0e60f1163ec46f74f173f51cc66fd90a8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/patches/fix-Werror.patch | 20 ++++++++++++++++++++
 srcpkgs/inkscape/template                 | 16 +++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/inkscape/patches/fix-Werror.patch

diff --git a/srcpkgs/inkscape/patches/fix-Werror.patch b/srcpkgs/inkscape/patches/fix-Werror.patch
new file mode 100644
index 000000000000..f2751c9ad037
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-Werror.patch
@@ -0,0 +1,20 @@
+diff --git a/community/inkscape/fix-Werror.patch b/community/inkscape/fix-Werror.patch
+index a718973d77..cea18d1887 100644
+--- a/community/inkscape/fix-Werror.patch
++++ b/community/inkscape/fix-Werror.patch
+@@ -2,12 +2,12 @@ Fix -Werror flags, build fails with them
+
+ --- a/CMakeScripts/DefineDependsandFlags.cmake
+ +++ b/CMakeScripts/DefineDependsandFlags.cmake
+-@@ -32,8 +32,6 @@
++@@ -39,8 +39,6 @@
+
+  # Errors for common mistakes
+  list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
+ -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format")                # e.g.: printf("%s", std::string("foo"))
+ -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security")       # e.g.: printf(variable);
++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers")    # e.g.: const int foo();
++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=return-type")           # non-void functions that don't return a value
+  list(APPEND INKSCAPE_CXX_FLAGS "-Wno-switch")                   # See !849 for discussion
+- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Og")                     # -Og for _FORTIFY_SOURCE. One could add -Weffc++ here to see approx. 6000 warnings
+- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wcomment")
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..678d860aad8f 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_${_pkgdate}_${_pkgcommit}.tar.xz"
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (26 preceding siblings ...)
  2022-06-23 10:13 ` [PR PATCH] [Updated] " hervyqa
@ 2022-06-23 11:24 ` hervyqa
  2022-06-23 11:44 ` hervyqa
                   ` (27 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-23 11:24 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 3605 bytes --]

From 0b60df78096f6bc4279d086e50b20075d1342b47 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/patches/fix-Werror.patch | 20 ++++++++++++++++++++
 srcpkgs/inkscape/template                 | 14 ++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/inkscape/patches/fix-Werror.patch

diff --git a/srcpkgs/inkscape/patches/fix-Werror.patch b/srcpkgs/inkscape/patches/fix-Werror.patch
new file mode 100644
index 000000000000..f2751c9ad037
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-Werror.patch
@@ -0,0 +1,20 @@
+diff --git a/community/inkscape/fix-Werror.patch b/community/inkscape/fix-Werror.patch
+index a718973d77..cea18d1887 100644
+--- a/community/inkscape/fix-Werror.patch
++++ b/community/inkscape/fix-Werror.patch
+@@ -2,12 +2,12 @@ Fix -Werror flags, build fails with them
+
+ --- a/CMakeScripts/DefineDependsandFlags.cmake
+ +++ b/CMakeScripts/DefineDependsandFlags.cmake
+-@@ -32,8 +32,6 @@
++@@ -39,8 +39,6 @@
+
+  # Errors for common mistakes
+  list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
+ -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format")                # e.g.: printf("%s", std::string("foo"))
+ -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security")       # e.g.: printf(variable);
++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers")    # e.g.: const int foo();
++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=return-type")           # non-void functions that don't return a value
+  list(APPEND INKSCAPE_CXX_FLAGS "-Wno-switch")                   # See !849 for discussion
+- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Og")                     # -Og for _FORTIFY_SOURCE. One could add -Weffc++ here to see approx. 6000 warnings
+- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wcomment")
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (27 preceding siblings ...)
  2022-06-23 11:24 ` hervyqa
@ 2022-06-23 11:44 ` hervyqa
  2022-06-23 11:59 ` hervyqa
                   ` (26 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-23 11:44 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 3672 bytes --]

From 90e08c4dca0325994adca3eac332a4b8f92323bf Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/patches/fix-Werror.patch | 18 ++++++++++++++++++
 srcpkgs/inkscape/template                 | 14 ++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/inkscape/patches/fix-Werror.patch

diff --git a/srcpkgs/inkscape/patches/fix-Werror.patch b/srcpkgs/inkscape/patches/fix-Werror.patch
new file mode 100644
index 000000000000..cc4949694422
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-Werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index b42c0aa..280f525 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -39,13 +39,9 @@ list(APPEND INKSCAPE_CXX_FLAGS "-DGDK_DISABLE_DEPRECATED")
+ 
+ # Errors for common mistakes
+ list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
+-list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format")                # e.g.: printf("%s", std::string("foo"))
+-list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security")       # e.g.: printf(variable);
+ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers")    # e.g.: const int foo();
+ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=return-type")           # non-void functions that don't return a value
+ list(APPEND INKSCAPE_CXX_FLAGS "-Wno-switch")                   # See !849 for discussion
+-list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Og")                     # -Og for _FORTIFY_SOURCE. One could add -Weffc++ here to see approx. 6000 warnings
+-list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wcomment")
+ list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wunused-function")
+ list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wunused-variable")
+ list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-D_GLIBCXX_ASSERTIONS")
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (28 preceding siblings ...)
  2022-06-23 11:44 ` hervyqa
@ 2022-06-23 11:59 ` hervyqa
  2022-06-30 18:53 ` [PR REVIEW] " ericonr
                   ` (25 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-23 11:59 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2465 bytes --]

From 4069b718e010e79bb4a58c5ab563c0f1130786f0 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..5e3c64eb88f0 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -32,7 +34,7 @@ post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		# disable errors for missing sentinels in glib variadic functions,
 		# since inkscape uses NULL instead of nullptr
-		vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
+		vsed -e "/-Werror=format/d" -e "/-Og/d" -e "/-Wcomment/d" -i CMakeScripts/DefineDependsandFlags.cmake
 	fi
 	# disable glyph tests that fail due to different hinting
 	vsed -e \

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

* Re: [PR REVIEW] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (29 preceding siblings ...)
  2022-06-23 11:59 ` hervyqa
@ 2022-06-30 18:53 ` ericonr
  2022-06-30 20:05 ` hervyqa
                   ` (24 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ericonr @ 2022-06-30 18:53 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#discussion_r911354452

Comment:
Is there any reason to make variables for these two values? They aren't used elsewhere...

Otherwise I think it's good to merge. Sorry for the delay.

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

* Re: [PR REVIEW] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (30 preceding siblings ...)
  2022-06-30 18:53 ` [PR REVIEW] " ericonr
@ 2022-06-30 20:05 ` hervyqa
  2022-06-30 20:17 ` [PR PATCH] [Updated] " hervyqa
                   ` (23 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-30 20:05 UTC (permalink / raw)
  To: ml

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

New review comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#discussion_r911404688

Comment:
I was inspired by alpine linux. any suggestion?

https://git.alpinelinux.org/aports/tree/community/inkscape/APKBUILD

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (31 preceding siblings ...)
  2022-06-30 20:05 ` hervyqa
@ 2022-06-30 20:17 ` hervyqa
  2022-06-30 20:27 ` hervyqa
                   ` (22 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-30 20:17 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2013 bytes --]

From 12006f6be13d6e72dfc9caf905982be1e70717c3 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (32 preceding siblings ...)
  2022-06-30 20:17 ` [PR PATCH] [Updated] " hervyqa
@ 2022-06-30 20:27 ` hervyqa
  2022-07-07  6:25 ` hervyqa
                   ` (21 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-06-30 20:27 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2013 bytes --]

From bd42bdd6737977db73fa8eb21b8aa68e2caf4d53 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Feb 2022 11:09:12 +0700
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=3
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (33 preceding siblings ...)
  2022-06-30 20:27 ` hervyqa
@ 2022-07-07  6:25 ` hervyqa
  2022-07-09 13:09 ` hervyqa
                   ` (20 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-07  6:25 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 2006 bytes --]

From ec7db8ab12b6c6be803cada17e048a0cb2da24d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 00:55:02 +0200
Subject: [PATCH] inkscape: update to 1.2

---
 srcpkgs/inkscape/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=4
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (34 preceding siblings ...)
  2022-07-07  6:25 ` hervyqa
@ 2022-07-09 13:09 ` hervyqa
  2022-07-09 13:11 ` hervyqa
                   ` (19 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-09 13:09 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1179542814

Comment:
Hi @oreo639, is the patch libpoppler 22.06.0 compatible with inkscape 1.2?

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (35 preceding siblings ...)
  2022-07-09 13:09 ` hervyqa
@ 2022-07-09 13:11 ` hervyqa
  2022-07-09 19:00 ` oreo639
                   ` (18 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-09 13:11 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1179542814

Comment:
Hi @oreo639, is the patch libpoppler 22.06.0 compatible with inkscape 1.2?

```
 => inkscape-1.2_1: patching: Ensure-compatibility-with-Poppler-22.03-and-later.patch.
Reversed (or previously applied) patch detected!  Skipping patch.
```

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (36 preceding siblings ...)
  2022-07-09 13:11 ` hervyqa
@ 2022-07-09 19:00 ` oreo639
  2022-07-09 19:01 ` oreo639
                   ` (17 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: oreo639 @ 2022-07-09 19:00 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1179591148

Comment:
All of the poppler patches for inkscape were taken from upstream.

The latest patch does appear to be in inkscape 1.2:
https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (37 preceding siblings ...)
  2022-07-09 19:00 ` oreo639
@ 2022-07-09 19:01 ` oreo639
  2022-07-09 19:09 ` oreo639
                   ` (16 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: oreo639 @ 2022-07-09 19:01 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1179591148

Comment:
All of the poppler patches for inkscape were taken from upstream.

The latest patch does appear to be in inkscape 1.2:
https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b

You should be fine removing them.

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

* Re: inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (38 preceding siblings ...)
  2022-07-09 19:01 ` oreo639
@ 2022-07-09 19:09 ` oreo639
  2022-07-10  0:01 ` [PR PATCH] [Updated] " hervyqa
                   ` (15 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: oreo639 @ 2022-07-09 19:09 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1179591148

Comment:
All of the poppler patches for inkscape were taken from upstream.

The latest patch does appear to already be in inkscape 1.2:
https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b

You should be fine removing them.

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (39 preceding siblings ...)
  2022-07-09 19:09 ` oreo639
@ 2022-07-10  0:01 ` hervyqa
  2022-07-15  1:43 ` hervyqa
                   ` (14 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-10  0:01 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12088 bytes --]

From 3df547fe2b40b0e1eebc7bee80c34855314f9154 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 00:55:02 +0200
Subject: [PATCH] inkscape: update to 1.2

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  14 +-
 4 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..da137acea880 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=4
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2
+revision=1
+_pkgdate="2022-05-15"
+_pkgcommit="dc2aedaf03"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (40 preceding siblings ...)
  2022-07-10  0:01 ` [PR PATCH] [Updated] " hervyqa
@ 2022-07-15  1:43 ` hervyqa
  2022-07-15  2:24 ` inkscape: update to 1.2.1 hervyqa
                   ` (13 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-15  1:43 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12092 bytes --]

From 73bb2023729f9bc2f454a090f55ca9dc4195b746 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 00:55:02 +0200
Subject: [PATCH] inkscape: update to 1.2.1

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  14 +-
 4 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..b5a6cbbe1b57 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=4
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2.1
+revision=1
+_pkgdate="2022-07-14"
+_pkgcommit="9c6d41e410"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (41 preceding siblings ...)
  2022-07-15  1:43 ` hervyqa
@ 2022-07-15  2:24 ` hervyqa
  2022-07-16  7:24 ` paper42
                   ` (12 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-15  2:24 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1185102080

Comment:
inkscape 1.2.1 still fail in lpe test. cc @ericonr 
```
The following tests FAILED:
	 30 - test_lpe (Failed)
```

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

* Re: inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (42 preceding siblings ...)
  2022-07-15  2:24 ` inkscape: update to 1.2.1 hervyqa
@ 2022-07-16  7:24 ` paper42
  2022-07-16  8:50 ` [PR PATCH] [Updated] " hervyqa
                   ` (11 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-07-16  7:24 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1186107301

Comment:
@hervyqa I somehow got to the Author field of the commit, but you did all of the work. Could you change it to your name?

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (43 preceding siblings ...)
  2022-07-16  7:24 ` paper42
@ 2022-07-16  8:50 ` hervyqa
  2022-07-16  8:55 ` hervyqa
                   ` (10 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-16  8:50 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2.1
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12104 bytes --]

From 70c38b649680abb28956fa9a88f6561ac92ccec1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sat, 16 Jul 2022 15:50:09 +0700
Subject: [PATCH] inkscape: update to 1.2.1

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  14 +-
 4 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..b5a6cbbe1b57 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=4
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2.1
+revision=1
+_pkgdate="2022-07-14"
+_pkgcommit="9c6d41e410"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (44 preceding siblings ...)
  2022-07-16  8:50 ` [PR PATCH] [Updated] " hervyqa
@ 2022-07-16  8:55 ` hervyqa
  2022-07-17 20:15 ` [PR PATCH] [Updated] " hervyqa
                   ` (9 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-16  8:55 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1186124681

Comment:
> @hervyqa I somehow got to the Author field of the commit, but you did all of the work. Could you change it to your name?

Oh sorry.. done.

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (45 preceding siblings ...)
  2022-07-16  8:55 ` hervyqa
@ 2022-07-17 20:15 ` hervyqa
  2022-09-25  0:16 ` dmarto
                   ` (8 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-07-17 20:15 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2.1
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12104 bytes --]

From 7dabd61110e28ae958217319aed350719bd04234 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sat, 16 Jul 2022 15:50:09 +0700
Subject: [PATCH] inkscape: update to 1.2.1

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  14 +-
 4 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..b5a6cbbe1b57 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=4
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2.1
+revision=1
+_pkgdate="2022-07-14"
+_pkgcommit="9c6d41e410"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (46 preceding siblings ...)
  2022-07-17 20:15 ` [PR PATCH] [Updated] " hervyqa
@ 2022-09-25  0:16 ` dmarto
  2022-09-25  7:59 ` [PR PATCH] [Updated] " hervyqa
                   ` (7 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: dmarto @ 2022-09-25  0:16 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1257088433

Comment:
Can not help with the test failing in CI, but wanted to mention that I have been using Inkscape build from this PR, for some days now and everything (or at least the stuff I use) works perfect, that is on x86_64-glibc; and if there is something that I can help with - ping me.

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (47 preceding siblings ...)
  2022-09-25  0:16 ` dmarto
@ 2022-09-25  7:59 ` hervyqa
  2022-09-25  8:40 ` hervyqa
                   ` (6 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-09-25  7:59 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2.1
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2.1 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2.1 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12104 bytes --]

From 3fc3da928d22a5f4263852fd8b64d4f9392670df Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sat, 16 Jul 2022 15:50:09 +0700
Subject: [PATCH] inkscape: update to 1.2.1

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  14 +-
 4 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index c77236be6848..b5a6cbbe1b57 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=5
-wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
+version=1.2.1
+revision=1
+_pkgdate="2022-07-14"
+_pkgcommit="9c6d41e410"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (48 preceding siblings ...)
  2022-09-25  7:59 ` [PR PATCH] [Updated] " hervyqa
@ 2022-09-25  8:40 ` hervyqa
  2022-12-07  5:43 ` [PR PATCH] [Updated] " hervyqa
                   ` (5 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-09-25  8:40 UTC (permalink / raw)
  To: ml

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

New comment by hervyqa on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1257148195

Comment:
I hope in version 1.3 later all tests are successful. hope so

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2.1
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (49 preceding siblings ...)
  2022-09-25  8:40 ` hervyqa
@ 2022-12-07  5:43 ` hervyqa
  2022-12-07  6:12 ` [PR PATCH] [Updated] inkscape: update to 1.2.2 hervyqa
                   ` (4 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-12-07  5:43 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2.1
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2.1 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2.1 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 12051 bytes --]

From af660b2e465fdc5893aadb34524208c4cd6b253c Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sun, 4 Dec 2022 09:48:49 +0700
Subject: [PATCH] inkscape: update to 1.2.2

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  13 +-
 4 files changed, 8 insertions(+), 227 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..2b52eba99835 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,10 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=5
+version=1.2.2
+revision=1
+_pkgdate="2022-12-01"
+_pkgcommit="b0a8486541"
+wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -12,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: [PR PATCH] [Updated] inkscape: update to 1.2.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (50 preceding siblings ...)
  2022-12-07  5:43 ` [PR PATCH] [Updated] " hervyqa
@ 2022-12-07  6:12 ` hervyqa
  2023-01-08 22:16 ` manfredu
                   ` (3 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: hervyqa @ 2022-12-07  6:12 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages inkscape
https://github.com/void-linux/void-packages/pull/35454

inkscape: update to 1.2.2
add `python3-cssselect` to open "Manage Extensions" dialog.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl)

#### 1.1.2 (x86_64)

![image](https://user-images.githubusercontent.com/45872139/152723191-4f9a8384-fedb-48e5-8989-fc0a52eda812.png)

### Update:
#### 1.2.1 (x86_64)

![Screenshot_20220518_144113](https://user-images.githubusercontent.com/45872139/168985134-2279a126-8c42-4fcc-8d33-21bef08be529.png)

#### 1.2.1 (x86_64-musl)

![Screenshot_20220518_090746](https://user-images.githubusercontent.com/45872139/169003017-2cfe0bbc-d002-4390-9316-f7eb816e4a20.png)

A patch file from https://github.com/void-linux/void-packages/pull/35454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-35454.patch --]
[-- Type: text/x-diff, Size: 11946 bytes --]

From b2c0961c3bd6a365a058cf4f2b534a51f53b26d1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sun, 4 Dec 2022 09:48:49 +0700
Subject: [PATCH] inkscape: update to 1.2.2

---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 srcpkgs/inkscape/template                     |  10 +-
 4 files changed, 5 insertions(+), 227 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..43edd634ed12 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=5
+version=1.2.2
+revision=1
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -12,15 +12,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  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-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect
+ python3-lxml python3-numpy python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

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

* Re: inkscape: update to 1.2.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (51 preceding siblings ...)
  2022-12-07  6:12 ` [PR PATCH] [Updated] inkscape: update to 1.2.2 hervyqa
@ 2023-01-08 22:16 ` manfredu
  2023-01-08 22:17 ` manfredu
                   ` (2 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: manfredu @ 2023-01-08 22:16 UTC (permalink / raw)
  To: ml

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

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1374941493

Comment:
I try to build inkscape with this template but without success:
````
=> inkscape-1.2.2_1: installing host dependencies: automake-1.16.5_1 pkg-config-0.29.2_3 libtool-2.4.7_3 intltool-0.51.0_6 gettext-0.21_4 glib-devel-2.74.0_3 perl-XML-Parser-2.46_4 which-2.21_3 cmake-3.25.1_1 ninja-1.11.1_2 ...
=> inkscape-1.2.2_1: installing target dependencies: harfbuzz-devel-5.1.0_2 libsoup-devel-2.74.0_1 gsl-devel-2.7.1_1 pango-devel-1.50.12_1 libatomic_ops-devel-7.6.14_1 double-conversion-devel-3.1.5_1 gc-devel-8.2.2_1 libwpd-devel-0.10.3_1 libcdr-devel-0.1.7_4 libvisio-devel-0.1.7_5 poppler-devel-22.12.0_1 libwpd-devel-0.10.3_1 potrace-devel-1.16_2 gtkmm-devel-3.24.5_1 gdl-devel-3.40.0_1 gtkspell3-devel-3.0.10_3 aspell-devel-0.60.8_5 libxslt-devel-1.1.37_2 libgomp-devel-12.2.0_1 libwpg-devel-0.3.3_1 poppler-glib-devel-22.12.0_1 ...
=> inkscape-1.2.2_1: removing autodeps, please wait...
=> ERROR: inkscape-1.2.2_1: failed to install target dependencies! (error 19)
ncurses-libs-6.2_4 in transaction breaks installed pkg `ncurses-6.3_1'                                                  
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
````

What is causing this...? 

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

* Re: inkscape: update to 1.2.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (52 preceding siblings ...)
  2023-01-08 22:16 ` manfredu
@ 2023-01-08 22:17 ` manfredu
  2023-01-08 22:27 ` paper42
  2023-01-08 22:43 ` manfredu
  55 siblings, 0 replies; 57+ messages in thread
From: manfredu @ 2023-01-08 22:17 UTC (permalink / raw)
  To: ml

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

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1374941493

Comment:
I try to build inkscape with this template but without success:
````
=> inkscape-1.2.2_1: installing host dependencies: automake-1.16.5_1 pkg-config-0.29.2_3 libtool-2.4.7_3 intltool-0.51.0_6 gettext-0.21_4 glib-devel-2.74.0_3 perl-XML-Parser-2.46_4 which-2.21_3 cmake-3.25.1_1 ninja-1.11.1_2 ...
=> inkscape-1.2.2_1: installing target dependencies: harfbuzz-devel-5.1.0_2 libsoup-devel-2.74.0_1 gsl-devel-2.7.1_1 pango-devel-1.50.12_1 libatomic_ops-devel-7.6.14_1 double-conversion-devel-3.1.5_1 gc-devel-8.2.2_1 libwpd-devel-0.10.3_1 libcdr-devel-0.1.7_4 libvisio-devel-0.1.7_5 poppler-devel-22.12.0_1 libwpd-devel-0.10.3_1 potrace-devel-1.16_2 gtkmm-devel-3.24.5_1 gdl-devel-3.40.0_1 gtkspell3-devel-3.0.10_3 aspell-devel-0.60.8_5 libxslt-devel-1.1.37_2 libgomp-devel-12.2.0_1 libwpg-devel-0.3.3_1 poppler-glib-devel-22.12.0_1 ...
=> inkscape-1.2.2_1: removing autodeps, please wait...
=> ERROR: inkscape-1.2.2_1: failed to install target dependencies! (error 19)
ncurses-libs-6.2_4 in transaction breaks installed pkg `ncurses-6.3_1'                                                  
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
````

What could be causing this...? 

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

* Re: inkscape: update to 1.2.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (53 preceding siblings ...)
  2023-01-08 22:17 ` manfredu
@ 2023-01-08 22:27 ` paper42
  2023-01-08 22:43 ` manfredu
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2023-01-08 22:27 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1374944077

Comment:
> What could be causing this...?

Something on your side, try rebasing this branch on top of master and deleting hostdir/binpkgs, it could have an old build of ncurses.

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

* Re: inkscape: update to 1.2.2
  2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
                   ` (54 preceding siblings ...)
  2023-01-08 22:27 ` paper42
@ 2023-01-08 22:43 ` manfredu
  55 siblings, 0 replies; 57+ messages in thread
From: manfredu @ 2023-01-08 22:43 UTC (permalink / raw)
  To: ml

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

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/35454#issuecomment-1374947613

Comment:
> > What could be causing this...?
> 
> Something on your side, try rebasing this branch on top of master and deleting hostdir/binpkgs, it could have an old build of ncurses.

Deleting hostdir/binpkgs did help, thanks!



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

end of thread, other threads:[~2023-01-08 22:43 UTC | newest]

Thread overview: 57+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-07  4:11 [PR PATCH] inkscape: update to 1.1.2 hervyqa
2022-02-07  5:15 ` hervyqa
2022-02-23 16:11 ` tibequadorian
2022-02-23 23:32 ` hervyqa
2022-02-23 23:33 ` hervyqa
2022-02-23 23:38 ` hervyqa
2022-05-18  3:41 ` [PR PATCH] [Updated] " hervyqa
2022-05-18  3:59 ` [PR PATCH] [Updated] inkscape: update to 1.2 hervyqa
2022-05-18  4:12 ` hervyqa
2022-05-18  5:05 ` hervyqa
2022-05-18  5:38 ` hervyqa
2022-05-18  8:52 ` [PR PATCH] [Updated] " hervyqa
2022-05-19 14:50 ` ericonr
2022-05-20  4:34 ` hervyqa
2022-05-21 15:54 ` ericonr
2022-05-21 15:55 ` ericonr
2022-05-21 23:05 ` hervyqa
2022-05-21 23:11 ` [PR PATCH] [Updated] " hervyqa
2022-05-21 23:19 ` hervyqa
2022-05-22  1:59 ` ericonr
2022-05-23 14:10 ` hervyqa
2022-05-23 14:12 ` hervyqa
2022-05-25  1:46 ` ericonr
2022-05-27 15:33 ` hsnfirdaus
2022-05-27 18:52 ` hervyqa
2022-05-31 23:36 ` hervyqa
2022-05-31 23:36 ` hervyqa
2022-06-23 10:13 ` [PR PATCH] [Updated] " hervyqa
2022-06-23 11:24 ` hervyqa
2022-06-23 11:44 ` hervyqa
2022-06-23 11:59 ` hervyqa
2022-06-30 18:53 ` [PR REVIEW] " ericonr
2022-06-30 20:05 ` hervyqa
2022-06-30 20:17 ` [PR PATCH] [Updated] " hervyqa
2022-06-30 20:27 ` hervyqa
2022-07-07  6:25 ` hervyqa
2022-07-09 13:09 ` hervyqa
2022-07-09 13:11 ` hervyqa
2022-07-09 19:00 ` oreo639
2022-07-09 19:01 ` oreo639
2022-07-09 19:09 ` oreo639
2022-07-10  0:01 ` [PR PATCH] [Updated] " hervyqa
2022-07-15  1:43 ` hervyqa
2022-07-15  2:24 ` inkscape: update to 1.2.1 hervyqa
2022-07-16  7:24 ` paper42
2022-07-16  8:50 ` [PR PATCH] [Updated] " hervyqa
2022-07-16  8:55 ` hervyqa
2022-07-17 20:15 ` [PR PATCH] [Updated] " hervyqa
2022-09-25  0:16 ` dmarto
2022-09-25  7:59 ` [PR PATCH] [Updated] " hervyqa
2022-09-25  8:40 ` hervyqa
2022-12-07  5:43 ` [PR PATCH] [Updated] " hervyqa
2022-12-07  6:12 ` [PR PATCH] [Updated] inkscape: update to 1.2.2 hervyqa
2023-01-08 22:16 ` manfredu
2023-01-08 22:17 ` manfredu
2023-01-08 22:27 ` paper42
2023-01-08 22:43 ` manfredu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).