On 20/02/16 12:54 +0200, Alexander Ploumistos wrote:
I don't get it, I applied the patch, but I'm seeing pretty much the
same errors in mock and koji:
http://koji.fedoraproject.org/koji/taskinfo?taskID=13054384
Sorry, the patch was not in the right format, not sure how that
happened.
This should work.
diff --git a/liborigin-20080225-cxx11.patch b/liborigin-20080225-cxx11.patch
new file mode 100644
index 0000000..35a3c04
--- /dev/null
+++ b/liborigin-20080225-cxx11.patch
@@ -0,0 +1,22 @@
+--- liborigin-20080225/OPJFile.h.orig 2016-02-20 11:16:18.715237121 +0000
++++ liborigin-20080225/OPJFile.h 2016-02-20 11:16:20.880244480 +0000
+@@ -764,7 +764,7 @@
+ vector <spreadSheet> SPREADSHEET;
+ vector <matrix> MATRIX;
+ vector <excel> EXCEL;
+- vector <function> FUNCTION;
++ vector <::function> FUNCTION;
+ vector <graph> GRAPH;
+ vector <note> NOTE;
+ tree <projectNode> projectTree;
+--- liborigin-20080225/OPJFile.cpp.orig 2016-02-20 11:17:21.955452074 +0000
++++ liborigin-20080225/OPJFile.cpp 2016-02-20 11:17:29.268476931 +0000
+@@ -924,7 +924,7 @@
+ break;
+ case 0x10C8:
+ fprintf(debug,"NEW FUNCTION\n");
+- FUNCTION.push_back(function(sname, dataIndex));
++ FUNCTION.push_back(::function(sname, dataIndex));
+ dataIndex++;
+
+ char *cmd;
diff --git a/liborigin.spec b/liborigin.spec
index bcd2014..b95d0ce 100644
--- a/liborigin.spec
+++ b/liborigin.spec
@@ -1,6 +1,6 @@
Name: liborigin
Version: 20080225
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Library for reading OriginLab OPJ project files
License: GPLv2
@@ -10,6 +10,7 @@ URL: http://sourceforge.net/projects/%{name}/
Source: http://belnet.dl.sourceforge.net/sourceforge/liborigin/%{name}-%{version}.tar.gz
# Include <cstddef> into tree.hh
Patch0: %{name}-%{version}-gcc.patch
+Patch1: %{name}-%{version}-cxx11.patch
BuildRequires: cmake
Requires(post): /sbin/ldconfig
@@ -65,6 +66,9 @@ chmod 0644 ws4.opj
%{_libdir}/%{name}.so
%changelog
+* Mon Feb 15 2016 Jonathan Wakely <[email protected]> - 20080225-17
+- Patched for C++11 compatibility
+
* Thu Feb 04 2016 Fedora Release Engineering <[email protected]> - 20080225-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
--
devel mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]
