[skychart] Patch to make it compile with gcc 4.7
mattia
mattia at fedoraproject.org
Sat Jan 21 10:45:10 UTC 2012
commit cf1c9ee20f82967ee021e63976ddd1c26bdc095d
Author: Mattia Verga <mattia.verga at tiscali.it>
Date: Sat Jan 21 11:44:21 2012 +0100
Patch to make it compile with gcc 4.7
gcc47.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
skychart.spec | 7 ++++++-
2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/gcc47.patch b/gcc47.patch
new file mode 100644
index 0000000..e8a08da
--- /dev/null
+++ b/gcc47.patch
@@ -0,0 +1,43 @@
+--- a/skychart/library/getdss/Makefile 2010-02-24 15:50:16.000000000 +0100
++++ b/skychart/library/getdss/Makefile 2012-01-21 10:03:18.698178924 +0100
+@@ -7,15 +7,15 @@
+ LDFLAGS= -Wl,-single_module -dynamiclib -lc -lm -lstdc++
+ else
+ SO_Name = libgetdss.so
+-LDFLAGS= -shared -WL,-soname,$(SO_Name) $(arch_flags)
++LDFLAGS= -shared -Wl,-soname,$(SO_Name) $(arch_flags)
+ endif
+ ifneq ($(findstring W32,$(OSTYPE)),)
+ SO_Name = libgetdss.dll
+-LDFLAGS= -shared -WL,-soname,$(SO_Name)
++LDFLAGS= -shared -Wl,-soname,$(SO_Name)
+ endif
+ ifneq ($(findstring MINGW,$(OSTYPE)),)
+ SO_Name = libgetdss.dll
+-LDFLAGS= -shared -WL,-soname,$(SO_Name)
++LDFLAGS= -shared -Wl,-soname,$(SO_Name)
+ endif
+ OBJS = getdss_lib.o dss.o extr_fit.o getpiece.o \
+ hdcmprss.o bitinput.o decode.o dodecode.o hinv.o \
+
+--- a/skychart/library/plan404/Makefile 2010-02-24 15:50:16.000000000 +0100
++++ b/skychart/library/plan404/Makefile 2012-01-21 10:11:04.613575094 +0100
+@@ -8,15 +8,15 @@
+ LIBFLAGS = -Wl,-single_module -dynamiclib -lc -lm
+ else
+ SO_Name = libplan404.so
+-LIBFLAGS = -shared -WL,-soname,$(SO_Name) -lc -lm
++LIBFLAGS = -shared -Wl,-soname,$(SO_Name) -lc -lm
+ endif
+ ifneq ($(findstring W32,$(OSTYPE)),)
+ SO_Name = libplan404.dll
+-LIBFLAGS = -shared -WL,-soname,$(SO_Name) -lm
++LIBFLAGS = -shared -Wl,-soname,$(SO_Name) -lm
+ endif
+ ifneq ($(findstring MINGW,$(OSTYPE)),)
+ SO_Name = libplan404.dll
+-LIBFLAGS = -shared -WL,-soname,$(SO_Name) -lm
++LIBFLAGS = -shared -Wl,-soname,$(SO_Name) -lm
+ endif
+
+ .PHONY: clean
diff --git a/skychart.spec b/skychart.spec
index 662926d..f33aabe 100644
--- a/skychart.spec
+++ b/skychart.spec
@@ -1,6 +1,6 @@
Name: skychart
Version: 3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Planetarium software for the advanced amateur astronomer
Group: Amusements/Graphics
@@ -11,6 +11,7 @@ Source1: http://download.origo.ethz.ch/skychart/2443/data_jpleph.tgz
Patch1: skychart-desktop.patch
Patch2: skychart-strip.patch
Patch3: skychart-wgetdata.patch
+Patch4: gcc47.patch
# FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
# no lazarus on s390(x)
@@ -39,6 +40,7 @@ atlas more complete than a conventional planetarium.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cp -p %SOURCE1 BaseData
find skychart -type f -print0 |xargs -0 chmod 644
@@ -102,6 +104,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop
%changelog
+* Sat Jan 21 2012 Mattia Verga <mattia.verga at tiscali.it> - 3.4-3
+- Patch to make it compile with gcc 4.7
+
* Fri Jan 20 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.4-2
- Added missing source tarball
- Renamed patches
More information about the scm-commits
mailing list