From f4babcef5f141556b5bfb8e0bc0b256acbd362f3 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Jan 08 2022 16:43:57 +0000
Subject: Update to 42.alpha1


---

diff --git a/.gitignore b/.gitignore
index c689cd9..8d2fb5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@
 /gnome-builder-41.0.tar.xz
 /gnome-builder-41.1.tar.xz
 /gnome-builder-41.3.tar.xz
+/gnome-builder-42.alpha1.tar.xz
diff --git a/0001-flatpak-attempt-to-fix-build-on-i686.patch b/0001-flatpak-attempt-to-fix-build-on-i686.patch
deleted file mode 100644
index ec2151e..0000000
--- a/0001-flatpak-attempt-to-fix-build-on-i686.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fcf976d5fcfb81d14ea0ec9b9909bc9b8dc52a81 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Fri, 19 Nov 2021 08:27:28 -0600
-Subject: [PATCH] flatpak: attempt to fix build on i686
-
-There may be more problems, but this should fix the first build failure.
----
- src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
-index 0f2da7456..6e9d82732 100644
---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
-+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
-@@ -597,7 +597,7 @@ is_known_worker (GTask        *task,
-     }
- 
- finish:
--  g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size);
-+  g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size);
-   ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task),
-                                                  g_steal_pointer (&state->invocation),
-                                                  found,
--- 
-2.33.1
-
diff --git a/gnome-builder.spec b/gnome-builder.spec
index a0baae1..b8ebc50 100644
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -10,7 +10,7 @@
 %global glib2_version 2.65.0
 %global gtk3_version 3.22.26
 %global json_glib_version 1.2.0
-%global jsonrpc_glib_version 3.29.91
+%global jsonrpc_glib_version 3.41.0
 %global libpeas_version 1.22.0
 %global template_glib_version 3.28.0
 %global libgit2_glib_version 0.28.0.1
@@ -18,7 +18,7 @@
 %global sysprof_version 3.37.1
 
 Name:           gnome-builder
-Version:        41.3
+Version:        42~alpha1
 Release:        1%{?dist}
 Summary:        IDE for writing GNOME-based software
 
@@ -41,8 +41,6 @@ Summary:        IDE for writing GNOME-based software
 License:        GPLv3+ and GPLv2+ and LGPLv3+ and LGPLv2+ and MIT and CC-BY-SA and CC0
 URL:            https://wiki.gnome.org/Apps/Builder
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{tarball_version}.tar.xz
-# Backported from upstream
-Patch0:         0001-flatpak-attempt-to-fix-build-on-i686.patch
 
 BuildRequires:  clang-devel
 BuildRequires:  desktop-file-utils
@@ -65,7 +63,7 @@ BuildRequires:  pkgconfig(libdazzle-1.0) >= %{libdazzle_version}
 BuildRequires:  pkgconfig(libdevhelp-3.0) >= %{devhelp_version}
 BuildRequires:  pkgconfig(libgit2-glib-1.0) >= %{libgit2_glib_version}
 BuildRequires:  pkgconfig(libpeas-1.0) >= %{libpeas_version}
-BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(libpcre)
@@ -133,7 +131,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Builder.des
 %doc NEWS README.md
 %license COPYING
 %{_bindir}/gnome-builder
-%exclude %{_libdir}/gnome-builder/pkgconfig/
 %{_libdir}/gnome-builder/
 %{_libexecdir}/gnome-builder-clang
 %{_libexecdir}/gnome-builder-flatpak
@@ -147,16 +144,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Builder.des
 %dir %{_datadir}/gtksourceview-4
 %dir %{_datadir}/gtksourceview-4/styles
 %{_datadir}/gtksourceview-4/styles/*.xml
+%{_datadir}/gtksourceview-4/language-specs/*.lang
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Builder*.svg
 %{_datadir}/metainfo/org.gnome.Builder.appdata.xml
 %lang(en) %{_datadir}/doc/gnome-builder/en/
 
 %files devel
 %{_includedir}/gnome-builder*/
-%{_libdir}/gnome-builder/pkgconfig/
+%{_libdir}/pkgconfig/gnome-builder-*.pc
 %{_datadir}/gnome-builder/gir-1.0/
 
 %changelog
+* Sat Jan 08 2022 David King <amigadave@amigadave.com> - 42~alpha1-1
+- Update to 42.alpha1
+
 * Tue Dec 07 2021 Kalev Lember <klember@redhat.com> - 41.3-1
 - Update to 41.3
 
diff --git a/sources b/sources
index f0a68dd..dc3c87f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-builder-41.3.tar.xz) = 26ea632666991eeba5c5e6291b7e898e123623622989d96fa5e44156d08f44fae27f8ec341f01cbff5275becfa67b4d3b83239705535b60e323e03cfc9eebfe8
+SHA512 (gnome-builder-42.alpha1.tar.xz) = e1bd68d1c58470bc3a57490cf857ae79de9488639b5abd6c571b9c3b06b1a62bc842f695693656b5dc0d9795c5cc777d0401ed44ea54088d555873b7ac7d64b5