From 7d2a6efabb68b9195decb52a10c8b24aef1da4f48630caeecf8fc06e6cb1790d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20Dziewi=C4=99cki?= Date: Fri, 18 Apr 2014 13:39:26 +0000 Subject: [PATCH 1/3] Accepting request 230244 from home:olh:branches:multimedia:libs - Fix build error in 11.4 taglib-1.9.1.uint.patch OBS-URL: https://build.opensuse.org/request/show/230244 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=62 --- taglib-1.9.1.uint.patch | 52 +++++++++++++++++++++++++++++++++++++++++ taglib.changes | 6 +++++ taglib.spec | 5 +++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 taglib-1.9.1.uint.patch diff --git a/taglib-1.9.1.uint.patch b/taglib-1.9.1.uint.patch new file mode 100644 index 0000000..cea0dac --- /dev/null +++ b/taglib-1.9.1.uint.patch @@ -0,0 +1,52 @@ +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp: In member function 'void TestInfoTag::testNumericFields()': +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:5: error: reference to 'uint' is ambiguous +[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:5: error: expected ')' before numeric constant +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:47: error: expected ')' before ';' token +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:5: error: reference to 'uint' is ambiguous +[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:5: error: expected ')' before numeric constant +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:50: error: expected ')' before ';' token +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:5: error: reference to 'uint' is ambiguous +[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:5: error: expected ')' before numeric constant +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:46: error: expected ')' before ';' token +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:5: error: reference to 'uint' is ambiguous +[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:5: error: expected ')' before numeric constant +[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:49: error: expected ')' before ';' token +[ 48s] make[2]: *** [tests/CMakeFiles/test_runner.dir/test_info.cpp.o] Error 1 +[ 48s] make[2]: *** Waiting for unfinished jobs.... +[ 49s] make[2]: Leaving directory `/usr/src/packages/BUILD/taglib-1.9.1/build' + +--- + tests/test_info.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: taglib-1.9.1/tests/test_info.cpp +=================================================================== +--- taglib-1.9.1.orig/tests/test_info.cpp ++++ taglib-1.9.1/tests/test_info.cpp +@@ -34,14 +34,14 @@ public: + { + RIFF::Info::Tag tag; + +- CPPUNIT_ASSERT_EQUAL((uint)0, tag.track()); ++ CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.track()); + tag.setTrack(1234); +- CPPUNIT_ASSERT_EQUAL((uint)1234, tag.track()); ++ CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.track()); + CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("IPRT")); + +- CPPUNIT_ASSERT_EQUAL((uint)0, tag.year()); ++ CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.year()); + tag.setYear(1234); +- CPPUNIT_ASSERT_EQUAL((uint)1234, tag.year()); ++ CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.year()); + CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("ICRD")); + } + }; diff --git a/taglib.changes b/taglib.changes index 7d72e92..5a5b560 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 15 14:56:26 UTC 2014 - olaf@aepfle.de + +- Fix build error in 11.4 + taglib-1.9.1.uint.patch + ------------------------------------------------------------------- Wed Oct 9 00:04:23 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/taglib.spec b/taglib.spec index 9323b66..cbbd766 100644 --- a/taglib.spec +++ b/taglib.spec @@ -1,7 +1,7 @@ # # spec file for package taglib # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Source100: baselibs.conf Patch1: taglib-1.7.2-doxygen.patch # Get example executables to build without rpath Patch3: taglib-1.8-strip-rpath.patch +# Fix build error with 11.4 +Patch4: taglib-1.9.1.uint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen @@ -102,6 +104,7 @@ This package contains development files for taglib. %setup -q %patch1 -p1 %patch3 +%patch4 -p1 %build mkdir build From 2f9b904321c13990a3286526e0e98ac82546a67fd75001d0b73a1a4e950472d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20Dziewi=C4=99cki?= Date: Fri, 16 May 2014 12:00:18 +0000 Subject: [PATCH 2/3] Accepting request 234263 from home:olh:branches:multimedia:libs - BuildRequire cmake >= 2.8 OBS-URL: https://build.opensuse.org/request/show/234263 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=63 --- taglib.changes | 5 +++++ taglib.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/taglib.changes b/taglib.changes index 5a5b560..fa15ab6 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 16 10:40:52 CEST 2014 - ohering@suse.de + +- BuildRequire cmake >= 2.8 + ------------------------------------------------------------------- Tue Apr 15 14:56:26 UTC 2014 - olaf@aepfle.de diff --git a/taglib.spec b/taglib.spec index cbbd766..7b521b5 100644 --- a/taglib.spec +++ b/taglib.spec @@ -32,7 +32,7 @@ Patch3: taglib-1.8-strip-rpath.patch # Fix build error with 11.4 Patch4: taglib-1.9.1.uint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake +BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ From 3a857cb713cf563776dec7587da391469b2e8566e64b5617cc97feb669b0d665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20Dziewi=C4=99cki?= Date: Fri, 16 May 2014 15:14:50 +0000 Subject: [PATCH 3/3] I fixed this patch which had some rubbish in it. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=64 --- taglib-1.9.1.uint.patch | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/taglib-1.9.1.uint.patch b/taglib-1.9.1.uint.patch index cea0dac..34eee56 100644 --- a/taglib-1.9.1.uint.patch +++ b/taglib-1.9.1.uint.patch @@ -1,28 +1,3 @@ -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp: In member function 'void TestInfoTag::testNumericFields()': -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:5: error: reference to 'uint' is ambiguous -[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:5: error: expected ')' before numeric constant -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:37:47: error: expected ')' before ';' token -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:5: error: reference to 'uint' is ambiguous -[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:5: error: expected ')' before numeric constant -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:39:50: error: expected ')' before ';' token -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:5: error: reference to 'uint' is ambiguous -[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:5: error: expected ')' before numeric constant -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:42:46: error: expected ')' before ';' token -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:5: error: reference to 'uint' is ambiguous -[ 48s] /usr/include/sys/types.h:153:22: error: candidates are: typedef unsigned int uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/../taglib/toolkit/taglib.h:66:30: error: typedef unsigned int TagLib::uint -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:5: error: expected ')' before numeric constant -[ 48s] /usr/src/packages/BUILD/taglib-1.9.1/tests/test_info.cpp:44:49: error: expected ')' before ';' token -[ 48s] make[2]: *** [tests/CMakeFiles/test_runner.dir/test_info.cpp.o] Error 1 -[ 48s] make[2]: *** Waiting for unfinished jobs.... -[ 49s] make[2]: Leaving directory `/usr/src/packages/BUILD/taglib-1.9.1/build' - --- tests/test_info.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)