From eaaca4310850221d218f405f3398717b9227702f52c6afd1215d73ed343a8a92 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 11 May 2017 07:57:08 +0000
Subject: [PATCH] Accepting request 494425 from
 home:alarrosa:branches:multimedia:libs

- Add fix-build-with-gperf-3.1.diff to fix build with gperf 3.1
  which now uses size_t instead of unsigned int for the len parameter
  of the hash/lookup function.

OBS-URL: https://build.opensuse.org/request/show/494425
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libid3tag?expand=0&rev=13
---
 fix-build-with-gperf-3.1.diff | 25 +++++++++++++++++++++++++
 libid3tag.changes             |  7 +++++++
 libid3tag.spec                |  7 ++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 fix-build-with-gperf-3.1.diff

diff --git a/fix-build-with-gperf-3.1.diff b/fix-build-with-gperf-3.1.diff
new file mode 100644
index 0000000..37641f9
--- /dev/null
+++ b/fix-build-with-gperf-3.1.diff
@@ -0,0 +1,25 @@
+Index: libid3tag-0.15.1b/compat.h
+===================================================================
+--- libid3tag-0.15.1b.orig/compat.h
++++ libid3tag-0.15.1b/compat.h
+@@ -34,7 +34,7 @@ struct id3_compat {
+ };
+ 
+ struct id3_compat const *id3_compat_lookup(register char const *,
+-					   register unsigned int);
++					   register size_t);
+ 
+ int id3_compat_fixup(struct id3_tag *);
+ 
+Index: libid3tag-0.15.1b/frametype.h
+===================================================================
+--- libid3tag-0.15.1b.orig/frametype.h
++++ libid3tag-0.15.1b/frametype.h
+@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_fr
+ extern struct id3_frametype const id3_frametype_obsolete;
+ 
+ struct id3_frametype const *id3_frametype_lookup(register char const *,
+-						 register unsigned int);
++						 register size_t);
+ #pragma GCC visibility pop
+ # endif
diff --git a/libid3tag.changes b/libid3tag.changes
index 66bb555..f0c2bff 100644
--- a/libid3tag.changes
+++ b/libid3tag.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 10 18:52:12 UTC 2017 - alarrosa@suse.com
+
+- Add fix-build-with-gperf-3.1.diff to fix build with gperf 3.1
+  which now uses size_t instead of unsigned int for the len parameter
+  of the hash/lookup function.
+
 -------------------------------------------------------------------
 Tue Jun 16 12:18:10 UTC 2015 - mpluskal@suse.com
 
diff --git a/libid3tag.spec b/libid3tag.spec
index 58aabf9..25708c4 100644
--- a/libid3tag.spec
+++ b/libid3tag.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libid3tag
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,6 +33,8 @@ Patch3:         libid3tag-automake-fix.dif
 Patch4:         libid3tag-optflags.patch
 Patch5:         libid3tag-0.15.1b-fix_overflow.patch
 Patch6:         libid3tag-visibility.patch
+# PATCH-FIX-UPSTREAM fix-build-with-gperf-3.1.diff alarrosa@suse.com -- Fix build with gperf 3.1
+Patch7:         fix-build-with-gperf-3.1.diff
 BuildRequires:  gperf
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -73,6 +75,9 @@ develop applications with libid3tag.
 %patch4
 %patch5
 %patch6
+%if 0%{?suse_version} > 1320
+%patch7 -p1
+%endif
 
 %build
 autoreconf -fiv