From nobody Sat Sep 24 16:43:49 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 4MZZgY71bsz4d45Z; Sat, 24 Sep 2022 16:47:21 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MZZgX51xvz3MXG; Sat, 24 Sep 2022 16:47:20 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id sd10so6385400ejc.2; Sat, 24 Sep 2022 09:47:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date; bh=5aayHX+JrSUNte22Ar7uzpf0dYi4P3xZLQgKrlexq0k=; b=3+6ZbtmLLDYcTxQuy4Z1dpq6MXGcx4g97kAb3oY3KBllUTNeydaNE90qETC7SKkX4G +U7xSCv4HXFgQaknSwkxZe9f07wL3IVRkLY8es4j/im5zlbwV51T3wArzHSjc1l0YgFZ ioE53kaZEDfhqeXkuymMZzL5jqI+I1Zvcx8n6H43WhDsuYdTYwAQQFNqqPDhiRz+AjOn QuxqbEAIDEHDtZYmenOkmxFOUKJcKH/IJsYA9OeiKGg2iQ6VZQphragma/CxVHTyooZE feyoIvkDBerY4fRcOlRBDfkvMYtu+1IJWsbklbY0Cc8h73PerXhIzsopqD8iXy6EW8fu d4/g== X-Gm-Message-State: ACrzQf0S4JrM2ccAnpKw4qrL8P5Q5SDEM8DphdJub4pGHclbl73stqy1 jQz9yg7SqfMPSH8Wjn2aoFJvxcpDOZolJw== X-Google-Smtp-Source: AMsMyM5Ka4mPe8oVVstFd/SO1i/ZIGuwLfPriZKW9Vo7/pbpMe7sGIdtJ/UjMoIM+7DJGd8P/8YNGA== X-Received: by 2002:a17:907:7b9e:b0:783:10cb:2826 with SMTP id ne30-20020a1709077b9e00b0078310cb2826mr1839526ejc.208.1664038039061; Sat, 24 Sep 2022 09:47:19 -0700 (PDT) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com. [209.85.208.50]) by smtp.gmail.com with ESMTPSA id ti5-20020a170907c20500b007813968e154sm5415626ejc.86.2022.09.24.09.47.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 24 Sep 2022 09:47:18 -0700 (PDT) Received: by mail-ed1-f50.google.com with SMTP id f20so3914196edf.6; Sat, 24 Sep 2022 09:47:18 -0700 (PDT) X-Received: by 2002:a05:6402:548a:b0:454:762b:158b with SMTP id fg10-20020a056402548a00b00454762b158bmr13916238edb.362.1664038038630; Sat, 24 Sep 2022 09:47:18 -0700 (PDT) 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 References: <202209241641.28OGf8IF055103@gitrepo.freebsd.org> In-Reply-To: <202209241641.28OGf8IF055103@gitrepo.freebsd.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Sat, 24 Sep 2022 18:43:49 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 8c6fdee92af3 - main - net/tsclient: Fix build To: "ports-committers@FreeBSD.org" , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4MZZgX51xvz3MXG X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of fernando.apesteguia@gmail.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=fernando.apesteguia@gmail.com X-Spamd-Result: default: False [-2.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.991]; NEURAL_HAM_LONG(-0.98)[-0.982]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.218.48:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.218.48:from,209.85.208.50:received]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_NA(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TAGGED_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com] X-ThisMailContainsUnwantedMimeParts: N On Sat, Sep 24, 2022 at 6:41 PM Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D8c6fdee92af393f5b153e015= fcf9b370e0818587 > > commit 8c6fdee92af393f5b153e015fcf9b370e0818587 > Author: NAKAJI Hiroyuki > AuthorDate: 2022-09-22 15:44:11 +0000 > Commit: Fernando Apestegu=C3=ADa > 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) ^^^^^ Not true, sorry. It wasn't 2 weeks. Apologies. > --- > 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=3D ports@thepentagon.org > COMMENT=3D GNOME 2 frontend for rdesktop and vncviewer > WWW=3D https://sourceforge.net/projects/tsclient/ > > -BROKEN_FreeBSD_13=3D ld: error: duplicate symbol: gConnect > -BROKEN_FreeBSD_14=3D ld: error: duplicate symbol: gConnect > - > RUN_DEPENDS=3D rdesktop:net/rdesktop > > USES=3D 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/pat= ch-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 ();