haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update gnash recipe, still broken

Browse Source 
* gnash_x86: missing symbol '_Unwind_Region'
This commit is contained in:
Kacper Kasper
2014-04-25 20:32:09 +00:00
parent f57795b8a0
commit 7adf00db2e
4 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media-video/gnash/patches/GnashImageGif.patch
View File

@@ -1,14 +0,0 @@
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index eeba4b7..bddb452 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record)
void
GifInput::read()
{
- _gif = DGifOpen(_inStream.get(), &readData);
+ int error_code;
+ _gif = DGifOpen(_inStream.get(), &readData, &error_code);
GifRecordType record;

49
media-video/gnash/patches/gnash-0.8.10.patchset Normal file
View File

@@ -0,0 +1,49 @@
From 27ea051c05dcc53eb9ea2359f7e71eaacc8c2ada Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Thu, 24 Apr 2014 22:18:34 +0000
Subject: fix Haiku build
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index eeba4b7..bddb452 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record)
void
GifInput::read()
{
- _gif = DGifOpen(_inStream.get(), &readData);
+ int error_code;
+ _gif = DGifOpen(_inStream.get(), &readData, &error_code);
GifRecordType record;
diff --git a/libbase/utility.h b/libbase/utility.h
index 8b9f48c..51ea858 100644
--- a/libbase/utility.h
+++ b/libbase/utility.h
@@ -61,7 +61,7 @@ namespace std
};
#endif
-#if defined(__HAIKU__)
+#if defined(__HAIKU_OLD)
namespace std {
class wstring : public std::basic_string<char>
{
diff --git a/macros/boost.m4 b/macros/boost.m4
index 845aaae..5788f57 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -37,7 +37,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
dnl this is a list of *required* libraries. If any of these are missing, this
dnl test will return a failure, and Gnash won't build.
- boost_libs="thread program_options iostreams"
+ boost_libs="thread program_options iostreams system"
dnl this is a list of *recommended* libraries. If any of these are missing, this
dnl test will return a warning, and Gnash will build, but testing won't work.
--
1.8.3.4

13
media-video/gnash/patches/utility.patch
View File

@@ -1,13 +0,0 @@
diff --git a/libbase/utility.h b/libbase/utility.h
index 8b9f48c..51ea858 100644
--- a/libbase/utility.h
+++ b/libbase/utility.h
@@ -61,7 +61,7 @@ namespace std
};
#endif
-#if defined(__HAIKU__)
+#if defined(__HAIKU_OLD)
namespace std {
class wstring : public std::basic_string<char>
{