[octave] Patch to get package to build in rawhide.

Jussi Lehtola jussilehtola at fedoraproject.org
Sat Aug 6 09:07:43 UTC 2011


commit 2eb0eabb3a1d5b1e189801f5669df43cb3b8ac43
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Aug 6 12:07:29 2011 +0300

    Patch to get package to build in rawhide.

 octave-3.4.2-curl.patch |   11 +++++++++++
 octave.spec             |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/octave-3.4.2-curl.patch b/octave-3.4.2-curl.patch
new file mode 100644
index 0000000..0e44063
--- /dev/null
+++ b/octave-3.4.2-curl.patch
@@ -0,0 +1,11 @@
+diff -up octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc
+--- octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl	2011-06-09 20:22:32.000000000 +0300
++++ octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc	2011-08-06 11:54:58.331640323 +0300
+@@ -52,7 +52,6 @@ along with Octave; see the file COPYING.
+ 
+ #include <curl/curl.h>
+ #include <curl/curlver.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static int
diff --git a/octave.spec b/octave.spec
index bae221f..a7a23a0 100644
--- a/octave.spec
+++ b/octave.spec
@@ -10,6 +10,8 @@ Group:          Applications/Engineering
 License:        GPLv3+
 Source0:        ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2
 Source1:        macros.octave
+# Don't include <curl/types.h> which isn't used and is missing on newer versions of libcurl
+Patch0:		octave-3.4.2-curl.patch
 # https://savannah.gnu.org/bugs/index.php?32839
 # Fix building packages from directories
 Patch2:         octave-3.4.0-pkgbuilddir.patch
@@ -70,6 +72,7 @@ This package contains documentation for Octave.
 
 %prep
 %setup -q
+%patch0 -p1 -b .curl
 %patch2 -p1 -b .pkgbuilddir
 
 # Check permissions


More information about the scm-commits mailing list