diff --git a/.SRCINFO b/.SRCINFO index 90b2c90e..5eab43ce 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = inkscape-git pkgdesc = An Open Source vector graphics editor, using SVG file format, from git master - pkgver = 1.1.alpha.r199.g30c0b84b2b + pkgver = 1.1.alpha.r776.g85311d94fe pkgrel = 1 epoch = 5 url = https://gitlab.com/inkscape @@ -46,9 +46,10 @@ pkgbase = inkscape-git source = inkscape.git::git+https://gitlab.com/inkscape/inkscape.git source = extensions.git::git+https://gitlab.com/inkscape/extensions.git source = lib2geom.git::git+https://gitlab.com/inkscape/lib2geom.git + source = poppler:21.11.patch::https://gitlab.com/inkscape/inkscape/-/merge_requests/3622.patch sha1sums = SKIP sha1sums = SKIP sha1sums = SKIP + sha1sums = 60f7b1e065f935d7d055f7d5fbe79f19c737cc3d pkgname = inkscape-git - diff --git a/PKGBUILD b/PKGBUILD index d0ee41a3..6b3fdcc4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: bartus pkgname=inkscape-git -pkgver=1.1.alpha.r199.g30c0b84b2b +pkgver=1.1.alpha.r776.g85311d94fe pkgrel=1 epoch=5 pkgdesc="An Open Source vector graphics editor, using SVG file format, from git master" @@ -24,10 +24,12 @@ conflicts=('inkscape') options=('!libtool' '!buildflags') source=("inkscape.git::git+$url/inkscape.git" "extensions.git::git+$url/extensions.git" - "lib2geom.git::git+$url/lib2geom.git") + "lib2geom.git::git+$url/lib2geom.git" + "poppler:21.11.patch::https://gitlab.com/inkscape/inkscape/-/merge_requests/3622.patch") sha1sums=('SKIP' 'SKIP' - 'SKIP') + 'SKIP' + '60f7b1e065f935d7d055f7d5fbe79f19c737cc3d') _gitname="inkscape.git" prepare() { @@ -35,6 +37,7 @@ prepare() { git config submodule.share/extensions.url ${srcdir}/extensions.git git config submodule.src/3rdparty/2geom.url ${srcdir}/lib2geom.git git submodule update --init --remote + git apply -v "${srcdir}"/poppler:21.11.patch } pkgver() { -- 2.51.2 From 48dbbdf56683edd80b7fb991ea9bc55418320143 Mon Sep 17 00:00:00 2001 From: bartus Date: Thu, 25 Nov 2021 10:00:22 +0100 Subject: [PATCH 2/2] Retract upstream applied patch --- .SRCINFO | 4 +--- PKGBUILD | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5eab43ce..c7b0deac 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = inkscape-git pkgdesc = An Open Source vector graphics editor, using SVG file format, from git master - pkgver = 1.1.alpha.r776.g85311d94fe + pkgver = 1.1.alpha.r960.g4df970686a pkgrel = 1 epoch = 5 url = https://gitlab.com/inkscape @@ -46,10 +46,8 @@ pkgbase = inkscape-git source = inkscape.git::git+https://gitlab.com/inkscape/inkscape.git source = extensions.git::git+https://gitlab.com/inkscape/extensions.git source = lib2geom.git::git+https://gitlab.com/inkscape/lib2geom.git - source = poppler:21.11.patch::https://gitlab.com/inkscape/inkscape/-/merge_requests/3622.patch sha1sums = SKIP sha1sums = SKIP sha1sums = SKIP - sha1sums = 60f7b1e065f935d7d055f7d5fbe79f19c737cc3d pkgname = inkscape-git diff --git a/PKGBUILD b/PKGBUILD index 6b3fdcc4..1e26cdec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: bartus pkgname=inkscape-git -pkgver=1.1.alpha.r776.g85311d94fe +pkgver=1.1.alpha.r960.g4df970686a pkgrel=1 epoch=5 pkgdesc="An Open Source vector graphics editor, using SVG file format, from git master" @@ -24,12 +24,10 @@ conflicts=('inkscape') options=('!libtool' '!buildflags') source=("inkscape.git::git+$url/inkscape.git" "extensions.git::git+$url/extensions.git" - "lib2geom.git::git+$url/lib2geom.git" - "poppler:21.11.patch::https://gitlab.com/inkscape/inkscape/-/merge_requests/3622.patch") + "lib2geom.git::git+$url/lib2geom.git") sha1sums=('SKIP' 'SKIP' - 'SKIP' - '60f7b1e065f935d7d055f7d5fbe79f19c737cc3d') + 'SKIP') _gitname="inkscape.git" prepare() { @@ -37,7 +35,6 @@ prepare() { git config submodule.share/extensions.url ${srcdir}/extensions.git git config submodule.src/3rdparty/2geom.url ${srcdir}/lib2geom.git git submodule update --init --remote - git apply -v "${srcdir}"/poppler:21.11.patch } pkgver() {