[openeuclide] Fix FTBS on F21
Arun S A G
sagarun at fedoraproject.org
Mon Jun 30 02:05:23 UTC 2014
commit 9a3f59b7aeecc53b1641dff300753aa69a624256
Author: Arun S A G <sagarun at gmail.com>
Date: Sun Jun 29 19:05:20 2014 -0700
Fix FTBS on F21
.gitignore | 1 +
openeuclide-0.5-fix-Werror-format-security.patch | 53 ++++++++++++++++++++++
openeuclide-0.5.tgz | Bin 288511 -> 0 bytes
openeuclide.spec | 7 +++-
sources | 1 +
5 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6c632c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/openeuclide-0.5.tgz
diff --git a/openeuclide-0.5-fix-Werror-format-security.patch b/openeuclide-0.5-fix-Werror-format-security.patch
new file mode 100644
index 0000000..82801f3
--- /dev/null
+++ b/openeuclide-0.5-fix-Werror-format-security.patch
@@ -0,0 +1,53 @@
+diff -up ./src/diaBase.cc.orig ./src/diaBase.cc
+--- ./src/diaBase.cc.orig 2014-06-29 18:57:47.940592868 -0700
++++ ./src/diaBase.cc 2014-06-29 18:58:56.473959564 -0700
+@@ -93,13 +93,13 @@ bool errBase::run( bool bAsk ) {
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
+- str.c_str());
++ "%s", str.c_str());
+ else
+ dialog = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+- str.c_str());
++ "%s", str.c_str());
+ g_signal_connect (GTK_OBJECT (dialog),
+ "response",
+ G_CALLBACK (dia_errBase_rt_func),
+diff -up ./src/euclideMain.cc.orig ./src/euclideMain.cc
+--- ./src/euclideMain.cc.orig 2014-06-29 18:55:58.278006102 -0700
++++ ./src/euclideMain.cc 2014-06-29 18:56:31.168182086 -0700
+@@ -33,7 +33,7 @@
+
+ using namespace std;
+
+-char *buttonFiles[] = {"point.png","pointonline.png","","lineintersect.png","linecircleintersect.png","circleintersect.png","",
++const char *buttonFiles[] = {"point.png","pointonline.png","","lineintersect.png","linecircleintersect.png","circleintersect.png","",
+ "barycenter.png","center.png","","vector.png","rotatehomothetic.png","projectcircle.png","projectline.png",
+ "projectorthogonal.png","symetric.png","","line.png","segment.png","lineorthogonal.png",
+ "lineparallel.png","bissect.png",
+diff -up ./src/icon.xpm.orig ./src/icon.xpm
+--- ./src/icon.xpm.orig 2014-06-29 18:55:58.278006102 -0700
++++ ./src/icon.xpm 2014-06-29 18:56:39.834228455 -0700
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * icon_xpm[] = {
++const static char * icon_xpm[] = {
+ "48 48 1318 2",
+ " c None",
+ ". c #BEBBA0",
+diff -up ./src/mlstring.cc.orig ./src/mlstring.cc
+--- ./src/mlstring.cc.orig 2014-06-29 18:55:58.278006102 -0700
++++ ./src/mlstring.cc 2014-06-29 18:57:04.993363072 -0700
+@@ -134,7 +134,7 @@ int mlString::nbElementsMenu() {
+
+ void mlString::select() {
+
+- char* name = config::getString( "language" );
++ const char* name = config::getString( "language" );
+ if ( !name ) {
+ mlFileName = "english.multilanguage";
+ config::setString( "language", mlFileName.c_str() );
diff --git a/openeuclide.spec b/openeuclide.spec
index 489f6d3..aed1f7c 100644
--- a/openeuclide.spec
+++ b/openeuclide.spec
@@ -1,6 +1,6 @@
Name: openeuclide
Version: 0.5
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A geometry software that is intended for educational or modeling purposes
Group: Applications/Engineering
@@ -16,6 +16,7 @@ Patch0: %{name}-%{version}-fix-FTBFS.patch
#Patch to fix the version
#Patch adds categories and icon keys to the desktop file
Patch1: %{name}-fix-desktop-file.patch
+Patch2: %{name}-%{version}-fix-Werror-format-security.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +33,7 @@ This project is a basic tool for educational or modeling purpose.
mv %{name}.desktop~ %{name}.desktop
%patch0
%patch1
+%patch2
find . -name "CVS" -exec rm -rf {} +;
@@ -62,6 +64,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Jun 29 2014 Arun S A G <sagarun at gmail.com> - 0.5-11
+- Add patch to fix FTBFS due to gcc flag -Werror=format-security
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index e69de29..082fdbf 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+036332062fdebed576581ddd21d4b185 openeuclide-0.5.tgz
More information about the scm-commits
mailing list