From nobody Thu May 25 08:52:30 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 4QRhdW0YJQz4CsgB; Thu, 25 May 2023 08:52:31 +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 4QRhdV75hrz3Ml2; Thu, 25 May 2023 08:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685004751; 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=9uLdfCcFUPrBtWph0Qmx6YmCDaGr91LYKw/D3jIt5P0=; b=Fqx+asbi9emy9MywOMWrNLYx8HbP4e/Uxp9qenNNvQUqdOLfkg/nU9c3GGdjlwZFDlg5Mk p8Hh0bTRLsDqW2kTkAO2dVi79X6jk5CFUAx3/Om9+AT/mq4auJFptjXCwUHiz8kpuPTgIa LlLFtMnMp75lhiBRfgflDp9lXSGUAZ/ooUBap1BNpxjaCeBRuC0yNWfZK1cxcV5MqTU7nj CHCqNryjXdAE0Cc/BRihBExHoyDkLLqnZIJQ2/zsRdgmP8FE3WARAhv4WBzeyFdk4GhWuD OD/KSOehPU0lYBWJBgyGIsSLlKWJ28mHes0gG4JkiSdByDiRxGWgmTHVEAWJAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685004751; 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=9uLdfCcFUPrBtWph0Qmx6YmCDaGr91LYKw/D3jIt5P0=; b=L5pcotDfYTfDnJdLYF1FdAlQukVAixRYa6KJiwHtyE/OGaYDIG3Aq0Mv2oekUXLEQhP9EE 4G+peIK+VaSpjQcK6xR24RDKZJMtRwjfiL1vIA6mNCuhspT8smbXiSu0noKXJNaL18ZdW0 HB5yjFU2eViNHj3mUwGBFbJ32k+LIaAD8LSlBJ9CHeygLna/MrevON+PeERzIF7rSB9ATM loRuJElcMHF1dMLxjwXPig4FihjS/qTmR8k3lz31JXllNKtPqpWlK91CigPlrKHIrEZK2f /W7fuTlXpgdJdj+8O4rJ6zVPWUU302GF1PGUJ7zvt5okpn30HdYUKmFm10DAqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685004751; a=rsa-sha256; cv=none; b=shjITtAFmPLmBBAJ3Z6JDvPnIBNAOA/lIy0k0A41DexvRSHSmzYj4Qg0KwFytKvk8CyRis wM/ZTsHpIQGrwRfTwSgjvxWFKRSK/oebDSlmc/LK+z1Q5JYG6o/v3x2nwHZZiu+JnyFQcH xRGJl7Ewznis+Yq/ObIRvgC6Ej69WrjmJsNI/FydHBl0eLnFy8MDSKugA4d5gkuAlajkpd jxQq+Muf40lBiuku0DsHNeSTJrZCbDwSo6niDUTJE3vIAeVIM98ttjPms20cQY+Hfs7CeL tJZlmQf/URSlf5ytB3IEx7HPKdIcj2Pe9w9e2WnUzYZH/hOeJyq5oPCCFs57Pg== 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 4QRhdV6B6dzJNK; Thu, 25 May 2023 08:52:30 +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 34P8qUGj017949; Thu, 25 May 2023 08:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P8qUqu017948; Thu, 25 May 2023 08:52:30 GMT (envelope-from git) Date: Thu, 25 May 2023 08:52:30 GMT Message-Id: <202305250852.34P8qUqu017948@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 8fc5e393c4a9 - main - x11/xcoloredit: Fix LLVM15 error 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fc5e393c4a9e1589291f6580415636786dfd105 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fc5e393c4a9e1589291f6580415636786dfd105 commit 8fc5e393c4a9e1589291f6580415636786dfd105 Author: Cy Schubert AuthorDate: 2023-05-25 08:50:06 +0000 Commit: Cy Schubert CommitDate: 2023-05-25 08:52:21 +0000 x11/xcoloredit: Fix LLVM15 error xcoloredit.c:356:14: error: incompatible pointer to integer conversion assigning to 'int' from 'void *' [-Wint-conversion] bars_locked = NULL; ^ ~~~~ While at it adopt this feral port. MFH: 2023Q2 --- x11/xcoloredit/Makefile | 2 +- x11/xcoloredit/files/patch-xcoloredit.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile index 3200ec83ccdf..dc9d123f3d04 100644 --- a/x11/xcoloredit/Makefile +++ b/x11/xcoloredit/Makefile @@ -5,7 +5,7 @@ CATEGORIES= x11 MASTER_SITES= XCONTRIB/../R5contrib DISTNAME= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= Find colour values by graphical colour mixing USES= imake tar:Z xorg diff --git a/x11/xcoloredit/files/patch-xcoloredit.c b/x11/xcoloredit/files/patch-xcoloredit.c index cbc7f594a24a..588f6d1a89dc 100644 --- a/x11/xcoloredit/files/patch-xcoloredit.c +++ b/x11/xcoloredit/files/patch-xcoloredit.c @@ -1,5 +1,5 @@ ---- xcoloredit.c.orig Wed May 30 22:10:09 2007 -+++ xcoloredit.c Wed May 30 22:10:57 2007 +--- xcoloredit.c.orig 1992-01-25 08:00:21.000000000 -0800 ++++ xcoloredit.c 2023-05-25 01:40:26.543747000 -0700 @@ -38,6 +38,7 @@ */ @@ -35,6 +35,15 @@ char **argv; { Status ok; +@@ -350,7 +353,7 @@ + unboxedGC = XtGetGC(mixingForm, GCForeground | GCLineWidth, &values); + + original_background = values.foreground; +- bars_locked = NULL; ++ bars_locked = 0; + + XtAddCallback(redScroll, XtNjumpProc, Thumbed, (XtPointer)RED); + XtAddCallback(greenScroll, XtNjumpProc, Thumbed, (XtPointer)GREEN); @@ -696,7 +699,7 @@ (float)0.025); XawScrollbarSetThumb(valScroll, (float)(1.0 - hsv_values.v),