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

Accepting request 234332 from multimedia:libs

Browse Source 
-Remove rubbish from the last patch.
- BuildRequire cmake >= 2.8

- Fix build error in 11.4
  taglib-1.9.1.uint.patch

OBS-URL: https://build.opensuse.org/request/show/234332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/taglib?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2014-05-18 04:50:05 +00:00 committed by Git OBS Bridge
commit f66ca690b4
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,27 @@
---
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"));
}
};

11
taglib.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- Fix build error in 11.4
taglib-1.9.1.uint.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 9 00:04:23 UTC 2013 - hrvoje.senjan@gmail.com Wed Oct 9 00:04:23 UTC 2013 - hrvoje.senjan@gmail.com

7
taglib.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package taglib # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,8 +29,10 @@ Source100: baselibs.conf
Patch1: taglib-1.7.2-doxygen.patch Patch1: taglib-1.7.2-doxygen.patch
# Get example executables to build without rpath # Get example executables to build without rpath
Patch3: taglib-1.8-strip-rpath.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake >= 2.8
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -102,6 +104,7 @@ This package contains development files for taglib.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch3 %patch3
%patch4 -p1
%build %build
mkdir build mkdir build