Skip to content

Commit

Permalink
net/gq: fix build with -fno-common
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
clausecker committed Apr 11, 2023
1 parent b2f6d7d commit 1d834b4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 7 deletions.
16 changes: 9 additions & 7 deletions 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}
Expand All @@ -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

Expand Down
11 changes: 11 additions & 0 deletions 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,
11 changes: 11 additions & 0 deletions 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

0 comments on commit 1d834b4

Please sign in to comment.