From nobody Tue Apr 11 23:04:27 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 4Px1cr2dR2z44lS3; Tue, 11 Apr 2023 23:04:28 +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 4Px1cq59lGz4J6t; Tue, 11 Apr 2023 23:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254267; 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=oARB08JXBT/e3PQzPLHMbex3wMz5Ifl9DMaBzrMczwo=; b=r0lIaIXCAUr6R7Kzn3Ly4uIddA7N7ENy1TcOMRe7k4gjzw+jY/mtVNmr7Rk5A4HM0BxWSy coIKPRORgm7D66I4JWKAIWXLA1WRac1Yj0e7qQFjPgdFzDpHbIOJDNl9SgzstML5C8DMAE LGjzFRGBbHQUjkJHSvvVh/iql/CqazDoQ9d7ur9uz9AgAeGPtn2InNrCnYOFSwlsXRh5j7 HGdeViSzmecv+P/CmVprkqbTAV5kTQUjtraE5B/2RR6rovF/KVMZoSQ7ZRNrc1Zu8Fwsrp BWXmrvFY8WDwdPhk1VGUYVH43UpSho3bChHlrxd32GZN6BGBvuM2sPGeG4/a/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254267; 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=oARB08JXBT/e3PQzPLHMbex3wMz5Ifl9DMaBzrMczwo=; b=G241NTUj3CnMWDeQHbk+P1v4X723Vw/6IV3zJgr7UMI2KbUD1dCFGyeAQVcD3iJJj1lSak M2Gq6nDVnV/wxqHx0SxHeLjGv2mTWZMyIGK0+fPQKxUWjthqHfgqWJBE9xxllyu+mrZ7Cu GxRFJtiVDVfbspoxyOP5URI85hZGK2htN/ikJ0zXIEIZZCba88GctANchEzgNf8n++EUTY xYMsBpu6a/nsO9lrptidDHR4xXNa17FitesGPjc6E521wkirntVO57hDtkIx7OZhvBdbz9 lV1K/IDe8IuWVXGDjLWkk8s2xYn35I5FXIywCgsIgcvUG4A+I3zX8pCV8TESZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681254267; a=rsa-sha256; cv=none; b=cTUJ6swJypbTKmhmGSlKnFoxJKdGzSAOjwZ9znL7Tsrdsa4X9TpN4CdZ0olNGM7xYLDyxb cVAOABxi9Vv5CuKf6obKkr2dIqhumOFPQz/0CseE1WihSoRf0XbpL+XcUFoQVmU5PkrfOx 0LQ+UFjA9fa19v3gFESp6lo6URLsBrSVbFH9BKaZ81sw8O8AgMjJgTFkk2aWoXPczTvaal DY/kaM4NqVFqUyuGe5LBkfV9ZIEeVF7JhbW/AjC59J/U/yr5JpqAFg3OvfK4150uSlTuyO dasKbgMzHCdNH6l6rfU36eFvblcV6qdWbHcfVjghPOyxpbqMuWUJzENDCOeWJw== 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 4Px1cq3xpPzc5w; Tue, 11 Apr 2023 23:04:27 +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 33BN4Rwj072030; Tue, 11 Apr 2023 23:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BN4RJ6072029; Tue, 11 Apr 2023 23:04:27 GMT (envelope-from git) Date: Tue, 11 Apr 2023 23:04:27 GMT Message-Id: <202304112304.33BN4RJ6072029@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 1d834b477266 - main - net/gq: fix build with -fno-common 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d834b477266c24eeee5c6debeaf93829336b0bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d834b477266c24eeee5c6debeaf93829336b0bf commit 1d834b477266c24eeee5c6debeaf93829336b0bf Author: Robert Clausecker AuthorDate: 2023-04-11 01:18:25 +0000 Commit: Robert Clausecker CommitDate: 2023-04-11 23:02:44 +0000 net/gq: fix build with -fno-common Remove two unused variables defined in headers. This fixes the build on FreeBSD 13+. While we are at it, add missing LIB_DEPENDS and USE_GNOME entries as indicated by stage-qa. --- net/gq/Makefile | 16 +++++++++------- net/gq/files/patch-src_dt__entry.h | 11 +++++++++++ net/gq/files/patch-src_gq-browser-node-reference.h | 11 +++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/net/gq/Makefile b/net/gq/Makefile index 547e4780c24b..de2fb2905d37 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -1,6 +1,6 @@ PORTNAME= gq PORTVERSION= 1.3.4 -PORTREVISION= 18 +PORTREVISION= 19 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION} @@ -13,14 +13,16 @@ LICENSE= GPLv2+ LGPL21+ # some source files are under lgpl LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: dt_entry_handler -BROKEN_FreeBSD_14= ld: error: duplicate symbol: dt_entry_handler +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgcrypt.so:security/libgcrypt \ + libgnome-keyring.so:security/libgnome-keyring \ + libgpg-error.so:security/libgpg-error \ + libharfbuzz.so:print/harfbuzz -LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring - -USES= desktop-file-utils gettext gmake gnome ldap pkgconfig \ +USES= desktop-file-utils gettext gmake gnome iconv ldap pkgconfig \ shared-mime-info ssl -USE_GNOME= intltool libglade2 +USE_GNOME= cairo intltool gdkpixbuf2 libglade2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb diff --git a/net/gq/files/patch-src_dt__entry.h b/net/gq/files/patch-src_dt__entry.h new file mode 100644 index 000000000000..07c6bfa7a5e3 --- /dev/null +++ b/net/gq/files/patch-src_dt__entry.h @@ -0,0 +1,11 @@ +--- src/dt_entry.h.orig 2023-04-11 01:15:28 UTC ++++ src/dt_entry.h +@@ -44,7 +44,7 @@ struct _dt_entry_handler { + + GByteArray* (*encode)(const char *val, int len); + GByteArray* (*decode)(const char *val, int len); +-} dt_entry_handler; ++}; + + /* Methods, only to be used by subclasses */ + GtkWidget *dt_entry_get_widget(int error_context, diff --git a/net/gq/files/patch-src_gq-browser-node-reference.h b/net/gq/files/patch-src_gq-browser-node-reference.h new file mode 100644 index 000000000000..6e8de26f4be8 --- /dev/null +++ b/net/gq/files/patch-src_gq-browser-node-reference.h @@ -0,0 +1,11 @@ +--- src/gq-browser-node-reference.h.orig 2023-04-11 01:15:02 UTC ++++ src/gq-browser-node-reference.h +@@ -51,7 +51,7 @@ struct _GqBrowserNodeReference { + char *uri; + GqServer *server; + gboolean expanded; +-} ref_browse_entry; ++}; + + G_END_DECLS +