diff options
| author | Reno Reckling <exi@wthack.de> | 2016-01-20 13:08:28 +0100 |
|---|---|---|
| committer | Reno Reckling <exi@wthack.de> | 2016-01-20 13:08:28 +0100 |
| commit | b5c2587698fbe11b1a8224439fe206cda0e9c111 (patch) | |
| tree | 158a4c868a234dd541c203ccaec6a9e55673654c | |
| parent | 9763e6bf8991ba4a853329b9b81af4cca7c38ea3 (diff) | |
| download | nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar.gz nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar.bz2 nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar.lz nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar.xz nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.tar.zst nixlib-b5c2587698fbe11b1a8224439fe206cda0e9c111.zip | |
add id3lib easytag patch for proper unicode handling.
This patch is directly taken from easytag. id3lib is not maintained any longer and the last release is 13 years old. This patch fixes some unicode issues.
| -rw-r--r-- | pkgs/development/libraries/id3lib/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff | 39 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 0ea1e96947ea..9f880e3ea9f7 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -3,7 +3,10 @@ stdenv.mkDerivation { name = "id3lib-3.8.3"; - patches = [ ./id3lib-3.8.3-gcc43-1.patch ]; + patches = [ + ./id3lib-3.8.3-gcc43-1.patch + ./patch_id3lib_3.8.3_UTF16_writing_bug.diff + ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff new file mode 100644 index 000000000000..b05d2cf298d3 --- /dev/null +++ b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff @@ -0,0 +1,39 @@ +diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog +--- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100 +@@ -1,3 +1,8 @@ ++2006-02-17 Jerome Couderc ++ ++ * Patch from Spoon to fix UTF-16 writing bug ++ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ + 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org> + + * THANKS (1.20): added more people +diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp +--- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100 +@@ -363,11 +363,22 @@ + // Write the BOM: 0xFEFF + unicode_t BOM = 0xFEFF; + writer.writeChars((const unsigned char*) &BOM, 2); ++ // Patch from Spoon : 2004-08-25 14:17 ++ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ // Wrong code ++ //for (size_t i = 0; i < size; i += 2) ++ //{ ++ // unicode_t ch = (data[i] << 8) | data[i+1]; ++ // writer.writeChars((const unsigned char*) &ch, 2); ++ //} ++ // Right code ++ unsigned char *pdata = (unsigned char *) data.c_str(); + for (size_t i = 0; i < size; i += 2) + { +- unicode_t ch = (data[i] << 8) | data[i+1]; ++ unicode_t ch = (pdata[i] << 8) | pdata[i+1]; + writer.writeChars((const unsigned char*) &ch, 2); + } ++ // End patch + } + return writer.getCur() - beg; + } |