[arch-commits] Commit in gnome-documents/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, September 9, 2021 @ 20:52:14
  Author: heftig
Revision: 423692

archrelease: copy trunk to extra-x86_64

Added:
  gnome-documents/repos/extra-x86_64/0001-getting-started-Fix-the-build-with-inkscape-1.0.patch
    (from rev 423691, gnome-documents/trunk/0001-getting-started-Fix-the-build-with-inkscape-1.0.patch)
  gnome-documents/repos/extra-x86_64/PKGBUILD
    (from rev 423691, gnome-documents/trunk/PKGBUILD)
Deleted:
  gnome-documents/repos/extra-x86_64/PKGBUILD

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

Copied: gnome-documents/repos/extra-x86_64/0001-getting-started-Fix-the-build-with-inkscape-1.0.patch (from rev 423691, gnome-documents/trunk/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:52:14 UTC (rev 423692)
@@ -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
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-09 20:51:57 UTC (rev 423691)
+++ PKGBUILD	2021-09-09 20:52:14 UTC (rev 423692)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-documents
-pkgver=3.34.0+6+g966b04ec
-pkgrel=1
-pkgdesc="A document manager application for GNOME"
-url="https://wiki.gnome.org/Apps/Documents"
-arch=(x86_64)
-license=(GPL)
-depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
-         tracker-miners libzapojit webkit2gtk gnome-online-miners librsvg
-         libgepub gnome-epub-thumbnailer)
-makedepends=(gobject-introspection git meson yelp-tools inkscape)
-optdepends=('libreoffice-fresh: Support for Libreoffice document types')
-groups=(gnome)
-_commit=966b04ec9601e2a6bf337c851fc9762524a7b7c6  # master
-source=("git+https://gitlab.gnome.org/GNOME/gnome-documents.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url subprojects/libgd "$srcdir/libgd"
-  git submodule update
-}
-  
-
-build() {
-  arch-meson $pkgname build -D getting_started=true
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-documents/repos/extra-x86_64/PKGBUILD (from rev 423691, gnome-documents/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-09 20:52:14 UTC (rev 423692)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=gnome-documents
+pkgver=3.34.0+34+g678141fa
+pkgrel=1
+pkgdesc="A document manager application for GNOME"
+url="https://wiki.gnome.org/Apps/Documents"
+arch=(x86_64)
+license=(GPL)
+depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
+         tracker-miners libzapojit webkit2gtk gnome-online-miners librsvg
+         libgepub gnome-epub-thumbnailer)
+makedepends=(gobject-introspection git meson yelp-tools inkscape)
+optdepends=('libreoffice-fresh: Support for Libreoffice document types')
+groups=(gnome-extra)
+_commit=678141fa4cdce0af0baccff965c27734b0c4546b  # master
+source=("git+https://gitlab.gnome.org/GNOME/gnome-documents.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        0001-getting-started-Fix-the-build-with-inkscape-1.0.patch)
+sha256sums=('SKIP'
+            'SKIP'
+            '9c7dea42e61b179c780795ae3441ec92a06d5660242649f39aaf441d0b1bb6c0')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+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
+}
+  
+
+build() {
+  arch-meson $pkgname build -D getting_started=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et: