From f8ef88cff6fb7be4168a8950c1d6b48af6e3c0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Nov 2022 22:46:20 +0700 Subject: [PATCH] easytag: fix for change in id3lib ABI --- srcpkgs/easytag/patches/id3-abi.patch | 50 +++++++++++++++++++++++++++ srcpkgs/easytag/template | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/easytag/patches/id3-abi.patch diff --git a/srcpkgs/easytag/patches/id3-abi.patch b/srcpkgs/easytag/patches/id3-abi.patch new file mode 100644 index 00000000000..ba95d70d420 --- /dev/null +++ b/srcpkgs/easytag/patches/id3-abi.patch @@ -0,0 +1,50 @@ +Index: easytag-2.4.3/src/tags/id3lib/c_wrapper.cpp +=================================================================== +--- easytag-2.4.3.orig/src/tags/id3lib/c_wrapper.cpp ++++ easytag-2.4.3/src/tags/id3lib/c_wrapper.cpp +@@ -39,10 +39,10 @@ extern "C" + // Tag wrappers + // + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc) + { +- bool changed = false; ++ ID3_Bool changed = ID3_False; + if (field) + { + ID3_CATCH(changed = reinterpret_cast(field)->SetEncoding(enc)); +@@ -61,10 +61,10 @@ extern "C" + return enc; + } + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Field_IsEncodable(const ID3Field *field) + { +- bool isEncodable = false; ++ ID3_Bool isEncodable = ID3_False; + if (field) + { + ID3_CATCH(isEncodable = reinterpret_cast(field)->IsEncodable()); +Index: easytag-2.4.3/src/tags/id3lib/id3_bugfix.h +=================================================================== +--- easytag-2.4.3.orig/src/tags/id3lib/id3_bugfix.h ++++ easytag-2.4.3/src/tags/id3lib/id3_bugfix.h +@@ -29,13 +29,13 @@ + G_BEGIN_DECLS + + #if !HAVE_DECL_ID3FIELD_SETENCODING +-ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc); ++ID3_C_EXPORT ID3_Bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc); + #endif /* !HAVE_DECL_ID3FIELD_SETENCODING */ + #if !HAVE_DECL_ID3FIELD_GETENCODING + ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field); + #endif /* !HAVE_DECL_ID3FIELD_GETENCODING */ + #if !HAVE_DECL_ID3FIELD_ISENCODABLE +-ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field); ++ID3_C_EXPORT ID3_Bool CCONV ID3Field_IsEncodable (const ID3Field *field); + #endif /* !HAVE_DECL_ID3FIELD_ISENCODABLE */ + ID3_C_EXPORT ID3_FieldType CCONV ID3Field_GetType (const ID3Field *field); + //ID3_C_EXPORT ID3_FieldID CCONV ID3Field_GetID (const ID3Field *field); diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template index 8123145c7e8..d352e705516 100644 --- a/srcpkgs/easytag/template +++ b/srcpkgs/easytag/template @@ -1,7 +1,7 @@ # Template file for 'easytag' pkgname=easytag version=2.4.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config" makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel