From nobody Mon Aug 07 13:08:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKGpL2xZbz4pZ8P; Mon, 7 Aug 2023 13:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKGpL1tnsz3f18; Mon, 7 Aug 2023 13:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691413690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oulw+40jOeKXc2lu8v2KJmx+ACrllriXgCD+ConJdI=; b=pwAn31xcTO5xjuLfO7L73HOelMPITG4Qkj/mM12ZEmoBmcGoxQlqdVfbBUuiyuWKCTcHsK 8bLUEn0qS1RBCiVE+boGKcJ7CFfzkwCSLzE2IkSfcQ7JMxdf/cq1G0jA3+EfZAp/T9Z4rP RZsOHY0IbXdan1/ODzLJhJ6nEUjyrhGxM52BU8XfEvZdwG3TtutimBUfH2omSd8UwFaEti d0R1pV3DupCgRQMvAKTuARwoxaAxqZ1C7N/LhaUJOLkJVfszLa20Hn0qwEs2AkJJZYeNz/ Y+1EvxEDDwLuMRqNeBxcv8PqjZJ/m1i3tK+YQxoRW9fZ/OxunIWV9hTPV262Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691413690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oulw+40jOeKXc2lu8v2KJmx+ACrllriXgCD+ConJdI=; b=LeRkVJ0naoBAIfXAeYro3UFn+HBqF2oXbs9o80ydNRXrNzvc0348EWmSYqZhB/MzzkVcjF f3klYVXM0ejryYqrf1WqfDiFeFim25dxQwFpiUQbkSZcX0hGv8QggfcySr3gcsW1vi4e+Y kj99aSoEdvvFw0W8bHn2mT2hyJyT0XKCTD+HVVKQxCN02JEugQcu8JidYYc8w/3fR2MZ64 Batsj9zLUhk56UspZBdoaQp/boCcv9xoixB1ZF4IzhmHOds4+v0A9TcVu2rcLbxdIQOyYv PlKzj9lpAQu8dKn22CznCT+gvFO+QPBDLRA/zozOCNv5yv0Q6L9TSB+1m2n2zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691413690; a=rsa-sha256; cv=none; b=EA4XB5rs0OOpuOL0jzyIJvDGRehXJqtCfzm/qCdBHNgkR5a7UHGVJqNPRBd/TOtN43PXRA dlGLiN9u0uHX3oI+7LTikeUoIPT9vwEnbxTDKdV4zBYwYsJWqnaREjtSd6WT3JCsWyV1id PZXwSNzLIc78458pgklLB8pK2i0PaIxjqrkbtlPLWnRdRRqhOoD8bL0V+2PPqaVq/j2d73 G617DnLjLrHHofmxyej9bjTWZTK/B4jpddnKwLkPiXPzLEU0Ub+1RefLCyDyYqzxmE0Q1G z6nklGLXMlpyyTpyLIfLFvhI1ycDolUQ4KtFsb9gUEK02ojX/euRC6UZ5Ov35A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKGpL0Bcdzt6S; Mon, 7 Aug 2023 13:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377D89mM093517; Mon, 7 Aug 2023 13:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377D89ZP093516; Mon, 7 Aug 2023 13:08:09 GMT (envelope-from git) Date: Mon, 7 Aug 2023 13:08:09 GMT Message-Id: <202308071308.377D89ZP093516@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 5914253c53e3 - main - graphics/rawstudio: revert/redo naive and bogus previous build "fix" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5914253c53e3b1bfa5d90c70cbc039ffcca149b3 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=5914253c53e3b1bfa5d90c70cbc039ffcca149b3 commit 5914253c53e3b1bfa5d90c70cbc039ffcca149b3 Author: Alexey Dokuchaev AuthorDate: 2023-08-07 13:07:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-07 13:07:06 +0000 graphics/rawstudio: revert/redo naive and bogus previous build "fix" Newish Clang had actually revealed the problem with this old codebase which was not updated against context and logfile handling being done without varargs in modern libgphoto2 versions. Fixes: e9d156056cec --- graphics/rawstudio/Makefile | 8 +----- .../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 - -.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(); + } +