Date: Fri, 28 Aug 2020 18:43:02 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546794 - head/audio/denemo/files Message-ID: <202008281843.07SIh27S042185@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Aug 28 18:43:02 2020 New Revision: 546794 URL: https://svnweb.freebsd.org/changeset/ports/546794 Log: audio/denemo: fix build on current - backport of http://git.savannah.gnu.org/cgit/denemo.git/patch/?id=8de3af94182e4cbdfced6c3ab775a13df7f6948b Obtained from: http://git.savannah.gnu.org/cgit/denemo.git/patch/?id=8de3af94182e4cbdfced6c3ab775a13df7f6948b Added: head/audio/denemo/files/patch-include_denemo_denemo__types.h (contents, props changed) head/audio/denemo/files/patch-src_export_print.c (contents, props changed) head/audio/denemo/files/patch-src_export_print.h (contents, props changed) Added: head/audio/denemo/files/patch-include_denemo_denemo__types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/denemo/files/patch-include_denemo_denemo__types.h Fri Aug 28 18:43:02 2020 (r546794) @@ -0,0 +1,20 @@ +--- include/denemo/denemo_types.h.orig 2020-08-28 18:35:58 UTC ++++ include/denemo/denemo_types.h +@@ -429,7 +429,7 @@ enum + COL_ROW, + COL_SCHEME, + N_COLUMNS +-} COMMAND_COLS; ++}; + + typedef enum { TYPESET_EXCERPT, TYPESET_MOVEMENT, TYPESET_ALL_MOVEMENTS} typeset_type; + +@@ -1212,6 +1212,7 @@ struct DenemoRoot + gboolean *fatal_scheme_errors; /** Abort on scheme errors */ + gboolean *silent; /** Don't log any message */ + gboolean *verbose; /** Display every messages */ +-} Denemo; /**< The root object. */ ++}; + ++extern struct DenemoRoot Denemo; /**< The root object. */ + #endif Added: head/audio/denemo/files/patch-src_export_print.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/denemo/files/patch-src_export_print.c Fri Aug 28 18:43:02 2020 (r546794) @@ -0,0 +1,13 @@ +--- src/export/print.c.orig 2020-08-28 18:37:44 UTC ++++ src/export/print.c +@@ -30,7 +30,9 @@ + #include "export/exportlilypond.h" + #include "core/utils.h" + +- ++gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr ++GError *lily_err; ++GPid previewerpid; + + #if GTK_MAJOR_VERSION==3 + typedef enum Added: head/audio/denemo/files/patch-src_export_print.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/denemo/files/patch-src_export_print.h Fri Aug 28 18:43:02 2020 (r546794) @@ -0,0 +1,15 @@ +--- src/export/print.h.orig 2020-08-28 18:38:07 UTC ++++ src/export/print.h +@@ -108,9 +108,9 @@ typedef struct WysiwygInfo + GtkWidget *dialog; //an info dialog to tell the user what to do next... + } WysiwygInfo; + +-gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr +-GError *lily_err; +-GPid previewerpid; ++extern gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr ++extern GError *lily_err; ++extern GPid previewerpid; + + WysiwygInfo* get_wysiwyg_info(); + void initialize_print_status (void);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008281843.07SIh27S042185>