From nobody Sun May 08 21:16:25 2022 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 638621AC25D9; Sun, 8 May 2022 21:16:26 +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 4KxHDB1Rlwz4mSH; Sun, 8 May 2022 21:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652044586; 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=JWNZzQxOD/IcITYNgdREDO2yOYpUxTlzKdBKT64MA58=; b=rqRY31RqoyFeDTsBRYbkDvT0YuVW3JJsXxy+XQbZNQrAh533/fXLEWG4K1k3i0vDjkt3Xz 9xWDXDOQhFU/zPfHZr4Lb8CeRfotmm2Zjg8yQLQSycFR2E0QdyGEPUoor5IhF19a+GGyzy WvbLIaCpk++9xoYvI0pOCu5u+jgE7+2l1tHcag/IBSM+MzjNRfzK4zjYj6r8L2AWgccgrg VljrZFIHzuZxdgCaTekDTyfK/gGiDJ9LhSAg/hQ1yTHIycUUr8eOyV67S0djSMGi3Iy9ui 9bE351/XmIZUXNPTuk6CjPXZGj4b3HwBsuqa7GL5aDA4D+dEtn9Vf5JObEqQkQ== 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 1250B2C310; Sun, 8 May 2022 21:16:26 +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 248LGPT8091755; Sun, 8 May 2022 21:16:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248LGP6G091754; Sun, 8 May 2022 21:16:25 GMT (envelope-from git) Date: Sun, 8 May 2022 21:16:25 GMT Message-Id: <202205082116.248LGP6G091754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: eebfbce98dc2 - main - editors/diamond: fix build against Copperspice 1.7.4 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eebfbce98dc2feda33244508251ba19e2de368a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652044586; 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=JWNZzQxOD/IcITYNgdREDO2yOYpUxTlzKdBKT64MA58=; b=XejP3bBvvuSToe9gD6GgVDDJcrukGJzLwwLPbG3jKOonvEHX0FXc8pGyHRgvOVPSalDAXu Et5QL2cVGTIXc3f+Qf6nnnZDSc0CugTs55OAiPPjFL1mXSZNmGpLLHKwUux29vyLdKFpbS nOq6sTBRuT8BZPvRpTGmeB4Hy9Fnfr62AqMdyP3DiGeQ42sz5r0l8fJndfEPgKrlo7pLi+ 7iBkt3g+U3JEhAdOEtzIKUqxX5TkmHDOZ61gpl4D7NOZBgKhayiXjmpBYyv75/VMusZpso sqQl2GN14GK6oJ7erdwp9s+Jp4mGgPjwpSKWAHaQF+ziC1g7x9lcAiEBnABfug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652044586; a=rsa-sha256; cv=none; b=tU4b5L1tN6wce89JINWrKiv2jLZ6nf6N8Vf7RUCZnGl0MAh3c1nIz+b+l9EOs0MhHxFKJn dvrllmwHUpyhXJOjlsp7adfxZ2lV6nTrn6ujMVZN2U3mtQkhzZCe621d5P1HS/b5xWsZSO bu5Rx4rFTz8cSMN8OBvOha/8dJI0S71O0py9qZfMASY6RnY5lIBZUQR4ZKjdYjF0LIbZvQ 2Gz/7qCm+7tgk+m0jZrlv68MIGEsOALD9VoFhg3l+EMrIzOP5DhWA8lyp5VBxHI+6T6Hlx 5vqCtOFeHBeVE8MOOcvMhEHzrLw4QxxSSLv0oPvrC1qN6CO749Hs6tP5sqtYWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=eebfbce98dc2feda33244508251ba19e2de368a8 commit eebfbce98dc2feda33244508251ba19e2de368a8 Author: Adriaan de Groot AuthorDate: 2022-05-08 21:14:36 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-08 21:16:23 +0000 editors/diamond: fix build against Copperspice 1.7.4 1.7.4 introduces source-incompatible changes; there is no corresponding Diamond release, so patch with an upstream commit that fixes it. See https://github.com/copperspice/diamond/issues/23 --- editors/diamond/Makefile | 4 ++-- ...h-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff | 28 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/editors/diamond/Makefile b/editors/diamond/Makefile index 0c1433fde6b1..59576b460796 100644 --- a/editors/diamond/Makefile +++ b/editors/diamond/Makefile @@ -1,6 +1,6 @@ PORTNAME= diamond DISTVERSION= 1.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= https://download.copperspice.com/${PORTNAME}/source/ PKGNAMESUFFIX= -cs @@ -32,6 +32,6 @@ USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xi xinerama xrandr xrender # GH_PROJECT= diamond # NO_WRKSUBDIR= yes -DOS2UNIX_FILES= CMakeLists.txt src/CMakeLists.txt src/json.cpp src/recent_tabs.cpp +DOS2UNIX_FILES= CMakeLists.txt src/CMakeLists.txt src/dialog_macro.cpp src/json.cpp src/recent_tabs.cpp .include diff --git a/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff b/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff new file mode 100644 index 000000000000..328c381be992 --- /dev/null +++ b/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff @@ -0,0 +1,28 @@ +diff --git a/src/dialog_macro.cpp b/src/dialog_macro.cpp +index 47d0ab0..d8ca280 100644 +--- src/dialog_macro.cpp ++++ src/dialog_macro.cpp +@@ -169,19 +169,19 @@ void Dialog_Macro::view() + msg += " "; + break; + +- case Qt::SHIFT: ++ case Qt::ShiftModifier: + msg += "Shift"; + break; + +- case Qt::CTRL: ++ case Qt::ControlModifier: + msg += "Control"; + break; + +- case Qt::META: ++ case Qt::MetaModifier: + msg += "Meta"; + break; + +- case Qt::ALT: ++ case Qt::AltModifier: + msg += "Alt"; + break; +