Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Gregory Hellings
1c640dadca Fix builds 2022-03-18 23:10:08 -05:00
2 changed files with 20 additions and 1 deletions

13
minizip.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/gtk/utilities.c b/src/gtk/utilities.c
index 7dc1a49..708de8d 100644
--- a/src/gtk/utilities.c
+++ b/src/gtk/utilities.c
@@ -38,7 +38,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
-#include <zip.h>
+#include <minizip/zip.h>
#include <zlib.h>
#include "gui/utilities.h"

View file

@ -2,12 +2,13 @@
Name: xiphos
Version: 4.2.1
Release: 12%{?dist}
Release: 13%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
Source0: https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: glib_version.patch
Patch1: minizip.patch
BuildRequires: biblesync-devel >= 2.0.1-3
BuildRequires: cmake
BuildRequires: desktop-file-utils
@ -28,6 +29,7 @@ BuildRequires: sword-devel >= 1.8
BuildRequires: util-linux
BuildRequires: webkit2gtk3-devel
BuildRequires: yelp-tools
BuildRequires: libzip-devel
Requires: yelp
Obsoletes: xiphos-gtk2 < 4.1
Obsoletes: xiphos-gtk3 < 4.1
@ -47,6 +49,7 @@ Project and elsewhere.
%setup -q
rm -rf src/biblesync
%patch0 -p0
%patch1 -p1
%build
export CFLAGS="$CFLAGS -fPIC"
@ -96,6 +99,9 @@ rm -frv %{buildroot}%{_docdir}/%{name}
%{_mandir}/man1/%{name}-nav.1.gz
%changelog
* Fri Mar 18 2022 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-13
- Add minizip patch to fix FTBFS
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild