#1 Use webkit2gtk-4.1, fix flatpak build
Merged 9 months ago by atim. Opened 9 months ago by yselkowitz.
rpms/ yselkowitz/foliate rawhide  into  rawhide

file modified
+7 -2
@@ -18,11 +18,11 @@ 

  BuildRequires:  pkgconfig(gjs-1.0) >= 1.52

  BuildRequires:  pkgconfig(gtk+-3.0)

  BuildRequires:  pkgconfig(iso-codes) >= 3.67

- BuildRequires:  pkgconfig(webkit2gtk-4.0)

+ BuildRequires:  pkgconfig(webkit2gtk-4.1)

  

  Requires:       gjs

  Requires:       hicolor-icon-theme

- Requires:       webkit2gtk3

+ Requires:       webkit2gtk4.1

  

  # For text-to-speech (TTS) support

  Recommends:     espeak-ng
@@ -39,6 +39,11 @@ 

  

  %prep

  %autosetup -p1

+ # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version

+ # libsoup is not used directly

+ sed -i -e '/WebKit2/s/4\.0/4.1/' src/main.js

+ # do not use flatpak-spawn for runtime deps

+ sed -i -e 's/flatpak-spawn/do-not-use-&/' src/utils.js

  

  

  %build

https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version

Separately, the app should not call out to the host just for dictionary and TTS; these dependencies should be included in the flatpak instead.

Please consider these for f39 as well.

Pull-Request has been merged by atim

9 months ago
Metadata