gentoo resync : 13.11.2021

2 files changed, 0 insertions, 142 deletions

diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
deleted file mode 100644
index 982ccfade868..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 14 Aug 2019 13:51:32 +0200
-Subject: [PATCH] configure.ac: patch to find guile-2.2
-
-The patch uses the GUILE_PKG command to find any installed
-version of guile instead of explicitly checking for guile-1.8
-and guile-2.0 but missing guile-2.2.
-This patch was already provided to upstream with denemo-2.2, but
-didn't yet get accepted due to not being able to compile the
-Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821)
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- configure.ac | 41 +++--------------------------------------
- 1 file changed, 3 insertions(+), 38 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f85b74e..1fc0af0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,10 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_YACC
- AM_PROG_LEX
-+GUILE_PKG
- GUILE_FLAGS
-+CFLAGS="$CFLAGS $GUILE_CFLAGS"
-+LIBS="$LIBS $GUILE_LIBS"
- 
- AC_PROG_LIBTOOL
- 
-@@ -63,44 +66,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
- 
- AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
- 
--AC_ARG_ENABLE(
--  guile_1_8,
--  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_1_8=yes
--      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--      LIBS="$LIBS $GUILE_1_8_LIBS"
--      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    fi
--  ], [ useguile_1_8=no ])
--
--AC_ARG_ENABLE(
--  guile_2_0,
--  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_2_0=yes
--      PKG_CHECK_MODULES(GUILE_2, guile-2.0 >= 2.0)
--      LIBS="$LIBS $GUILE_2_LIBS"
--      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--    fi
--  ], [ useguile_2_0=no ])
--
--if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
--  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
--  LIBS="$LIBS $GUILE_2_LIBS"
--  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--  if test "x$useguile_2_0" = "xno"; then
--    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--    LIBS="$LIBS $GUILE_1_8_LIBS"
--    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    useguile_1_8=yes
--  else
--    useguile_2_0=yes
--  fi
--fi
--
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
--- 
-2.22.0
-
diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
deleted file mode 100644
index 425662e042c9..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 20 Mar 2020 21:03:02 +0100
-Subject: [PATCH] Fix issues with gcc10 -fno-common flag
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- include/denemo/denemo_types.h | 7 ++++---
- src/export/print.h            | 6 +++---
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h
-index 1d67827..936892b 100644
---- a/include/denemo/denemo_types.h
-+++ b/include/denemo/denemo_types.h
-@@ -430,7 +430,7 @@ typedef enum{
- } SCRIPT_TYPE;
- 
- //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!!
--enum
-+typedef enum
- {
-   COL_TYPE = 0,
-   COL_NAME,
-@@ -1167,7 +1167,7 @@ struct cs_callback
-  * The (singleton) root object for the program
-  *
-  */
--struct DenemoRoot
-+typedef struct DenemoRoot
- {
-   gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/
-   gchar *scheme_file;/* filename for scheme code to run on startup */
-@@ -1258,6 +1258,7 @@ struct DenemoRoot
-   gboolean *silent; /** Don't log any message */
-   gboolean *verbose; /** Display every messages */
-   guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id 
--}  Denemo; /**< The root object. */
-+};
-+extern struct DenemoRoot Denemo; /**< The root object. */
- 
- #endif
-diff --git a/src/export/print.h b/src/export/print.h
-index db0c8f1..64a3a8d 100644
---- a/src/export/print.h
-+++ b/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);
--- 
-2.25.1
-