summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2014-06-14 14:56:36 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2014-06-14 14:56:36 +0000
commitb31ab69b33b501fe25c85001ac50a57c154e3d6d (patch)
tree2e9b8b8e92c222c808534217af8e7b8f7ceeee81 /x11
parentremove NO_STAGE. (diff)
Fix build on CURRENT.
Notes
Notes: svn path=/head/; revision=357786
Diffstat (limited to 'x11')
-rw-r--r--x11/fireflies/files/patch-src-main.cc22
1 files changed, 20 insertions, 2 deletions
diff --git a/x11/fireflies/files/patch-src-main.cc b/x11/fireflies/files/patch-src-main.cc
index 5462ba66cb26..165887068c2d 100644
--- a/x11/fireflies/files/patch-src-main.cc
+++ b/x11/fireflies/files/patch-src-main.cc
@@ -1,5 +1,5 @@
---- src/main.cc 2003-06-23 16:55:04.000000000 -0400
-+++ src/main.cc 2013-05-13 14:24:28.000000000 -0400
+--- src/main.cc.orig 2003-06-23 22:55:04.000000000 +0200
++++ src/main.cc 2014-06-13 19:00:33.000000000 +0200
@@ -15,8 +15,10 @@
#ifdef WIN32
#include <windows.h>
@@ -20,6 +20,24 @@
// mingw doesn't have argp. implement half-assed version
#define OPTION_HIDDEN 1
+@@ -131,7 +133,7 @@
+ return -1;
+ }
+ else if (opt[0] == 'V') {
+- extern char *argp_program_version;
++ extern const char *argp_program_version;
+ cerr << argp_program_version << endl;
+ return -1;
+ }
+@@ -154,7 +156,7 @@
+ return -1;
+ }
+ else if (strcmp(opt, "version") == 0) {
+- extern char *argp_program_version;
++ extern const char *argp_program_version;
+ cerr << argp_program_version << endl;
+ return -1;
+ }
@@ -187,7 +189,7 @@
#define OPT_FPS 2
#define OPT_FASTFORWARD 3