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

Accepting request 176425 from home:plater

Browse Source 
Fix reopened bnc#814814

OBS-URL: https://build.opensuse.org/request/show/176425
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=54
This commit is contained in:
Dave Plater 2013-05-23 13:20:57 +00:00 committed by Git OBS Bridge
parent 80e22483e7
commit 9e2cc917e7
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
taglib-1.8-ds-rusxmms-r8.patch → taglib-1.8-ds-rusxmms-r9.patch
View File

@ -1,6 +1,6 @@
diff -dPNur taglib-1.8/config-taglib.h.cmake taglib-1.8-ds/config-taglib.h.cmake
--- taglib-1.8/config-taglib.h.cmake 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/config-taglib.h.cmake 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/config-taglib.h.cmake 2013-05-22 20:13:15.000000000 +0200
@@ -3,6 +3,8 @@
/* Define if you have libz */
#cmakedefine HAVE_ZLIB 1
@ -12,7 +12,7 @@ diff -dPNur taglib-1.8/config-taglib.h.cmake taglib-1.8-ds/config-taglib.h.cmake
#cmakedefine WITH_MP4 1
diff -dPNur taglib-1.8/ConfigureChecks.cmake taglib-1.8-ds/ConfigureChecks.cmake
--- taglib-1.8/ConfigureChecks.cmake 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/ConfigureChecks.cmake 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/ConfigureChecks.cmake 2013-05-22 20:13:15.000000000 +0200
@@ -14,6 +14,8 @@
set(HAVE_ZLIB 0)
endif()
@ -24,7 +24,7 @@ diff -dPNur taglib-1.8/ConfigureChecks.cmake taglib-1.8-ds/ConfigureChecks.cmake
if(NOT CppUnit_FOUND AND BUILD_TESTS)
diff -dPNur taglib-1.8/examples/tagreader_c.c taglib-1.8-ds/examples/tagreader_c.c
--- taglib-1.8/examples/tagreader_c.c 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/examples/tagreader_c.c 2013-04-24 19:10:37.000000000 +0200
+++ taglib-1.8-ds/examples/tagreader_c.c 2013-05-22 20:13:15.000000000 +0200
@@ -38,7 +38,7 @@
TagLib_Tag *tag;
const TagLib_AudioProperties *properties;
@ -36,7 +36,7 @@ diff -dPNur taglib-1.8/examples/tagreader_c.c taglib-1.8-ds/examples/tagreader_c
printf("******************** \"%s\" ********************\n", argv[i]);
diff -dPNur taglib-1.8/examples/tagwriter.cpp taglib-1.8-ds/examples/tagwriter.cpp
--- taglib-1.8/examples/tagwriter.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/examples/tagwriter.cpp 2013-04-25 23:48:17.000000000 +0200
+++ taglib-1.8-ds/examples/tagwriter.cpp 2013-05-22 20:13:15.000000000 +0200
@@ -92,7 +92,7 @@
if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) {
@ -48,7 +48,7 @@ diff -dPNur taglib-1.8/examples/tagwriter.cpp taglib-1.8-ds/examples/tagwriter.c
for(it = fileList.begin(); it != fileList.end(); ++it) {
diff -dPNur taglib-1.8/taglib/CMakeLists.txt taglib-1.8-ds/taglib/CMakeLists.txt
--- taglib-1.8/taglib/CMakeLists.txt 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/CMakeLists.txt 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/CMakeLists.txt 2013-05-22 20:13:15.000000000 +0200
@@ -35,6 +35,7 @@
audioproperties.h
taglib_export.h
@ -76,7 +76,7 @@ diff -dPNur taglib-1.8/taglib/CMakeLists.txt taglib-1.8-ds/taglib/CMakeLists.txt
set_target_properties(tag PROPERTIES
diff -dPNur taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp
--- taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2013-05-22 20:13:15.000000000 +0200
@@ -64,17 +64,18 @@
String ID3v1::StringHandler::parse(const ByteVector &data) const
@ -109,7 +109,7 @@ diff -dPNur taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp taglib-1.8-ds/taglib/mpeg/
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp
--- taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -150,10 +150,10 @@
return;
}
@ -140,7 +140,7 @@ diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp taglib-1.8-ds/
v.append(textDelimiter(encoding));
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
--- taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -187,12 +187,12 @@
// read the string data type (the first byte of the field data)
@ -173,9 +173,21 @@ diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp tagl
for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/id3v2frame.cpp taglib-1.8-ds/taglib/mpeg/id3v2/id3v2frame.cpp
--- taglib-1.8/taglib/mpeg/id3v2/id3v2frame.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/id3v2frame.cpp 2013-05-22 20:10:07.000000000 +0200
@@ -295,7 +295,7 @@
if((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4)
return String::UTF16;
- if(encoding != String::Latin1)
+ if((encoding != String::Latin1)&&(encoding != String::Latin1ID3V2))
return encoding;
for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) {
diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.cpp taglib-1.8-ds/taglib/toolkit/rccpatch.cpp
--- taglib-1.8/taglib/toolkit/rccpatch.cpp 1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.cpp 2013-04-26 06:40:40.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -0,0 +1,237 @@
+#include <stdlib.h>
+
@ -416,7 +428,7 @@ diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.cpp taglib-1.8-ds/taglib/toolkit/
+}
diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.h taglib-1.8-ds/taglib/toolkit/rccpatch.h
--- taglib-1.8/taglib/toolkit/rccpatch.h 1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.h 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.h 2013-05-22 20:13:16.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _RCC_PATCH_H
+#define _RCC_PATCH_H
@ -440,7 +452,7 @@ diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.h taglib-1.8-ds/taglib/toolkit/rc
+#endif /* _RCC_PATCH_H */
diff -dPNur taglib-1.8/taglib/toolkit/tstring.cpp taglib-1.8-ds/taglib/toolkit/tstring.cpp
--- taglib-1.8/taglib/toolkit/tstring.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.cpp 2013-04-26 07:11:38.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -23,6 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
@ -564,7 +576,7 @@ diff -dPNur taglib-1.8/taglib/toolkit/tstring.cpp taglib-1.8-ds/taglib/toolkit/t
+}
diff -dPNur taglib-1.8/taglib/toolkit/tstring.h taglib-1.8-ds/taglib/toolkit/tstring.h
--- taglib-1.8/taglib/toolkit/tstring.h 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.h 2013-04-24 17:44:12.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.h 2013-05-22 20:13:16.000000000 +0200
@@ -90,6 +90,18 @@
*/
enum Type {

6
taglib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 23 11:54:34 UTC 2013 - davejplater@gmail.com
- Added taglib-1.8-ds-rusxmms-r9.patch and deleted
taglib-1.8-ds-rusxmms-r8.patch to fix the reopened bnc#814814
-------------------------------------------------------------------
Fri Apr 26 17:19:29 UTC 2013 - davejplater@gmail.com

2
taglib.spec
View File

@ -27,7 +27,7 @@ Source0: https://github.com/downloads/taglib/taglib/%{name}-%{version}.ta
Source1: %{name}.desktop
Source100: baselibs.conf
# This patch is to fix bnc#814814.
Patch0: taglib-1.8-ds-rusxmms-r8.patch
Patch0: taglib-1.8-ds-rusxmms-r9.patch
Patch1: taglib-1.7.2-doxygen.patch
# PATCH-FIX-UPSTREAM taglib-1.8-version_fix.patch - fix version defines in taglib.h
Patch2: taglib-1.8-version_fix.patch