[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.0.3+dfsg0-1-17-ga89e9f1

Matteo F. Vescovi mfv.debian at gmail.com
Sat May 19 16:04:04 UTC 2012


The following commit has been merged in the master branch:
commit dbc8b967fe0807758e07a1513e3a2ec64aa4e860
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sat May 19 17:54:45 2012 +0200

    debian/patches/: #0003 added to fix FTBFS on Hurd
    
    Thanks: Robert Matusewicz for the hint

diff --git a/debian/patches/0003-Fix_FTBFS_on_Hurd.patch b/debian/patches/0003-Fix_FTBFS_on_Hurd.patch
new file mode 100644
index 0000000..737d89f
--- /dev/null
+++ b/debian/patches/0003-Fix_FTBFS_on_Hurd.patch
@@ -0,0 +1,30 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 19 May 2012 17:53:59 +0200
+Subject: Fix_FTBFS_on_Hurd
+
+---
+ src/libutil/sysutil.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
+index 3a24c24..9d89554 100644
+--- a/src/libutil/sysutil.cpp
++++ b/src/libutil/sysutil.cpp
+@@ -33,7 +33,7 @@
+ #include <iostream>
+ #include <ctime>
+ 
+-#ifdef __linux__
++#if defined (__linux__) || defined (__GNU__)
+ # include <sys/sysinfo.h>
+ # include <unistd.h>
+ # include <sys/ioctl.h>
+@@ -145,7 +145,7 @@ Sysutil::this_program_path ()
+     filename[0] = 0;
+     unsigned int size = sizeof(filename);
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GNU__)
+     int r = readlink ("/proc/self/exe", filename, size);
+ #elif defined(__APPLE__)
+     // For info:  'man 3 dyld'
diff --git a/debian/patches/series b/debian/patches/series
index 3e4140c..38b0f4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix_docs_generation.patch
 0002-Fix_usleep_issue_on_kFreeBSD.patch
+0003-Fix_FTBFS_on_Hurd.patch

-- 
OpenImageIO packaging



More information about the Pkg-phototools-commits mailing list