* [PR PATCH] inkscape: update to 1.1
@ 2021-06-07 4:35 hervyqa
2021-06-07 5:21 ` hervyqa
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: hervyqa @ 2021-06-07 4:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]
There is a new pull request by hervyqa against master on the void-packages repository
https://github.com/hervyqa/void-packages master
https://github.com/void-linux/void-packages/pull/31336
inkscape: update to 1.1
- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff idk (failed).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
#### Result
![Screenshot_20210607_111320](https://user-images.githubusercontent.com/45872139/120958201-65596c80-c781-11eb-9959-910ecc3f0695.png)
A patch file from https://github.com/void-linux/void-packages/pull/31336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-31336.patch --]
[-- Type: text/x-diff, Size: 4449 bytes --]
From fedaefbca4f813c5d49ba870d7992d6fe0dee645 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 7 Jun 2021 11:00:24 +0700
Subject: [PATCH] inkscape: update to 1.1
- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff
idk, failed.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
srcpkgs/inkscape/template | 12 ++--
2 files changed, 6 insertions(+), 71 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
deleted file mode 100644
index b959bcd76fdc..000000000000
--- a/srcpkgs/inkscape/patches/glib-extern-C.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Wed, 17 Feb 2021 09:13:49 +0000
-Subject: [PATCH] Fix build with glib 2.67.3.
-
-As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
-blocks. It was indirectly included by both "types.h" and "color.h".
-"types.h" already does not need to be wrapped in an extern "C" block,
-"color.h" does but can be modified not to, so with that changed they can
-be moved out.
----
- src/3rdparty/autotrace/autotrace.h | 6 +++---
- src/3rdparty/autotrace/color.h | 7 +++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
-index 2ce6f272a9..e56be9a74c 100644
---- a/src/3rdparty/autotrace/autotrace.h
-+++ b/src/3rdparty/autotrace/autotrace.h
-@@ -23,6 +23,9 @@
-
- #include <stdio.h>
-
-+#include "types.h"
-+#include "color.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-@@ -35,9 +38,6 @@ extern "C" {
- * Typedefs
- * ===================================================================== */
-
--#include "types.h"
--#include "color.h"
--
- /* Third degree is the highest we deal with. */
- enum _at_polynomial_degree {
- AT_LINEARTYPE = 1,
-diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
-index e50ab30ae0..88651db9f7 100644
---- a/src/3rdparty/autotrace/color.h
-+++ b/src/3rdparty/autotrace/color.h
-@@ -24,6 +24,10 @@
- #include <glib.h>
- #include <glib-object.h>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- typedef struct _at_color at_color;
- struct _at_color {
- guint8 r;
-@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
- GType at_color_get_type(void);
- #define AT_TYPE_COLOR (at_color_get_type ())
-
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
- #endif /* not AT_COLOR_H */
---
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 6339519c22f9..c9890539007c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,8 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.0.2
-revision=3
-wrksrc="inkscape-${version}_2021-01-15_e86c870879"
+version=1.1
+revision=1
+wrksrc="inkscape-${version}_2021-05-24_c4e8f9ed74"
build_style=cmake
# builds executables then runs checks
# FIXME: some tests still fail on musl
@@ -13,15 +13,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour python3-Pillow"
checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
short_desc="Vector-based drawing program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
# link from https://inkscape.org/release/all/source/archive/
-distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
-checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
+distfiles="https://inkscape.org/gallery/item/26932/inkscape-${version}.tar.xz"
+checksum=71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
python_version=3
patch_args=-Np1
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
@ 2021-06-07 5:21 ` hervyqa
2021-06-07 5:36 ` hervyqa
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: hervyqa @ 2021-06-07 5:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by hervyqa on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855586527
Comment:
failed to build :D
any suggestion @ericonr ?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
2021-06-07 5:21 ` hervyqa
@ 2021-06-07 5:36 ` hervyqa
2021-06-07 11:17 ` ericonr
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: hervyqa @ 2021-06-07 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by hervyqa on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855594166
Comment:
![Screenshot_20210607_123223](https://user-images.githubusercontent.com/45872139/120964033-d4888e00-c78c-11eb-9c05-6c5c92f13b9d.png)
btw, success in my machine.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
2021-06-07 5:21 ` hervyqa
2021-06-07 5:36 ` hervyqa
@ 2021-06-07 11:17 ` ericonr
2021-06-07 11:17 ` [PR PATCH] [Closed]: " ericonr
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-06-07 11:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855839424
Comment:
Update is happening in #31149, though we should pull in your pillow change. Will close this as duplicate.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (2 preceding siblings ...)
2021-06-07 11:17 ` ericonr
@ 2021-06-07 11:17 ` ericonr
2021-06-07 11:23 ` atk
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-06-07 11:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
There's a closed pull request on the void-packages repository
inkscape: update to 1.1
https://github.com/void-linux/void-packages/pull/31336
Description:
- remove old patch
- add python3-Pillow: support new feature export to webp and jpg. tiff idk (failed).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
#### Result
![Screenshot_20210607_111320](https://user-images.githubusercontent.com/45872139/120958201-65596c80-c781-11eb-9959-910ecc3f0695.png)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (3 preceding siblings ...)
2021-06-07 11:17 ` [PR PATCH] [Closed]: " ericonr
@ 2021-06-07 11:23 ` atk
2021-06-07 11:26 ` atk
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: atk @ 2021-06-07 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855843404
Comment:
Should we both be co-maintainers?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (4 preceding siblings ...)
2021-06-07 11:23 ` atk
@ 2021-06-07 11:26 ` atk
2021-06-07 11:27 ` ericonr
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: atk @ 2021-06-07 11:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855843404
Comment:
Should we both be co-maintainers and if so, who should I add to the maintainers field?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (5 preceding siblings ...)
2021-06-07 11:26 ` atk
@ 2021-06-07 11:27 ` ericonr
2021-06-07 11:28 ` atk
2021-06-07 11:28 ` atk
8 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-06-07 11:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855845711
Comment:
Since @hervyqa wasn't adopting the package in this PR, I would just keep as is.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (6 preceding siblings ...)
2021-06-07 11:27 ` ericonr
@ 2021-06-07 11:28 ` atk
2021-06-07 11:28 ` atk
8 siblings, 0 replies; 11+ messages in thread
From: atk @ 2021-06-07 11:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855846364
Comment:
I was just asking since he was showing interest and I didn't want to take credits for his work.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: inkscape: update to 1.1
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
` (7 preceding siblings ...)
2021-06-07 11:28 ` atk
@ 2021-06-07 11:28 ` atk
8 siblings, 0 replies; 11+ messages in thread
From: atk @ 2021-06-07 11:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/31336#issuecomment-855846364
Comment:
I was just asking since he was showing interest and I didn't want to take credit for his work.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PR PATCH] inkscape: update to 1.1
@ 2021-05-27 15:09 atk
0 siblings, 0 replies; 11+ messages in thread
From: atk @ 2021-05-27 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages inkscape-1.1
https://github.com/void-linux/void-packages/pull/31149
inkscape: update to 1.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31149.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.1-31149.patch --]
[-- Type: text/x-diff, Size: 4446 bytes --]
From 5f70a8cb5f0aa1d9d752948d51ef0a0a44bb5098 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 27 May 2021 17:09:08 +0200
Subject: [PATCH] inkscape: update to 1.1
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 --------------------
srcpkgs/inkscape/template | 15 +++--
2 files changed, 7 insertions(+), 73 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
deleted file mode 100644
index b959bcd76fdc..000000000000
--- a/srcpkgs/inkscape/patches/glib-extern-C.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Wed, 17 Feb 2021 09:13:49 +0000
-Subject: [PATCH] Fix build with glib 2.67.3.
-
-As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
-blocks. It was indirectly included by both "types.h" and "color.h".
-"types.h" already does not need to be wrapped in an extern "C" block,
-"color.h" does but can be modified not to, so with that changed they can
-be moved out.
----
- src/3rdparty/autotrace/autotrace.h | 6 +++---
- src/3rdparty/autotrace/color.h | 7 +++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
-index 2ce6f272a9..e56be9a74c 100644
---- a/src/3rdparty/autotrace/autotrace.h
-+++ b/src/3rdparty/autotrace/autotrace.h
-@@ -23,6 +23,9 @@
-
- #include <stdio.h>
-
-+#include "types.h"
-+#include "color.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-@@ -35,9 +38,6 @@ extern "C" {
- * Typedefs
- * ===================================================================== */
-
--#include "types.h"
--#include "color.h"
--
- /* Third degree is the highest we deal with. */
- enum _at_polynomial_degree {
- AT_LINEARTYPE = 1,
-diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
-index e50ab30ae0..88651db9f7 100644
---- a/src/3rdparty/autotrace/color.h
-+++ b/src/3rdparty/autotrace/color.h
-@@ -24,6 +24,10 @@
- #include <glib.h>
- #include <glib-object.h>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- typedef struct _at_color at_color;
- struct _at_color {
- guint8 r;
-@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
- GType at_color_get_type(void);
- #define AT_TYPE_COLOR (at_color_get_type ())
-
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
- #endif /* not AT_COLOR_H */
---
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 6339519c22f9..fec4c7617580 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,14 +1,14 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.0.2
-revision=3
-wrksrc="inkscape-${version}_2021-01-15_e86c870879"
+version=1.1
+revision=1
+wrksrc="${pkgname}-${version}_2021-05-24_c4e8f9ed74"
build_style=cmake
# builds executables then runs checks
# FIXME: some tests still fail on musl
make_check_target=check
hostmakedepends="automake pkg-config libtool intltool gettext
- glib-devel perl-XML-Parser tar which xz"
+ glib-devel perl-XML-Parser which"
makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
@@ -16,12 +16,11 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
short_desc="Vector-based drawing program"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
-# link from https://inkscape.org/release/all/source/archive/
-distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
-checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
+distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
+checksum=71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
python_version=3
patch_args=-Np1
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-06-07 11:28 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 4:35 [PR PATCH] inkscape: update to 1.1 hervyqa
2021-06-07 5:21 ` hervyqa
2021-06-07 5:36 ` hervyqa
2021-06-07 11:17 ` ericonr
2021-06-07 11:17 ` [PR PATCH] [Closed]: " ericonr
2021-06-07 11:23 ` atk
2021-06-07 11:26 ` atk
2021-06-07 11:27 ` ericonr
2021-06-07 11:28 ` atk
2021-06-07 11:28 ` atk
-- strict thread matches above, loose matches on Subject: below --
2021-05-27 15:09 [PR PATCH] " atk
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).