aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2013-09-14 09:16:20 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2013-09-14 09:16:20 +0800
commit4851e49337df0cefea0aecfdee36a7b4848d6338 (patch)
treedd599e562709d706367f6a38708f856798fdf931
parentc2aa7d41db3eaec2c7099b4b86ca0c27c92742a3 (diff)
downloadfreebsd-ports-gnome-4851e49337df0cefea0aecfdee36a7b4848d6338.tar.gz
freebsd-ports-gnome-4851e49337df0cefea0aecfdee36a7b4848d6338.tar.zst
freebsd-ports-gnome-4851e49337df0cefea0aecfdee36a7b4848d6338.zip
Fix build with clang/libc++
-rw-r--r--games/jigzo/files/patch-src-Loader.cxx10
-rw-r--r--games/jigzo/files/patch-src-main.cxx37
2 files changed, 47 insertions, 0 deletions
diff --git a/games/jigzo/files/patch-src-Loader.cxx b/games/jigzo/files/patch-src-Loader.cxx
new file mode 100644
index 000000000000..c40dfa7da0b7
--- /dev/null
+++ b/games/jigzo/files/patch-src-Loader.cxx
@@ -0,0 +1,10 @@
+--- src/Loader.cxx.orig 2013-09-14 02:26:08.849226279 +0400
++++ src/Loader.cxx 2013-09-14 02:26:47.256226887 +0400
+@@ -24,6 +24,7 @@
+ {
+ #include <png.h>
+ #include <jpeglib.h>
++#include <stdlib.h>
+ }
+
+ void JpgLoader::Load(const std::string& filename,RGB& target,int x,int y)
diff --git a/games/jigzo/files/patch-src-main.cxx b/games/jigzo/files/patch-src-main.cxx
new file mode 100644
index 000000000000..e17fc0106dfc
--- /dev/null
+++ b/games/jigzo/files/patch-src-main.cxx
@@ -0,0 +1,37 @@
+--- src/main.cxx.orig 2013-09-14 02:26:08.857226185 +0400
++++ src/main.cxx 2013-09-14 02:28:44.311226803 +0400
+@@ -56,6 +56,7 @@
+ #include <sys/types.h>
+ #endif
+ #include <dirent.h>
++#include <unistd.h> // for getpid()
+
+ #include "Screen.hxx"
+ #include "Sprite.hxx"
+@@ -1540,7 +1541,7 @@
+ int i;
+ Uint8 *keys = SDL_GetKeyState(&i);
+ SDL_Event event;
+- while (mode!=end) {
++ while (mode!=::end) {
+ //static Uint32 mark = 0;
+ SDL_Delay(10);
+ while (SDL_PollEvent(&event)) {
+@@ -1579,7 +1580,7 @@
+ if (clickLeave)
+ {
+ if (mode == intro)
+- FadeOutTo(end_intro,end);
++ FadeOutTo(end_intro,::end);
+ else if (mode == browse) {
+ FadeOutTo(end_browse,start_intro);
+ } else {
+@@ -1587,7 +1588,7 @@
+ }
+ }
+ if (event.type == SDL_QUIT) {
+- mode = end;
++ mode = ::end;
+ break;
+ }
+ }