commit ed68c3e2610481272414a99d220c6a9d944acc86 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Jul 19 10:45:02 2016 +0100 fix mac ABI breakage mac_abi_change.patch | 24 ++++++++++++++++++++++++ xmms2-nonfree.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) --- diff --git a/mac_abi_change.patch b/mac_abi_change.patch new file mode 100644 index 0000000..4a272de --- /dev/null +++ b/mac_abi_change.patch @@ -0,0 +1,24 @@ +--- a/src/plugins/mac/source_adapter.h ++++ b/src/plugins/mac/source_adapter.h +@@ -38,7 +38,7 @@ + ~CSourceAdapter () {}; + + // open / close +- int Open (const wchar_t * pName) { return ERROR_SUCCESS; } ++ int Open(const wchar_t * pName, BOOL bOpenReadOnly = FALSE) { return ERROR_SUCCESS; } + int Close () { return ERROR_SUCCESS; } + + // read / write + +--- a/src/plugins/mac/mac.cpp ++++ b/src/plugins/mac/mac.cpp +@@ -210,7 +210,7 @@ + gchar *name; + + field_name = pTagField->GetFieldName (); +- name = (gchar *)GetUTF8FromUTF16 (field_name); ++ name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name); + + memset (field_value, 0, 255); + int size = 255; + diff --git a/xmms2-nonfree.spec b/xmms2-nonfree.spec index c716f02..1f83b0b 100644 --- a/xmms2-nonfree.spec +++ b/xmms2-nonfree.spec @@ -3,7 +3,7 @@ Name: xmms2-nonfree Summary: Nonfree plugins for XMMS2 Version: 0.8 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: Applications/Multimedia # Fedora's xmms2 has to use a sanitized tarball, we don't. @@ -13,6 +13,7 @@ Patch0: xmms2-0.8DrO_o-use-libdir.patch # Don't add extra CFLAGS, we're smart enough, thanks. Patch1: xmms2-0.8DrO_o-no-O0.patch Patch2: fix_vorbis_dso.patch +Patch3: mac_abi_change.patch URL: http://wiki.xmms2.xmms.se/ BuildRequires: sqlite-devel @@ -53,6 +54,7 @@ This package contains an XMMS2 Plugin for listening to Monkey's Audio files. %patch0 -p1 -b .plugins-use-libdir %patch1 -p1 -b .noO0 %patch2 -p1 -b .fix_vorbis_dso +%patch3 -p1 -b .mac_abi_change # For some reasons RPMFusion's sidplay libraries are moved to a # non-standard location. xmms2 can't detect this unless: @@ -153,6 +155,9 @@ chmod +x %{buildroot}%{_libdir}/xmms2/* %{_libdir}/xmms2/libxmms_mac.so %changelog +* Tue Jul 19 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.8-7 +- fix mac ABI breakage + * Tue Jan 06 2015 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.8-6 - Drop sid support RFBZ#2764