[arch-commits] Commit in devhelp/trunk (3 files)

[Jan Steffens]

    Date: Thursday, November 25, 2021 @ 14:03:54
  Author: heftig
Revision: 429105

41.2-3: Unbreak gnome-builder, needs libsoup 2.4

Modified:
  devhelp/trunk/PKGBUILD
Deleted:
  devhelp/trunk/0001-gir-Fix-build-with-WebkitGTK-4.1.patch
  devhelp/trunk/0002-docs-Fix-build-with-WebkitGTK-4.1.patch

----------------------------------------------+
 0001-gir-Fix-build-with-WebkitGTK-4.1.patch  |   22 -----------
 0002-docs-Fix-build-with-WebkitGTK-4.1.patch |   50 -------------------------
 PKGBUILD                                     |   14 ++-----
 3 files changed, 4 insertions(+), 82 deletions(-)

Deleted: 0001-gir-Fix-build-with-WebkitGTK-4.1.patch
===================================================================
--- 0001-gir-Fix-build-with-WebkitGTK-4.1.patch	2021-11-25 13:51:55 UTC (rev 429104)
+++ 0001-gir-Fix-build-with-WebkitGTK-4.1.patch	2021-11-25 14:03:54 UTC (rev 429105)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar at gmail.com>
-Date: Fri, 1 Oct 2021 23:11:26 +0200
-Subject: [PATCH] gir: Fix build with WebkitGTK 4.1
-
----
- devhelp/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/devhelp/meson.build b/devhelp/meson.build
-index 010e563f8996..0afdbe760b1d 100644
---- a/devhelp/meson.build
-+++ b/devhelp/meson.build
-@@ -126,7 +126,7 @@ libdevhelp_gir = GNOME.generate_gir(
-   header: 'devhelp/devhelp.h',
-   identifier_prefix: 'Dh',
-   include_directories: ROOT_INCLUDE_DIR,
--  includes: ['Gtk-3.0', 'WebKit2-4.0'],
-+  includes: ['Gtk-3.0', 'WebKit2-' + webkit_abi],
-   install: true,
-   namespace: 'Devhelp',
-   nsversion: LIBDEVHELP_API_VERSION_FULL,

Deleted: 0002-docs-Fix-build-with-WebkitGTK-4.1.patch
===================================================================
--- 0002-docs-Fix-build-with-WebkitGTK-4.1.patch	2021-11-25 13:51:55 UTC (rev 429104)
+++ 0002-docs-Fix-build-with-WebkitGTK-4.1.patch	2021-11-25 14:03:54 UTC (rev 429105)
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar at gmail.com>
-Date: Fri, 1 Oct 2021 23:11:26 +0200
-Subject: [PATCH] docs: Fix build with WebkitGTK 4.1
-
----
- docs/reference/devhelp.toml.in | 2 +-
- docs/reference/meson.build     | 1 +
- meson.build                    | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/docs/reference/devhelp.toml.in b/docs/reference/devhelp.toml.in
-index 14d375036a1a..088bf1f54900 100644
---- a/docs/reference/devhelp.toml.in
-+++ b/docs/reference/devhelp.toml.in
-@@ -16,7 +16,7 @@ dependencies = ["Gtk-3.0",]
-   description = "The GTK toolkit"
-   docs_url = "https://developer.gnome.org/gtk3/stable/"
- 
--  [dependencies."WebKit2-4.0"]
-+  [dependencies."WebKit2- at webkit_abi@"]
-   name = "WebKitGTK 2"
-   description = "WebKit rendering widget for GTK"
-   docs_url = "https://webkitgtk.org/reference/webkit2gtk/stable/"
-diff --git a/docs/reference/meson.build b/docs/reference/meson.build
-index d689e234ba25..5566218a3c13 100644
---- a/docs/reference/meson.build
-+++ b/docs/reference/meson.build
-@@ -14,6 +14,7 @@ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
- if get_option('gtk_doc')
-   toml_data = configuration_data()
-   toml_data.set('version', meson.project_version())
-+  toml_data.set('webkit_abi', webkit_abi)
- 
-   devhelp_toml = configure_file(
-     input: 'devhelp.toml.in',
-diff --git a/meson.build b/meson.build
-index e57e466e963f..1570d68d3756 100644
---- a/meson.build
-+++ b/meson.build
-@@ -47,7 +47,9 @@ lt_age = 0
- LIBDEVHELP_LT_VERSION = '@0 at .@1 at .@2@'.format(lt_current, lt_revision, lt_age)
- 
- webkit_dep = dependency('webkit2gtk-4.1', required : false)
-+webkit_abi = '4.1'
- if not webkit_dep.found()
-+  webkit_abi = '4.0'
-   webkit_dep = dependency('webkit2gtk-4.0')
- endif
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-25 13:51:55 UTC (rev 429104)
+++ PKGBUILD	2021-11-25 14:03:54 UTC (rev 429105)
@@ -5,21 +5,17 @@
 pkgbase=devhelp
 pkgname=(devhelp devhelp-docs)
 pkgver=41.2
-pkgrel=2
+pkgrel=3
 pkgdesc="API documentation browser for GNOME"
 url="https://wiki.gnome.org/Apps/Devhelp"
 arch=(x86_64)
 license=(GPL)
-depends=(webkit2gtk-4.1)
+depends=(webkit2gtk)
 makedepends=(git appstream-glib gobject-introspection meson yelp-tools
              gi-docgen)
 _commit=f05e288031ba171e8a0a589d65cba693487726d9  # tags/41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/devhelp.git#commit=$_commit"
-        0001-gir-Fix-build-with-WebkitGTK-4.1.patch
-        0002-docs-Fix-build-with-WebkitGTK-4.1.patch)
-sha256sums=('SKIP'
-            'b9ee743c67d0e2f290c336a5925e485996c280da66306fb8106a9f4b91c85ba7'
-            '0bad708906ccb27c32c1f37c4fb39769929c0482dcf538d6065f12614cc5ce8f')
+source=("git+https://gitlab.gnome.org/GNOME/devhelp.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd devhelp
@@ -28,8 +24,6 @@
 
 prepare() {
   cd devhelp
-  git apply -3 ../0001-gir-Fix-build-with-WebkitGTK-4.1.patch
-  git apply -3 ../0002-docs-Fix-build-with-WebkitGTK-4.1.patch
 }
 
 build() {