Github messages for voidlinux
 help / color / mirror / Atom feed
From: atk <atk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] inkscape: update to 1.3.1
Date: Fri, 24 Nov 2023 10:25:23 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47374@inbox.vuxu.org> (raw)

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

             reply	other threads:[~2023-11-24  9:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-24  9:25 atk [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47374@inbox.vuxu.org \
    --to=atk@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).