pool/taglib
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 230244 from home:olh:branches:multimedia:libs

Browse Source 
- 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
This commit is contained in:
Wojtek Dziewięcki
2014-04-18 13:39:26 +00:00
committed by Git OBS Bridge
parent 541dc040bb
commit 7d2a6efabb
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
taglib-1.9.1.uint.patch Normal file
View File

@@ -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"));
}
};

6
taglib.changes
View File

@@ -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

5
taglib.spec
View File

@@ -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