diff options
author | Diane Bruce <db@FreeBSD.org> | 2020-08-24 16:24:07 +0000 |
---|---|---|
committer | Diane Bruce <db@FreeBSD.org> | 2020-08-24 16:24:07 +0000 |
commit | 111ecda414b0a68602ae1bea3cf8fc89f5c3519e (patch) | |
tree | cb034f3687d5cd2a16472215737861bb37aa9b3b /comms | |
parent | - fix under clang11 (diff) |
- Fix build under clang 11
- add missing dependancies
Notes
Notes:
svn path=/head/; revision=546096
Diffstat (limited to 'comms')
-rw-r--r-- | comms/xdx/Makefile | 15 | ||||
-rw-r--r-- | comms/xdx/files/patch-src_Makefile.in | 15 | ||||
-rw-r--r-- | comms/xdx/files/patch-src_gui.c | 10 | ||||
-rw-r--r-- | comms/xdx/files/patch-src_gui.h | 11 |
4 files changed, 45 insertions, 6 deletions
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index c6bf277a1e34..7f47be0271ed 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -3,7 +3,7 @@ PORTNAME= xdx PORTVERSION= 2.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= comms hamradio MASTER_SITES= http://www.chronos.org.uk/download/ \ LOCAL/db @@ -13,13 +13,16 @@ COMMENT= Amateur Radio DX cluster monitor LICENSE= GPLv2 -USES= gmake gnome pkgconfig -USE_GNOME= gtk20 +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= gettext gmake gnome pkgconfig +USE_GNOME= cairo gtk20 gdkpixbuf2 GNU_CONFIGURE= yes -post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-D.*_DISABLE_DEPRECATED||g' +#post-patch: +# @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ +# 's|-D.*_DISABLE_DEPRECATED||g' .include <bsd.port.mk> diff --git a/comms/xdx/files/patch-src_Makefile.in b/comms/xdx/files/patch-src_Makefile.in new file mode 100644 index 000000000000..ef7ac29b1b65 --- /dev/null +++ b/comms/xdx/files/patch-src_Makefile.in @@ -0,0 +1,15 @@ +--- src/Makefile.in.orig 2007-11-21 17:46:24 UTC ++++ src/Makefile.in +@@ -181,11 +181,7 @@ INCLUDES = \ + @GTK_CFLAGS@ -I.. \ + -DPACKAGE_DATA_DIR=\"$(datadir)/xdx\" \ + -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \ +- -DPACKAGE_SOURCE_DIR=\"$(srcdir)\" \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++ -DPACKAGE_SOURCE_DIR=\"$(srcdir)\" + + xdx_SOURCES = \ + gui.h \ diff --git a/comms/xdx/files/patch-src_gui.c b/comms/xdx/files/patch-src_gui.c new file mode 100644 index 000000000000..f375a028556d --- /dev/null +++ b/comms/xdx/files/patch-src_gui.c @@ -0,0 +1,10 @@ +--- src/gui.c.orig 2020-08-23 16:44:09 UTC ++++ src/gui.c +@@ -41,6 +41,7 @@ + #include "text.h" + + extern preferencestype preferences; ++guitype *gui; + + static void on_highcheck_toggled (GtkToggleButton *togglebutton, gpointer user_data); + static void on_soundcheck_toggled (GtkToggleButton *togglebutton, gpointer user_data); diff --git a/comms/xdx/files/patch-src_gui.h b/comms/xdx/files/patch-src_gui.h new file mode 100644 index 000000000000..b54446c08f7a --- /dev/null +++ b/comms/xdx/files/patch-src_gui.h @@ -0,0 +1,11 @@ +--- src/gui.h.orig 2006-02-26 19:41:12 UTC ++++ src/gui.h +@@ -49,7 +49,7 @@ typedef struct guitype { + gchar *high8tagname; + } guitype; + +-guitype *gui; ++extern guitype *gui; + + guitype *new_gui(void); + void create_mainwindow (void); |