* [PR PATCH] inkscape: update to 1.3.1
@ 2023-11-24 9:25 atk
2023-11-24 9:52 ` [PR PATCH] [Updated] " atk
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: atk @ 2023-11-24 9:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages inkscape-1.3.1
https://github.com/void-linux/void-packages/pull/47374
inkscape: update to 1.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.3.1-47374.patch --]
[-- Type: text/x-diff, Size: 3295 bytes --]
From 4422c73ec0ae81f2bc7caf4010bd1d84e6455829 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 24 Nov 2023 10:24:17 +0100
Subject: [PATCH] inkscape: update to 1.3.1
---
srcpkgs/inkscape/patches/musl_page_size.patch | 51 -------------------
srcpkgs/inkscape/template | 4 +-
2 files changed, 2 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/musl_page_size.patch
diff --git a/srcpkgs/inkscape/patches/musl_page_size.patch b/srcpkgs/inkscape/patches/musl_page_size.patch
deleted file mode 100644
index 15fcfb4705d71..0000000000000
--- a/srcpkgs/inkscape/patches/musl_page_size.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-PAGE_SIZE is a reserved identifier, but we should be abnle to safely rename it
-in the enum without breaking anything to still build against musl
---
-diff --git a/src/attributes.cpp b/src/attributes.cpp
-index e5abed3..9e0c459 100644
---- a/src/attributes.cpp
-+++ b/src/attributes.cpp
-@@ -142,7 +142,7 @@ static SPStyleProp const props[] = {
- /* SPPage */
- {SPAttr::PAGE_MARGIN, "margin"},
- {SPAttr::PAGE_BLEED, "bleed"},
-- {SPAttr::PAGE_SIZE, "page-size"},
-+ {SPAttr::PAGE_SIZEx, "page-size"},
- /* SPGrid */
- {SPAttr::ORIGINX, "originx"},
- {SPAttr::ORIGINY, "originy"},
-diff --git a/src/attributes.h b/src/attributes.h
-index 2b17b09..4e8470a 100644
---- a/src/attributes.h
-+++ b/src/attributes.h
-@@ -141,7 +141,7 @@ enum class SPAttr {
- /* SPPage */
- PAGE_MARGIN,
- PAGE_BLEED,
-- PAGE_SIZE,
-+ PAGE_SIZEx,
- /* SPGrid */
- ORIGINX,
- ORIGINY,
-diff --git a/src/object/sp-page.cpp b/src/object/sp-page.cpp
-index cc5c41f..4d0a1fc 100644
---- a/src/object/sp-page.cpp
-+++ b/src/object/sp-page.cpp
-@@ -42,7 +42,7 @@ void SPPage::build(SPDocument *document, Inkscape::XML::Node *repr)
- SPObject::build(document, repr);
-
- this->readAttr(SPAttr::INKSCAPE_LABEL);
-- this->readAttr(SPAttr::PAGE_SIZE);
-+ this->readAttr(SPAttr::PAGE_SIZEx);
- this->readAttr(SPAttr::X);
- this->readAttr(SPAttr::Y);
- this->readAttr(SPAttr::WIDTH);
-@@ -85,7 +85,7 @@ void SPPage::set(SPAttr key, const gchar *value)
- case SPAttr::PAGE_BLEED:
- this->bleed.readOrUnset(value);
- break;
-- case SPAttr::PAGE_SIZE:
-+ case SPAttr::PAGE_SIZEx:
- this->_size_label = value ? std::string(value) : "";
- break;
- default:
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 1e0e2c26b5c58..fcba13c18acec 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,6 +1,6 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.3
+version=1.3.1
revision=3
build_style=cmake
make_check_target="check"
@@ -20,7 +20,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://inkscape.org/"
distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307
+checksum=421e0035fe5b3b054a0865dc8235be3f9e6e2dea54190d926b880a4ce05b00d8
python_version=3
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
make_check=no
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] inkscape: update to 1.3.1
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
@ 2023-11-24 9:52 ` atk
2023-11-28 9:29 ` atk
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: atk @ 2023-11-24 9:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages inkscape-1.3.1
https://github.com/void-linux/void-packages/pull/47374
inkscape: update to 1.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.3.1-47374.patch --]
[-- Type: text/x-diff, Size: 3387 bytes --]
From 0d5e8450cf53073f38d7d29b73d289d5d1dd2620 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 24 Nov 2023 10:52:35 +0100
Subject: [PATCH] inkscape: update to 1.3.1
---
srcpkgs/inkscape/patches/musl_page_size.patch | 51 -------------------
srcpkgs/inkscape/template | 6 +--
2 files changed, 3 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/musl_page_size.patch
diff --git a/srcpkgs/inkscape/patches/musl_page_size.patch b/srcpkgs/inkscape/patches/musl_page_size.patch
deleted file mode 100644
index 15fcfb4705d71..0000000000000
--- a/srcpkgs/inkscape/patches/musl_page_size.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-PAGE_SIZE is a reserved identifier, but we should be abnle to safely rename it
-in the enum without breaking anything to still build against musl
---
-diff --git a/src/attributes.cpp b/src/attributes.cpp
-index e5abed3..9e0c459 100644
---- a/src/attributes.cpp
-+++ b/src/attributes.cpp
-@@ -142,7 +142,7 @@ static SPStyleProp const props[] = {
- /* SPPage */
- {SPAttr::PAGE_MARGIN, "margin"},
- {SPAttr::PAGE_BLEED, "bleed"},
-- {SPAttr::PAGE_SIZE, "page-size"},
-+ {SPAttr::PAGE_SIZEx, "page-size"},
- /* SPGrid */
- {SPAttr::ORIGINX, "originx"},
- {SPAttr::ORIGINY, "originy"},
-diff --git a/src/attributes.h b/src/attributes.h
-index 2b17b09..4e8470a 100644
---- a/src/attributes.h
-+++ b/src/attributes.h
-@@ -141,7 +141,7 @@ enum class SPAttr {
- /* SPPage */
- PAGE_MARGIN,
- PAGE_BLEED,
-- PAGE_SIZE,
-+ PAGE_SIZEx,
- /* SPGrid */
- ORIGINX,
- ORIGINY,
-diff --git a/src/object/sp-page.cpp b/src/object/sp-page.cpp
-index cc5c41f..4d0a1fc 100644
---- a/src/object/sp-page.cpp
-+++ b/src/object/sp-page.cpp
-@@ -42,7 +42,7 @@ void SPPage::build(SPDocument *document, Inkscape::XML::Node *repr)
- SPObject::build(document, repr);
-
- this->readAttr(SPAttr::INKSCAPE_LABEL);
-- this->readAttr(SPAttr::PAGE_SIZE);
-+ this->readAttr(SPAttr::PAGE_SIZEx);
- this->readAttr(SPAttr::X);
- this->readAttr(SPAttr::Y);
- this->readAttr(SPAttr::WIDTH);
-@@ -85,7 +85,7 @@ void SPPage::set(SPAttr key, const gchar *value)
- case SPAttr::PAGE_BLEED:
- this->bleed.readOrUnset(value);
- break;
-- case SPAttr::PAGE_SIZE:
-+ case SPAttr::PAGE_SIZEx:
- this->_size_label = value ? std::string(value) : "";
- break;
- default:
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 1e0e2c26b5c58..5a692f27f163a 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.3
-revision=3
+version=1.3.1
+revision=1
build_style=cmake
make_check_target="check"
hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel
@@ -20,7 +20,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://inkscape.org/"
distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307
+checksum=421e0035fe5b3b054a0865dc8235be3f9e6e2dea54190d926b880a4ce05b00d8
python_version=3
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
make_check=no
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] inkscape: update to 1.3.1
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
2023-11-24 9:52 ` [PR PATCH] [Updated] " atk
@ 2023-11-28 9:29 ` atk
2023-11-29 0:11 ` hervyqa
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: atk @ 2023-11-28 9:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages inkscape-1.3.1
https://github.com/void-linux/void-packages/pull/47374
inkscape: update to 1.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.3.1-47374.patch --]
[-- Type: text/x-diff, Size: 3387 bytes --]
From 91038179aa422762c376f00d881a2a9e27edba95 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Nov 2023 10:29:21 +0100
Subject: [PATCH] inkscape: update to 1.3.2
---
srcpkgs/inkscape/patches/musl_page_size.patch | 51 -------------------
srcpkgs/inkscape/template | 6 +--
2 files changed, 3 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/inkscape/patches/musl_page_size.patch
diff --git a/srcpkgs/inkscape/patches/musl_page_size.patch b/srcpkgs/inkscape/patches/musl_page_size.patch
deleted file mode 100644
index 15fcfb4705d71..0000000000000
--- a/srcpkgs/inkscape/patches/musl_page_size.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-PAGE_SIZE is a reserved identifier, but we should be abnle to safely rename it
-in the enum without breaking anything to still build against musl
---
-diff --git a/src/attributes.cpp b/src/attributes.cpp
-index e5abed3..9e0c459 100644
---- a/src/attributes.cpp
-+++ b/src/attributes.cpp
-@@ -142,7 +142,7 @@ static SPStyleProp const props[] = {
- /* SPPage */
- {SPAttr::PAGE_MARGIN, "margin"},
- {SPAttr::PAGE_BLEED, "bleed"},
-- {SPAttr::PAGE_SIZE, "page-size"},
-+ {SPAttr::PAGE_SIZEx, "page-size"},
- /* SPGrid */
- {SPAttr::ORIGINX, "originx"},
- {SPAttr::ORIGINY, "originy"},
-diff --git a/src/attributes.h b/src/attributes.h
-index 2b17b09..4e8470a 100644
---- a/src/attributes.h
-+++ b/src/attributes.h
-@@ -141,7 +141,7 @@ enum class SPAttr {
- /* SPPage */
- PAGE_MARGIN,
- PAGE_BLEED,
-- PAGE_SIZE,
-+ PAGE_SIZEx,
- /* SPGrid */
- ORIGINX,
- ORIGINY,
-diff --git a/src/object/sp-page.cpp b/src/object/sp-page.cpp
-index cc5c41f..4d0a1fc 100644
---- a/src/object/sp-page.cpp
-+++ b/src/object/sp-page.cpp
-@@ -42,7 +42,7 @@ void SPPage::build(SPDocument *document, Inkscape::XML::Node *repr)
- SPObject::build(document, repr);
-
- this->readAttr(SPAttr::INKSCAPE_LABEL);
-- this->readAttr(SPAttr::PAGE_SIZE);
-+ this->readAttr(SPAttr::PAGE_SIZEx);
- this->readAttr(SPAttr::X);
- this->readAttr(SPAttr::Y);
- this->readAttr(SPAttr::WIDTH);
-@@ -85,7 +85,7 @@ void SPPage::set(SPAttr key, const gchar *value)
- case SPAttr::PAGE_BLEED:
- this->bleed.readOrUnset(value);
- break;
-- case SPAttr::PAGE_SIZE:
-+ case SPAttr::PAGE_SIZEx:
- this->_size_label = value ? std::string(value) : "";
- break;
- default:
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 1e0e2c26b5c58..8506b71d353a1 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=1.3
-revision=3
+version=1.3.2
+revision=1
build_style=cmake
make_check_target="check"
hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel
@@ -20,7 +20,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://inkscape.org/"
distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307
+checksum=dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b
python_version=3
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
make_check=no
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: inkscape: update to 1.3.1
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
2023-11-24 9:52 ` [PR PATCH] [Updated] " atk
2023-11-28 9:29 ` atk
@ 2023-11-29 0:11 ` hervyqa
2023-12-01 13:21 ` atk
2023-12-02 7:35 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: hervyqa @ 2023-11-29 0:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by hervyqa on void-packages repository
https://github.com/void-linux/void-packages/pull/47374#issuecomment-1830979606
Comment:
please update to `1.3.2`
https://inkscape.org/release/inkscape-1.3.2/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: inkscape: update to 1.3.1
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
` (2 preceding siblings ...)
2023-11-29 0:11 ` hervyqa
@ 2023-12-01 13:21 ` atk
2023-12-02 7:35 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: atk @ 2023-12-01 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/47374#issuecomment-1836110503
Comment:
I had already done that.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: inkscape: update to 1.3.1
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
` (3 preceding siblings ...)
2023-12-01 13:21 ` atk
@ 2023-12-02 7:35 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2023-12-02 7:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
There's a merged pull request on the void-packages repository
inkscape: update to 1.3.1
https://github.com/void-linux/void-packages/pull/47374
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-02 7:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-24 9:25 [PR PATCH] inkscape: update to 1.3.1 atk
2023-11-24 9:52 ` [PR PATCH] [Updated] " atk
2023-11-28 9:29 ` atk
2023-11-29 0:11 ` hervyqa
2023-12-01 13:21 ` atk
2023-12-02 7:35 ` [PR PATCH] [Merged]: " classabbyamp
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).