Notification time stamped 2020-01-31 22:44:16 UTC
From 282f16eecb7d9d0d0337851b935657be561ca706 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 22:44:08 +0000
Subject: fix FTBFS
---
diff --git a/tkimg-gcc10.patch b/tkimg-gcc10.patch
new file mode 100644
index 0000000..06d587a
--- /dev/null
+++ b/tkimg-gcc10.patch
@@ -0,0 +1,12 @@
+diff -up tkimg1.4/libpng/pngtclDecls.h.gcc10 tkimg1.4/libpng/pngtclDecls.h
+--- tkimg1.4/libpng/pngtclDecls.h.gcc10 2020-01-31 17:40:40.391470848 -0500
++++ tkimg1.4/libpng/pngtclDecls.h 2020-01-31 17:40:45.791358236 -0500
+@@ -1104,7 +1104,7 @@ typedef struct PngtclStubs {
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
++extern PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/tkimg.spec b/tkimg.spec
index 7b4d17a..a41cb5c 100644
--- a/tkimg.spec
+++ b/tkimg.spec
@@ -3,7 +3,7 @@
Name: tkimg
Version: 1.4
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: Image support library for Tk
License: BSD
URL:
http://sourceforge.net/projects/tkimg
@@ -22,6 +22,8 @@ Patch6: tkimg-zlib127-gzgetc_fix.patch
# changes in libpng16
Patch7: tkimg-libpng16.patch
Patch8: tkimg-libpng-deprecated.patch
+# gcc10 has -fno-common by default
+Patch9: tkimg-gcc10.patch
# A request to allow building with system libraries has been submitted
#
https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&...
@@ -67,6 +69,7 @@ rm -rf compat/libtiff
%patch6 -p1 -b .gzgetc_fix
%patch7 -p1 -b .png16
%patch8 -p1 -b .deprecated
+%patch9 -p1 -b .gcc10
%build
%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
--disable-threads --enable-64bit
@@ -105,6 +108,9 @@ done
%{tcl_sitearch}/Img1.4/*.a
%changelog
+* Fri Jan 31 2020 Tom Callaway <spot(a)fedoraproject.org> - 1.4-32
+- fix FTBFS
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-31
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/tkimg/c/282f16eecb7d9d0d0337851b935657...