From nobody Sun Oct 16 22:14:47 2022 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 4MrDvD0FV3z4gCmH; Sun, 16 Oct 2022 22:14:48 +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 4MrDvC6y5mz3Y4L; Sun, 16 Oct 2022 22:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665958488; 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=0sGQFOzL55LLuSWqrS5RZf0UW9xaOgGKRD9ziNmzIZg=; b=YNiWDqsE8cUPFyinwADAnHZLINyiBdokwBKaidZc1RvVrzhr9UJpyTMjpBShQpTxZn375E UxTSQKaXkFCT4V2uYpyQEQ/MUxOss5DZFQi57lxpHURm2hkptYYe1I87BbiVRUuVW34v70 aM6GvFSgTTQ5dlQyMN5FkjWRsUGcLpC3wXMbbx7j8UQeFKjnQB2grQiHcQG2uyYt2+Ggkp BJ4hZXaaTUKulBrrei5pbkfl64l6IqqFyXjPpnih4VlFc6IbFceb9AJSpwi+VNYU0uMhyg kQhetBGYkoOMRVGMtKcTJiYwAJaY909G3NFqQVQmMJc+rYyKBSkkAHqwIbmopA== 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 4MrDvC5xxPzcDb; Sun, 16 Oct 2022 22:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29GMElEq008363; Sun, 16 Oct 2022 22:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GMElac008362; Sun, 16 Oct 2022 22:14:47 GMT (envelope-from git) Date: Sun, 16 Oct 2022 22:14:47 GMT Message-Id: <202210162214.29GMElac008362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 00180663d1e1 - main - devel/juce: Add better workaround for broken ENVIRON(7) in shared libraries 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00180663d1e163f50dfae6916e9eac4c4192338d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665958488; 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=0sGQFOzL55LLuSWqrS5RZf0UW9xaOgGKRD9ziNmzIZg=; b=Qjxn/65BAhgy9QPSuZ/ZspL7AIUXTZUMU79UUbuYeziO9rtTGYhgAGnixNVqhMkJwNY4TI TvmG3Zl8W6L2BBxS//BwMe1PzHyOVNben1nQH8vz9AjCh8qsWCvNBDEMHMcnRu1TBoCKBY dG+dJu9ERCzotdRzwjsyUVUwOBA+SyZwNi2/rq22QWVhHOdF857VCjl/FTi8YAPqI31hqj TbDmpMQBYglJbDWg/uleQD4V5mIFEvE1/y0S6VMBanD/QKmkUhW1TFXBzGlD8ctWnQUX2A sNtsHecFBTxyKPFmMPwbqiyVLBvipqd9Rk0Ubo3p1Ai+gRTUjSDLWZjQYRJqog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665958488; a=rsa-sha256; cv=none; b=V+Myj2t7WTX9KjypPzVMVFpgmxESKVtZuc8PLzOvZuVvTzn1DqSCbHaSxz1btXpGFKJpDF MVn/7mjdsxWzw3TkO1oAlbDcE3HWDupJyfiLqgiyenkp7UaFw9/6uiU0X6YI3QyDiCFDev AOydWdYubwUH8qqFYH9bZ21RpAbZDPMgA2L/8d3ssqADIchTUtQzoAxHeWupfdYKiTb8jC WK5nW8Ak0qD/0xWDM/uHBY0iduVg7D2daO4oGyB409NjzUhHjYgkY8k1Tn2myxT3SUqoZx CbVg2AWBiqXNOGTkup+HAIv8gUu36VV0ChXtR20eIB8A6GsoNCA+6XF/cpnq6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=00180663d1e163f50dfae6916e9eac4c4192338d commit 00180663d1e163f50dfae6916e9eac4c4192338d Author: Yuri Victorovich AuthorDate: 2022-10-16 22:11:00 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-16 22:14:45 +0000 devel/juce: Add better workaround for broken ENVIRON(7) in shared libraries New workaround exactly mimics the effect of ENVIRON(7). --- devel/juce/Makefile | 2 +- ...tch-modules_juce__core_native_juce__linux__Files.cpp | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/devel/juce/Makefile b/devel/juce/Makefile index 77cbb3a7987b..2ae237a153ac 100644 --- a/devel/juce/Makefile +++ b/devel/juce/Makefile @@ -1,6 +1,6 @@ PORTNAME= juce DISTVERSION= 7.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/devel/juce/files/patch-modules_juce__core_native_juce__linux__Files.cpp b/devel/juce/files/patch-modules_juce__core_native_juce__linux__Files.cpp index 707d077e2b20..085a1b166a93 100644 --- a/devel/juce/files/patch-modules_juce__core_native_juce__linux__Files.cpp +++ b/devel/juce/files/patch-modules_juce__core_native_juce__linux__Files.cpp @@ -1,13 +1,24 @@ - workaround for https://reviews.freebsd.org/D30842 ---- modules/juce_core/native/juce_linux_Files.cpp.orig 2022-10-16 19:17:29 UTC +--- modules/juce_core/native/juce_linux_Files.cpp.orig 2022-08-15 18:29:17 UTC +++ modules/juce_core/native/juce_linux_Files.cpp -@@ -229,7 +229,7 @@ bool Process::openDocument (const String& fileName, co +@@ -21,7 +21,9 @@ + */ + + #if JUCE_BSD +-extern char** environ; ++//extern char** environ; // this is broken on FreeBSD, see https://reviews.freebsd.org/D30842 ++#include ++static char*** environ_ptr = (char***)dlsym(RTLD_DEFAULT, "environ"); // workaround for the above + #endif + + namespace juce +@@ -229,7 +231,7 @@ bool Process::openDocument (const String& fileName, co setsid(); // Child process - execve (argv[0], (char**) argv, environ); -+ execv (argv[0], (char**) argv); ++ execve (argv[0], (char**) argv, *environ_ptr); exit (0); }