Notification time stamped 2020-01-31 23:06:28 UTC
From 90f7f6043dba5b661a48bede516783d16a881237 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 23:06:20 +0000
Subject: fix FTBFS
---
diff --git a/sqlite-2.8.17-gcc10.patch b/sqlite-2.8.17-gcc10.patch
new file mode 100644
index 0000000..5e79c1c
--- /dev/null
+++ b/sqlite-2.8.17-gcc10.patch
@@ -0,0 +1,24 @@
+diff -up sqlite-2.8.17/src/btree.h.gcc10 sqlite-2.8.17/src/btree.h
+--- sqlite-2.8.17/src/btree.h.gcc10 2020-01-31 18:01:50.668986995 -0500
++++ sqlite-2.8.17/src/btree.h 2020-01-31 18:02:22.000333901 -0500
+@@ -149,7 +149,7 @@ int sqliteRbtreeOpen(const char *zFilena
+ (btOps(pBt)->PageDump(pBt, pgno, recursive))
+ #define sqliteBtreeCursorDump(pCur, aResult)\
+ (btCOps(pCur)->CursorDump(pCur, aResult))
+-int btree_native_byte_order;
++extern int btree_native_byte_order;
+ #endif /* SQLITE_TEST */
+
+
+diff -up sqlite-2.8.17/src/pager.h.gcc10 sqlite-2.8.17/src/pager.h
+--- sqlite-2.8.17/src/pager.h.gcc10 2020-01-31 18:02:39.963959449 -0500
++++ sqlite-2.8.17/src/pager.h 2020-01-31 18:02:58.769567449 -0500
+@@ -102,6 +102,6 @@ void sqlitepager_set_codec(Pager*,void(*
+
+ #ifdef SQLITE_TEST
+ void sqlitepager_refdump(Pager*);
+-int pager_refinfo_enable;
+-int journal_format;
++extern int pager_refinfo_enable;
++extern int journal_format;
+ #endif
diff --git a/sqlite2.spec b/sqlite2.spec
index 66d3558..2160daa 100644
--- a/sqlite2.spec
+++ b/sqlite2.spec
@@ -3,7 +3,7 @@
Name: sqlite2
Version: 2.8.17
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: Embeddable SQL engine in a C library
License: Public Domain
@@ -27,6 +27,7 @@ Patch15: sqlite-2.8.17-lemon-snprintf.patch
Patch16: sqlite-2.8.17-fix-sort-syntax.patch
Patch17: sqlite-2.8.17-ldflags.patch
Patch18: sqlite-2.8.17-fix-unsigned-FTBFS.patch
+Patch19: sqlite-2.8.17-gcc10.patch
BuildRequires: gcc-c++
BuildRequires: ncurses-devel, readline-devel, %{_includedir}/tcl.h
@@ -89,6 +90,7 @@ find . -type d -name CVS -print0 | xargs -0 rm -r
%patch16 -p1 -b .fix-sort-syntax
%patch17 -p1 -b .ldflags
%patch18 -p1 -b .unsigned-fix
+%patch19 -p1 -b .gcc10
sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in
# Patch additional /usr/lib locations where we don't have $(libdir)
# to substitute with.
@@ -136,6 +138,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/tclsqlite
%{tcl_sitearch}/sqlite2/
%changelog
+* Fri Jan 31 2020 Tom Callaway <spot(a)fedoraproject.org> - 2.8.17-32
+- fix FTBFS
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.8.17-31
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/sqlite2/c/90f7f6043dba5b661a48bede5167...