From nobody Sat Sep 24 16:41:08 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 4MZZXP2Jfxz4d3D3; Sat, 24 Sep 2022 16:41:09 +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 4MZZXP140tz3FlJ; Sat, 24 Sep 2022 16:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037669; 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=KYZg457CXHqjw4kzHPRi1h5NhCECw5pVMvn9oGnGOrw=; b=hRTaVZvZqhb+CsoQ3ZwJHZ9jIjJMnlU6jq5usnlGeZNBapnEfvC3zbYnM6cuRTkl/Sd5dT 7WvXeqA2mhjM8ihu9iIYkFE59MpEW4EU3qY5Zu42DQyYga/oIjRPHF9h2WLdoe25vj4uLk hkoa9g1tGH8nBQTBmDHgZ53ZrkH5QinyDNn65h9mwqql9zFmo558hbeE3viyiBqSgfHEi0 FEakXP3B6CaYX+yhg2RSo3YSAU7utWqiZ/3t3lRee7HeKDxOTbV0iT99YuIDvYiZ1ApMao BVYwTZ3WqzpFzrCzHdRbbp2TGcUIMzvVYzqit4rfjjZIl00thp60TQIwip6niA== 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 4MZZXN6wYWz17cw; Sat, 24 Sep 2022 16:41:08 +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 28OGf8H5055104; Sat, 24 Sep 2022 16:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28OGf8IF055103; Sat, 24 Sep 2022 16:41:08 GMT (envelope-from git) Date: Sat, 24 Sep 2022 16:41:08 GMT Message-Id: <202209241641.28OGf8IF055103@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 8c6fdee92af3 - main - net/tsclient: Fix build 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c6fdee92af393f5b153e015fcf9b370e0818587 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037669; 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=KYZg457CXHqjw4kzHPRi1h5NhCECw5pVMvn9oGnGOrw=; b=qidV9oZ/X/G2Dil1rKXgkOD55lZs4NQ80bMuz6ulHGs0dVJZ8RV++H5huu02GczGzGN3FP uiCu4Uw+mn7fD0pkhZHoA0N+HcGx1vJQX4MUFLqdHnoXl22UVQczq1hLaG7A1yCv2Oyo0Q FaSmqKi2la/+aRXqVbE/kOc0AwMNV90GCY+1kGeyvqNKBcslsCR3y87Lkbl2W2NT53X/+p jhnK5RHelCpq3dMqzv4Wtcvrh3OgivGh1zPhj15HI35V5JxaZdpQQ7Wr4osmqHa7I2Tlqc ClMrnADex0arfRX9sN1QtG+1hO6iWFVMmKxDplTUQZN46l+NXBUUtI3xDekJDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664037669; a=rsa-sha256; cv=none; b=xneeZt3RgsTPTeimxs7BdJMt6zCoX30Czism1WFKWxl6Lj0Jth71tzKGU6ldiB6a+qO1Bz W+bISfOvG/TwkLIFuywepzrwKcKh9OKvMeE8+RYcmhik8abmoEvcztCi+RDf+3tusmPR8t NshCz26z0RM0Y4vJZjkFey8QypoaU92tWSBB6VvHf0MErgzv72IurqugADar4XqdGdp7fV 5lJ0Mn7nEjnNL/saxqByon4JY9N18veVyi/2gdOsQFTBKh6bDeXzm1BThqu07/OHVTZOfi Xj0d10FqPM1hnjyg0ffYn8IcEHlOMryIsI1KlMYJL8UhO+pNNxsZiV7FupwG9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c6fdee92af393f5b153e015fcf9b370e0818587 commit 8c6fdee92af393f5b153e015fcf9b370e0818587 Author: NAKAJI Hiroyuki AuthorDate: 2022-09-22 15:44:11 +0000 Commit: Fernando Apesteguía CommitDate: 2022-09-24 16:37:35 +0000 net/tsclient: Fix build Remove BROKEN*: ld: error: duplicate symbol: gConnect PR: 266543 Reported by: nakaji@kankyo-u.ac.jp Approved by: ports@thepentagon.org (maintainer, timeout > 2 weeks) --- net/tsclient/Makefile | 3 --- net/tsclient/files/patch-src_connect.c | 10 ++++++++++ net/tsclient/files/patch-src_connect.h | 11 +++++++++++ net/tsclient/files/patch-src_main.c | 10 ++++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index c9d63b78cc3c..e622d53447c2 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -8,9 +8,6 @@ MAINTAINER= ports@thepentagon.org COMMENT= GNOME 2 frontend for rdesktop and vncviewer WWW= https://sourceforge.net/projects/tsclient/ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: gConnect -BROKEN_FreeBSD_14= ld: error: duplicate symbol: gConnect - RUN_DEPENDS= rdesktop:net/rdesktop USES= gettext gmake gnome libtool pathfix pkgconfig diff --git a/net/tsclient/files/patch-src_connect.c b/net/tsclient/files/patch-src_connect.c new file mode 100644 index 000000000000..29c517588d08 --- /dev/null +++ b/net/tsclient/files/patch-src_connect.c @@ -0,0 +1,10 @@ +--- src/connect.c.orig 2007-04-12 03:15:35.000000000 +0900 ++++ src/connect.c 2022-09-08 13:45:16.005967000 +0900 +@@ -27,6 +27,7 @@ + #include "connect.h" + #include "mrulist.h" + ++GtkWidget *gConnect; + + /*************************************** + * * diff --git a/net/tsclient/files/patch-src_connect.h b/net/tsclient/files/patch-src_connect.h new file mode 100644 index 000000000000..0439937eb0db --- /dev/null +++ b/net/tsclient/files/patch-src_connect.h @@ -0,0 +1,11 @@ +--- src/connect.h.orig 2007-03-27 02:34:26.000000000 +0900 ++++ src/connect.h 2022-09-08 13:45:24.448781000 +0900 +@@ -4,7 +4,7 @@ + * * + ***************************************/ + +-GtkWidget *gConnect; // used for global accessibility of main form! :-P ++// GtkWidget *gConnect; // used for global accessibility of main form! :-P + + int create_frmConnect (void); + diff --git a/net/tsclient/files/patch-src_main.c b/net/tsclient/files/patch-src_main.c new file mode 100644 index 000000000000..c25d9e3ec7f9 --- /dev/null +++ b/net/tsclient/files/patch-src_main.c @@ -0,0 +1,10 @@ +--- src/main.c.orig 2007-04-12 03:21:51.000000000 +0900 ++++ src/main.c 2022-09-08 13:45:37.689308000 +0900 +@@ -17,6 +17,7 @@ + #include "support.h" + #include "connect.h" + ++extern GtkWidget *gConnect; + + static void tsc_print_help (); + static void tsc_print_version ();