Date: Wednesday, June 6, 2018 @ 21:20:48
  Author: arojas
Revision: 326083

BUILDINFO rebuild

Added:
  libid3tag/trunk/libid3tag-gperf.patch
Modified:
  libid3tag/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   28 +++++++++++++++++++---------
 libid3tag-gperf.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-06-06 21:09:25 UTC (rev 326082)
+++ PKGBUILD    2018-06-06 21:20:48 UTC (rev 326083)
@@ -4,7 +4,7 @@
 
 pkgname=libid3tag
 pkgver=0.15.1b
-pkgrel=8
+pkgrel=9
 pkgdesc="library for id3 tagging"
 arch=('x86_64')
 url="http://www.underbit.com/products/mad/";
@@ -13,25 +13,35 @@
 makedepends=('gperf')
 source=("ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz";
        'id3tag.pc'
-       '10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch')
+       '10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch' 
libid3tag-gperf.patch)
 md5sums=('e5808ad997ba32c498803822078748c3'
-       '8bb41fd814fafcc37ec8bc88f5545a4a'
-       '4f9df4011e6a8c23240fff5de2d05f6e'
-       '3ca856b97924d48a0fdfeff0bd83ce7d'
-       'c51822ea6301b1ca469975f0c9ee8e34')
+         '8bb41fd814fafcc37ec8bc88f5545a4a'
+         '4f9df4011e6a8c23240fff5de2d05f6e'
+         '3ca856b97924d48a0fdfeff0bd83ce7d'
+         'c51822ea6301b1ca469975f0c9ee8e34'
+         '85502349069e61eaeea4610b1ea6cb56'
+         'f1c84edb7e363dacd3e4871f8513c0a2'
+         '07d07472c6ef7ed5df3069fddbed0e63')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd $pkgname-$pkgver
   patch -p1 -i ${srcdir}/10_utf16.diff
   patch -p1 -i ${srcdir}/11_unknown_encoding.diff
   patch -Np0 -i ${srcdir}/CVE-2008-2109.patch
+  patch -p1 -i ../libid3tag-gperf.patch # Fedora patch
 
+  rm compat.c frametype.c # regenerate them from gperf sources
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 "${srcdir}/id3tag.pc" 
"${pkgdir}/usr/lib/pkgconfig/id3tag.pc"
 }

Added: libid3tag-gperf.patch
===================================================================
--- libid3tag-gperf.patch                               (rev 0)
+++ libid3tag-gperf.patch       2018-06-06 21:20:48 UTC (rev 326083)
@@ -0,0 +1,26 @@
+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);
+ 
+ # endif
+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 *);
+ 
+

Reply via email to