pool/gfan
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 835562 from science

Browse Source 
- Add cddlib.patch

OBS-URL: https://build.opensuse.org/request/show/835562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gfan?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2020-09-21 15:42:00 +00:00 committed by Git OBS Bridge
commit b4a9d37c8d
3 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cddlib.patch Normal file
View File

@ -0,0 +1,74 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2020-09-19 11:39:47.110726857 +0200
To fix the CDDPREFIX yes-or-no conundrum, cddlib 0.94k has introduced
new unique locations for use inside <>. Adjust gfan.
---
src/app_librarytest.cpp | 9 ++-------
src/gfanlib_zcone.cpp | 9 ++-------
src/lp_cdd.cpp | 12 +++---------
3 files changed, 7 insertions(+), 23 deletions(-)
Index: gfan0.6.2/src/app_librarytest.cpp
===================================================================
--- gfan0.6.2.orig/src/app_librarytest.cpp
+++ gfan0.6.2/src/app_librarytest.cpp
@@ -8,13 +8,8 @@
#include "gfanapplication.h"
#include "gfanlib.h"
#include "printer.h"
-#ifdef NOCDDPREFIX
-#include "setoper.h"
-#include "cdd.h"
-#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
-#endif
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
#include <iostream>
#include <fstream>
using namespace gfan;
Index: gfan0.6.2/src/gfanlib_zcone.cpp
===================================================================
--- gfan0.6.2.orig/src/gfanlib_zcone.cpp
+++ gfan0.6.2/src/gfanlib_zcone.cpp
@@ -12,13 +12,8 @@
#include <sstream>
//extern "C"{
-#ifdef NOCDDPREFIX
-#include "setoper.h"
-#include "cdd.h"
-#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
-#endif
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
//}
namespace gfan{
Index: gfan0.6.2/src/lp_cdd.cpp
===================================================================
--- gfan0.6.2.orig/src/lp_cdd.cpp
+++ gfan0.6.2/src/lp_cdd.cpp
@@ -1,14 +1,8 @@
#include "lp_cdd.h"
//extern "C"{
-#ifdef NOCDDPREFIX
-#include "setoper.h"
-#include "cdd.h"
-#include "cdd_f.h"
-#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
-#include "cdd/cdd_f.h"
-#endif
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
+#include <cddlib/cdd_f.h>
//}
#include "termorder.h"
#include "printer.h"

5
gfan.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Sep 19 10:05:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Add cddlib.patch
-------------------------------------------------------------------
Sat Aug 24 16:14:41 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

3
gfan.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gfan
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,7 @@ URL: http://home.imf.au.dk/jensen/software/gfan/gfan.html
Source: http://home.imf.au.dk/jensen/software/gfan/%name%version.tar.gz
Patch1: gfan-automake.diff
Patch2: gfan-warnings.diff
Patch3: cddlib.patch
BuildRequires: automake
BuildRequires: cddlib-devel
BuildRequires: gcc-c++