From 067b123780a689c2572bf89203ce63be68c0dd6a Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 14 Aug 2023 08:39:26 +0200 Subject: [PATCH] fix FTBFS: apply patch to generated file replacing parentinstance with parent see https://github.com/hbons/webkit2-sharp/issues/6 --- webkit2-sharp-a59fd76-fix_parentinstance.patch | 11 +++++++++++ webkit2-sharp.spec | 11 +++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 webkit2-sharp-a59fd76-fix_parentinstance.patch diff --git a/webkit2-sharp-a59fd76-fix_parentinstance.patch b/webkit2-sharp-a59fd76-fix_parentinstance.patch new file mode 100644 index 0000000..19fd10e --- /dev/null +++ b/webkit2-sharp-a59fd76-fix_parentinstance.patch @@ -0,0 +1,11 @@ +--- a/sources/Makefile.am 2023-08-12 21:24:16.266564059 +0200 ++++ b/sources/Makefile.am 2023-08-12 21:25:33.461760068 +0200 +@@ -52,6 +52,7 @@ + --glue-includes=webkit2/webkit2.h, --gapidir=$(gapidir) \ + --assembly-name=$(ASSEMBLY_NAME) && \ + find $(srcdir)/generated/ -type f -name "*.cs" > $(GEN_SOURCES) ++ sed -i "s/parentInstance/parent/g" $(GLUEDIR)/generated.c + + $(SRC_FILES_XML): $(GEN_SOURCES) $(CUSTOM_SOURCES) + echo "" > $(SRC_FILES_XML) + diff --git a/webkit2-sharp.spec b/webkit2-sharp.spec index 0b6fba2..8387784 100644 --- a/webkit2-sharp.spec +++ b/webkit2-sharp.spec @@ -4,7 +4,7 @@ Name: webkit2-sharp Version: 0 -Release: 0.18%{?snapshotdate:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 0.19%{?snapshotdate:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: C# bindings for WebKit 2 with GTK+ 3 License: MIT @@ -15,6 +15,7 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz} Source0: %url/archive/%{commit}/%{name}-%{version}.tar.gz} Patch0: %{name}-a59fd76-fix_libdir.patch +Patch1: %{name}-a59fd76-fix_parentinstance.patch Requires: webkit2gtk3 BuildRequires: make @@ -51,10 +52,9 @@ Development files for WebKit2-sharp %prep %{?shortcommit: -%autosetup -n %{name}-%{commit}} +%autosetup -n %{name}-%{commit} -p1} %{!?shortcommit: -%autosetup -n %{name}-%{version}} - +%autosetup -n %{name}-%{version} -p1} %build ./autogen.sh @@ -85,6 +85,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Mon Aug 14 2023 Timotheus Pokorra - 0.0.19.20170219gita59fd76 +- fix FTBFS: apply patch to generated file replacing parentinstance with parent + * Sat Jul 22 2023 Fedora Release Engineering - 0-0.18.20170219gita59fd76 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild