[arch-commits] Commit in gnome-documents/trunk (2 files)

[Jan Steffens]

    Date: Thursday, September 9, 2021 @ 20:51:57
  Author: heftig
Revision: 423691

3.34.0+34+g678141fa-1: FS#67942 Fix FTBFS

Added:
  gnome-documents/trunk/0001-getting-started-Fix-the-build-with-inkscape-1.0.patch
Modified:
  gnome-documents/trunk/PKGBUILD

------------------------------------------------------------+
 0001-getting-started-Fix-the-build-with-inkscape-1.0.patch |   23 +++++++++++
 PKGBUILD                                                   |   21 ++++++----
 2 files changed, 36 insertions(+), 8 deletions(-)

Added: 0001-getting-started-Fix-the-build-with-inkscape-1.0.patch
===================================================================
--- 0001-getting-started-Fix-the-build-with-inkscape-1.0.patch	                        (rev 0)
+++ 0001-getting-started-Fix-the-build-with-inkscape-1.0.patch	2021-09-09 20:51:57 UTC (rev 423691)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Wed, 26 Feb 2020 14:11:38 +0100
+Subject: [PATCH] getting-started: Fix the build with inkscape 1.0
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1799427
+---
+ getting-started/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/getting-started/meson.build b/getting-started/meson.build
+index 4cb4fe7d..9d9c63d2 100644
+--- a/getting-started/meson.build
++++ b/getting-started/meson.build
+@@ -21,7 +21,7 @@ foreach lingua: linguas
+       source,
+       input: join_paths(lingua, source + '.svg'),
+       output: source + '.pdf',
+-      command: [inkscape, '-z', '-A', '@OUTPUT@', '@INPUT@']
++      command: [inkscape, '--export-filename', '@OUTPUT@', '@INPUT@']
+     )
+   endforeach
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-09 20:51:37 UTC (rev 423690)
+++ PKGBUILD	2021-09-09 20:51:57 UTC (rev 423691)
@@ -1,7 +1,7 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=gnome-documents
-pkgver=3.34.0+6+g966b04ec
+pkgver=3.34.0+34+g678141fa
 pkgrel=1
 pkgdesc="A document manager application for GNOME"
 url="https://wiki.gnome.org/Apps/Documents"
@@ -13,11 +13,13 @@
 makedepends=(gobject-introspection git meson yelp-tools inkscape)
 optdepends=('libreoffice-fresh: Support for Libreoffice document types')
 groups=(gnome-extra)
-_commit=966b04ec9601e2a6bf337c851fc9762524a7b7c6  # master
+_commit=678141fa4cdce0af0baccff965c27734b0c4546b  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-documents.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        0001-getting-started-Fix-the-build-with-inkscape-1.0.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '9c7dea42e61b179c780795ae3441ec92a06d5660242649f39aaf441d0b1bb6c0')
 
 pkgver() {
   cd $pkgname
@@ -27,6 +29,9 @@
 prepare() {
   cd $pkgname
 
+  # https://bugs.archlinux.org/task/67942
+  git apply -3 ../0001-getting-started-Fix-the-build-with-inkscape-1.0.patch
+
   git submodule init
   git submodule set-url subprojects/libgd "$srcdir/libgd"
   git submodule update
@@ -35,7 +40,7 @@
 
 build() {
   arch-meson $pkgname build -D getting_started=true
-  ninja -C build
+  meson compile -C build
 }
 
 check() {
@@ -43,7 +48,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et: