From nobody Mon May 29 15:03:03 2023 X-Original-To: dev-commits-ports-branches@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 4QVJgD1VsZz4Xv4V; Mon, 29 May 2023 15:03:04 +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 4QVJgC6Cffz3krT; Mon, 29 May 2023 15:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685372583; 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=gF2/rJpjbB/uVLHcuBkNbFAiytDSF3A/LmxnP1t9Cxc=; b=TmAikQTypTfZeEPj54jZNWtdYAuSjn7K4HsBOFD1SENVPPxw4S5rdnKLByd8uFhzFy5tCr 6bCoeDGwRsYRv+jDdqwZ0zHsXX+qmLG7eqKXBznykSSrX5YPK+npB09L+9Z8WAJ0ZCzTtX SdSIjUsTJfRrBZi/KLHE8gzWz3LZleyhuKwU62ykZdrFsPp3HaFvZNwZc1Qcns2dmb6IE7 BSZ41ujh5NbyviGnvwSxg9BoDCd43MElwcj476Inq69lU4vFZIf9HTXX//I2fxtDluQyYp dqC3UsAGYtYcLCHlXm3Kf8CXFTgFDp/nwIRHzhpTKa++dMNwfSf5oSqm9eX13w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685372583; 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=gF2/rJpjbB/uVLHcuBkNbFAiytDSF3A/LmxnP1t9Cxc=; b=fD6Riyi178UXX8KcCiwQrzGdY8g5EKYuxdgc9e7S5U/ugrRgxO2sViy/HXyyEY4zZsvkh5 QDitf5SfUWm1Q/bvsY7Cn2Ran1z1k9BQbgNRMdHI8TR6/h/TxJa8xEQQ5xiTd4ENPv6LsI DFBpagmNwpZVMFKvoguF2hDLykHWxOwuQ1V43XXGC+Akvpqsv4LUHJHDcoqK5nBiFLqpTG vlAQBPR9FzElTMQnpj00qXF0ANt7NsScK76JpEQCaJYjGArM6jIxhrZhCfTblgfqSuD8r0 uziXLsk621OCSM/U7xaaq9eh8up45xgyhGrMPVfoTqcdG1aJDjGMiiOWmiUvow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685372583; a=rsa-sha256; cv=none; b=m0FZ9Jq4AY+xug/x+asjMz7wJAGM9tPkEpfEWkSbLJtRtrYKuCTkXI3op5pipvWRPGdkta wI1QgND1u3CTJv+d+NHAu+KdaZxwF+NxUk3sy5iulLrS9NH6NpVKqL4CsTPRW1L26fYj6N +or6X9oV6wkIpc+oCTopy09RqekrREAc5ffimKvvyBeyF2EWW1GGTsdcFzE1BRcCGrdoIZ XEptn1VhbPf3HkwdhHXAd+xusi579Qd/K7bCjDQj+RNMG16GDRhVt1slJVXz+h064vmI6c 8YvO+V3oaMX4wgDGZxAzqOI+KGCGUV7r2/S5B/5Y3c646Q8X5HmFHMks0EiwHA== 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 4QVJgC5Kz2zGHT; Mon, 29 May 2023 15:03:03 +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 34TF33iV038878; Mon, 29 May 2023 15:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TF33BR038877; Mon, 29 May 2023 15:03:03 GMT (envelope-from git) Date: Mon, 29 May 2023 15:03:03 GMT Message-Id: <202305291503.34TF33BR038877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: cdcba986e979 - 2023Q2 - graphics/xwpick: Fix LLVM15 build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: cdcba986e979dca475e96a074367abbee864cc79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdcba986e979dca475e96a074367abbee864cc79 commit cdcba986e979dca475e96a074367abbee864cc79 Author: Cy Schubert AuthorDate: 2023-05-25 14:51:39 +0000 Commit: Cy Schubert CommitDate: 2023-05-29 15:02:54 +0000 graphics/xwpick: Fix LLVM15 build Fix the following error: ImgToolKit.c:272:10: error: incompatible pointer to integer conversion assigning to 'Atom' (aka 'unsigned long') from 'void *' [-Wint-conversion] type = NULL; ^ ~~~~ While at it assume maintainership of this unmaintained port. (cherry picked from commit 53c230b247d1f52f4793c9bdb969303a49ad39ba) --- graphics/xwpick/Makefile | 2 +- graphics/xwpick/files/patch-ImgToolKit.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile index 9373a9d757f8..3a1f4398a7c5 100644 --- a/graphics/xwpick/Makefile +++ b/graphics/xwpick/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= XCONTRIB/applications -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= Image pick up utility for X Window System LICENSE= xwpick diff --git a/graphics/xwpick/files/patch-ImgToolKit.c b/graphics/xwpick/files/patch-ImgToolKit.c new file mode 100644 index 000000000000..4c5a0c311f11 --- /dev/null +++ b/graphics/xwpick/files/patch-ImgToolKit.c @@ -0,0 +1,11 @@ +--- ImgToolKit.c.orig 1994-11-02 00:30:07.000000000 -0800 ++++ ImgToolKit.c 2023-05-25 07:50:21.577290000 -0700 +@@ -269,7 +269,7 @@ + curW = win; + state = XInternAtom(theDsp, "WM_STATE", True); + if (state != NULL) { +- type = NULL; ++ type = 0; + kidW = win; + while (kidW != NULL) { + curW = kidW;