svn commit: r546095 - in head/audio/xoscope: . files

[Diane Bruce]

Author: db
Date: Mon Aug 24 15:58:15 2020
New Revision: 546095
URL: https://svnweb.freebsd.org/changeset/ports/546095

Log:
  - fix under clang11
  - add LICENSE
  - pet portlint

Added:
  head/audio/xoscope/files/patch-com__gtk.c   (contents, props changed)
  head/audio/xoscope/files/patch-com__gtk.h   (contents, props changed)
  head/audio/xoscope/files/patch-display.c   (contents, props changed)
  head/audio/xoscope/files/patch-gr__gtk.c   (contents, props changed)
Modified:
  head/audio/xoscope/Makefile

Modified: head/audio/xoscope/Makefile
==============================================================================
--- head/audio/xoscope/Makefile	Mon Aug 24 15:55:38 2020	(r546094)
+++ head/audio/xoscope/Makefile	Mon Aug 24 15:58:15 2020	(r546095)
@@ -2,17 +2,23 @@
 
 PORTNAME=	xoscope
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio hamradio
 MASTER_SITES=	SF
 
 MAINTAINER=	db at FreeBSD.org
 COMMENT=	Sound card oscilloscope
 
+LICENSE=	GPLv1
+LICENSE_FILE=	${WRKSRC}/README
+
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} --sysconfdir=${STAGEDIR}${PREFIX}
 USES=		gmake gnome pkgconfig tar:tgz xorg
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 
 .include <bsd.port.mk>

Added: head/audio/xoscope/files/patch-com__gtk.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xoscope/files/patch-com__gtk.c	Mon Aug 24 15:58:15 2020	(r546095)
@@ -0,0 +1,11 @@
+--- com_gtk.c.orig	2020-08-24 15:23:20 UTC
++++ com_gtk.c
+@@ -19,6 +19,8 @@
+ #include "com_gtk.h"
+ 
+ GdkPixmap *pixmap = NULL;
++extern GtkWidget *menubar;
++extern GtkWidget *glade_window;
+ int fixing_widgets = 0;
+ 
+ /* emulate several libsx function in GTK */

Added: head/audio/xoscope/files/patch-com__gtk.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xoscope/files/patch-com__gtk.h	Mon Aug 24 15:58:15 2020	(r546095)
@@ -0,0 +1,11 @@
+--- com_gtk.h.orig	2020-08-24 15:22:03 UTC
++++ com_gtk.h
+@@ -9,8 +9,6 @@
+  *
+  */
+ 
+-GtkWidget *menubar;
+-GtkWidget *glade_window;
+ 
+ gint expose_event();
+ gint key_press_event();

Added: head/audio/xoscope/files/patch-display.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xoscope/files/patch-display.c	Mon Aug 24 15:58:15 2020	(r546095)
@@ -0,0 +1,19 @@
+--- display.c.orig	2009-01-17 20:11:47 UTC
++++ display.c
+@@ -30,6 +30,8 @@
+ #include <gtkdatabox_marker.h>
+ 
+ extern GtkWidget *databox;
++extern GtkWidget *menubar;
++GtkWidget *glade_window;
+ 
+ #define DEBUG 0
+ 
+@@ -38,7 +40,6 @@ void	init_widgets();
+ void	fix_widgets();
+ 
+ int	triggered = 0;		/* whether we've triggered or not */
+-void	*font;
+ int	math_warning = 0;	/* TRUE if math has a problem */
+ 
+ struct signal_stats stats;

Added: head/audio/xoscope/files/patch-gr__gtk.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xoscope/files/patch-gr__gtk.c	Mon Aug 24 15:58:15 2020	(r546095)
@@ -0,0 +1,12 @@
+--- gr_gtk.c.orig	2020-08-24 15:25:56 UTC
++++ gr_gtk.c
+@@ -28,6 +28,9 @@
+ 
+ #include "xoscope.rc.h"
+ 
++extern GtkWidget *glade_window;
++extern GtkWidget *menubar;
++
+ char my_filename[FILENAME_MAX] = "";
+ GdkFont *font;
+ char fontname[80] = DEF_FX;