diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2023-08-07 13:07:06 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2023-08-07 13:07:06 +0000 |
| commit | 5914253c53e3b1bfa5d90c70cbc039ffcca149b3 (patch) | |
| tree | c8257a9d4c888fff6958b6f42f0534e484d38d6d | |
| parent | 073178561a1e15717e837245448b7fcf362cbc6c (diff) | |
| -rw-r--r-- | graphics/rawstudio/Makefile | 8 | ||||
| -rw-r--r-- | graphics/rawstudio/files/patch-src_rs-tethered-shooting.c | 33 |
2 files changed, 34 insertions, 7 deletions
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 774a3ede69c8..3a9d344b44b1 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -8,7 +8,7 @@ MAINTAINER= samm@FreeBSD.org COMMENT= Open-source program to read and manipulate RAW photo images WWW= https://rawstudio.org/ -LICENSE= GPLv2 +LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libcurl.so:ftp/curl \ @@ -42,12 +42,6 @@ OPTIONS_SUB= yes NLS_USES= gettext -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - post-patch: @${REINPLACE_CMD} -e '/^pkg_modules=/s,libssl,gthread-2.0,' \ ${WRKSRC}/configure diff --git a/graphics/rawstudio/files/patch-src_rs-tethered-shooting.c b/graphics/rawstudio/files/patch-src_rs-tethered-shooting.c new file mode 100644 index 000000000000..ae8253f7f59a --- /dev/null +++ b/graphics/rawstudio/files/patch-src_rs-tethered-shooting.c @@ -0,0 +1,33 @@ +--- src/rs-tethered-shooting.c.orig 2011-03-26 02:07:57 UTC ++++ src/rs-tethered-shooting.c +@@ -115,13 +115,12 @@ append_status(TetherInfo *t, const gchar *format, ...) + } + + static void +-ctx_error_func (GPContext *context, const char *format, va_list args, void *data) ++ctx_error_func (GPContext *context, const char *str, void *data) + { + gdk_threads_lock(); + TetherInfo *t = (TetherInfo*)data; + append_status (t, _("Gphoto2 reported Context Error:\n")); +- append_status_va_list(t, format, args); +- append_status (t, "\n"); ++ append_status(t, "%s\n", str); + if (t->async_thread_id && t->async_thread_id != g_thread_self()) + shutdown_async_thread(t); + t->keep_thread_running = FALSE; +@@ -129,12 +128,11 @@ ctx_error_func (GPContext *context, const char *format + } + + static void +-ctx_status_func (GPContext *context, const char *format, va_list args, void *data) ++ctx_status_func (GPContext *context, const char *str, void *data) + { + TetherInfo *t = (TetherInfo*)data; + gdk_threads_lock(); +- append_status_va_list(t, format, args); +- append_status (t, "\n"); ++ append_status(t, "%s\n", str); + gdk_threads_unlock(); + } + |