diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
| commit | 6c619a60fd89b5e75a93cff06977c552ddf1e621 (patch) | |
| tree | 630ca50ea1c128c4be85ce920ecf034c561bf7fe /abs/core-testing/openexr/gcc43.patch | |
| parent | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (diff) | |
| parent | 634dff8fdd0a9c866c92f0020f282c23d1a438d8 (diff) | |
| download | linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.zip linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.gz linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/openexr/gcc43.patch')
| -rw-r--r-- | abs/core-testing/openexr/gcc43.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/abs/core-testing/openexr/gcc43.patch b/abs/core-testing/openexr/gcc43.patch index 08ae699..3624872 100644 --- a/abs/core-testing/openexr/gcc43.patch +++ b/abs/core-testing/openexr/gcc43.patch @@ -1,21 +1,22 @@ ---- a/exrenvmap/main.cpp -+++ b/exrenvmap/main.cpp -@@ -46,6 +46,8 @@ +diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp +--- openexr-1.6.1/exrenvmap/main.cpp 2007-04-25 03:07:51.000000000 +0200 ++++ openexr-1.6.1.new/exrenvmap/main.cpp 2008-10-30 17:18:13.000000000 +0100 +@@ -45,6 +45,7 @@ + #include <iostream> #include <exception> #include <stdlib.h> ++#include <string.h> -+#include <cstring> -+ using namespace Imf; using namespace std; - ---- a/exrmaketiled/main.cpp -+++ b/exrmaketiled/main.cpp -@@ -47,6 +47,8 @@ +diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp +--- openexr-1.6.1/exrmaketiled/main.cpp 2007-04-25 03:08:45.000000000 +0200 ++++ openexr-1.6.1.new/exrmaketiled/main.cpp 2008-10-30 17:18:40.000000000 +0100 +@@ -46,6 +46,7 @@ + #include <exception> #include <string> #include <stdlib.h> ++#include <string.h> -+#include <cstring> -+ using namespace Imf; - using namespace std; + using namespace std; |