Accepting request 617488 from home:plater

Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.

OBS-URL: https://build.opensuse.org/request/show/617488
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=39
This commit is contained in:
Dave Plater 2018-06-18 10:46:06 +00:00 committed by Git OBS Bridge
parent 6cafa4cf9d
commit a0166cef29
3 changed files with 35 additions and 0 deletions

28
buzztrax-newfix.patch Normal file
View File

@ -0,0 +1,28 @@
From: Dave Plater <davejplater@gmail.com>
Date: 2018-06-18 12:34:22 +0200
Subject: Something has changed in Factory
References:
Upstream: to be submitted
Something has changed in Factory to cause the "-" to be outlawed in "name" in:
GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)
Index: src/gst/dec/bt-dec.c
===================================================================
--- src/gst/dec/bt-dec.c.orig 2015-12-29 23:24:20.000000000 +0200
+++ src/gst/dec/bt-dec.c 2018-06-18 10:59:18.702989750 +0200
@@ -947,12 +947,12 @@ plugin_init (GstPlugin * plugin)
bt_dec_type_find, exts, GST_CAPS_ANY, NULL, NULL);
g_free (exts);
- return gst_element_register (plugin, "buzztrax-dec", GST_RANK_MARGINAL,
+ return gst_element_register (plugin, "buzztrax_dec", GST_RANK_MARGINAL,
BT_TYPE_DEC);
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- buzztrax - dec,
+ buzztrax_dec,
"Buzztrax song renderer",
plugin_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.buzztrax.org");

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 18 10:22:38 UTC 2018 - davejplater@gmail.com
- Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.
-------------------------------------------------------------------
Mon Jun 11 11:38:06 UTC 2018 - davejplater@gmail.com

View File

@ -44,6 +44,7 @@ Patch1: buzztrax-appdata.patch
Patch2: buzztrax-misleading-indentation.patch
# PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch davepl@gmail.com -- fix gcc 7 duplicate constant errors
Patch3: buzztrax-gcc7fix.patch
Patch4: buzztrax-newfix.patch
BuildRequires: automake >= 1.13
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@ -206,6 +207,7 @@ This package contains buzztrax plugins
%patch1
%patch2
%patch3
%patch4
# Rpmlint complains that COPYING-DOCS is outdated
cp -v %{SOURCE2} .
cp -v %{SOURCE1} .