From e8d2fa339a0af6c31e67cf8076619b19e5ccf060 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Mon, 25 Dec 2023 23:53:27 +0100 Subject: [PATCH] community/inkscape: upgrade to 1.3.2 --- community/inkscape/APKBUILD | 15 ++++----- community/inkscape/page_size.patch | 51 ------------------------------ 2 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 community/inkscape/page_size.patch diff --git a/community/inkscape/APKBUILD b/community/inkscape/APKBUILD index 0c9e66f4616..3ad6eb0de60 100644 --- a/community/inkscape/APKBUILD +++ b/community/inkscape/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa pkgname=inkscape -pkgver=1.3 -_pkgdate=2023-07-21 -_pkgcommit=0e150ed6c4 -pkgrel=3 +pkgver=1.3.2 +_pkgdate=2023-11-25 +_pkgcommit=091e20ef0f +pkgrel=0 pkgdesc="Vector-based drawing program - svg compliant" url="https://inkscape.org/" arch="all" @@ -54,9 +54,7 @@ subpackages=" $pkgname-view $pkgname-bash-completion " -source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.xz - page_size.patch - " +source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.xz" options="!check" # take extremely long and use absurd amounts of memory ldpath="/usr/lib/inkscape" builddir="$srcdir"/$pkgname-${pkgver}_${_pkgdate}_$_pkgcommit @@ -113,6 +111,5 @@ libinkscape_base() { } sha512sums=" -1eb488105586bf98a51c7109ab2e23292f039e5f0e66de4d3684a73f0ab408d89ee55560517d3185370ad3f32b31cf03d149df02ba5c895fe386dd1581fcb2e8 inkscape-1.3.tar.xz -c2a4b72a97b1d1a5fd5bdd3821125704095294664fa0ad8ac81c41bae0b695273a06629872414ee7e4b056f297f529af43eb264edc1695e0afe0973eb10c44fc page_size.patch +a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343 inkscape-1.3.2.tar.xz " diff --git a/community/inkscape/page_size.patch b/community/inkscape/page_size.patch deleted file mode 100644 index 15fcfb4705d..00000000000 --- a/community/inkscape/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: