From nobody Mon May 29 15:03:01 2023 X-Original-To: dev-commits-ports-all@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 4QVJg95XJfz4XvR6; Mon, 29 May 2023 15:03:01 +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 4QVJg956P4z3kkx; Mon, 29 May 2023 15:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685372581; 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=ysslOPPqYURzdggMGOInY0ArUtSAU2MkDR1GGD0jDOo=; b=sEn1h3pSJGSMZDGg5hK+p+6leZjUw5DYem0JR3EP4du+rtMpglH0hCG+riKDg9sjXjSExW cndVFQOUOa+O+biyp8A5C6PuoL5cxKhkQTX7bJc3kUh9saL+Q6jHYDMpxAhnFyXoRL4Wt2 4yPSQGyujhdOLBpux388Iuuv1QRy6XNdrPMTUQAMjgiHWmvRCuHyNEO0JQ4GD8e8BkSXeD /RG+PNnQjfM0h9MXYvP4Y2Ab83Tz4Fbvzaq8fBV/lbr0n79HRquF/4ZoLad7r6TdLDJnf/ JP+nQRNWQCPuXfQwV/6nRSRIbldcab2r2Qw0sy07tXjpLKTMNENgwJu3v3w42g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685372581; 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=ysslOPPqYURzdggMGOInY0ArUtSAU2MkDR1GGD0jDOo=; b=M/JcOiioyM3Fl7GkzCN0WPfDa0xuv1IX8yfyrg8ufLKF4EE1hQqr0DOFSaGEPNd1N3ugfJ Eef/2cAq98uLPJldoAQZ+dnW4IJ/e/GpE0+Azh2k9XS04jqoCuX+VrChf0lsaFuW6zLZqS mNQCYyL8Gzm/1AYE7RV2F9+xld8vrZByQrwrXRwLZW2vTNsPMhuh9yd5ocwIRm4ni5ATPs EGAHaou7I20GIdz28rzOapnq6BJv74LZoSKhbfj8J9P+bF3j6SZ6dLoyG8/tQeS4xLi6+R ENNpers9T04NTd+5BWGn4l8hTqaW2CbzjneX8YUy7mql20JWc9xmnl2FWLNkFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685372581; a=rsa-sha256; cv=none; b=LgKGQQQrl6o/D5AXMrHS6LqUdq/ZFiwgPWaUNm9z7cNNr4RzJM/AGhJM4GUWxpIXKZPKp8 wy01NhIf+YBYadcnHrEmtEhnFyg88ulu8Joh7ULND5UFdGE0AsleKTRYVNb+WwdNIGktqp QuQFypGKRKVYEYLJzI9rRiF4+o10D+yViUqFcRBJV4SeTndgl3qzY9VtFbGJWh2Y00bRsn hrLa10fOWSqQF6WCkr+eI5tTf2Poc2GOu7nfgoeR2zFKbG0t0x28StZikGCgWsFOJDX9Zs VXQcv1Ekrw4shiyfmVOQGxbXCdRoa0GmbxCMr5ryWIfBfkkvpfL50t/s48LyYA== 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 4QVJg93jfZzGhn; Mon, 29 May 2023 15:03:01 +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 34TF31hV038833; Mon, 29 May 2023 15:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TF319B038832; Mon, 29 May 2023 15:03:01 GMT (envelope-from git) Date: Mon, 29 May 2023 15:03:01 GMT Message-Id: <202305291503.34TF319B038832@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: 635bab9761ae - 2023Q2 - x11/xcoloredit: Fix LLVM15 error List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 635bab9761ae6812a6277c3dc800a945853c79a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=635bab9761ae6812a6277c3dc800a945853c79a7 commit 635bab9761ae6812a6277c3dc800a945853c79a7 Author: Cy Schubert AuthorDate: 2023-05-25 08:50:06 +0000 Commit: Cy Schubert CommitDate: 2023-05-29 15:02:53 +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. (cherry picked from commit 8fc5e393c4a9e1589291f6580415636786dfd105) --- 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),