diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-19 10:49:22 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-19 10:49:22 +0000 |
| commit | 07afabd97d3916116b0f9373199f1963dc63a1b8 (patch) | |
| tree | d3271f492bd66da63fc635b41c0d800617d8b490 /main | |
| parent | c8fe1d6239a5ee0347e7a5556b12f1848d293afc (diff) | |
| download | aports-07afabd97d3916116b0f9373199f1963dc63a1b8.tar.bz2 aports-07afabd97d3916116b0f9373199f1963dc63a1b8.tar.xz | |
main/qt: fix iconv for musl
musl does not currently support BOM, so patch the iconv to not use it.
Diffstat (limited to 'main')
| -rw-r--r-- | main/qt/APKBUILD | 4 | ||||
| -rw-r--r-- | main/qt/qt-musl-iconv-no-bom.patch | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 5723ead92..bfaf4e396 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -22,6 +22,7 @@ install= source="http://download.qt-project.org/official_releases/qt/4.8/$pkgver/qt-everywhere-opensource-src-4.8.5.tar.gz qt-gtk-theme-fix.patch qt-musl.patch + qt-musl-iconv-no-bom.patch qt-clucene-timeb.patch qsettings-recursive-global-mutex.patch assistant.desktop @@ -275,6 +276,7 @@ lang() { md5sums="1864987bdbb2f58f8ae8b350dfdbe133 qt-everywhere-opensource-src-4.8.5.tar.gz 8eeac363a5d9bc1ca06501a7cbe59b08 qt-gtk-theme-fix.patch bc83dc99f866423b4803453a0e2949d2 qt-musl.patch +077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch 14549e243772acfe2e9e0bf5d8d001f3 qt-clucene-timeb.patch 7467e168418c50b2737b4b2fab4448fe qsettings-recursive-global-mutex.patch a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop @@ -284,6 +286,7 @@ c29f2993d6a0f73d756d2fa36e130e1c qtconfig.desktop" sha256sums="eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 qt-everywhere-opensource-src-4.8.5.tar.gz b64ea69ca9ed18f464a3810964b340432c528ebb02c9c7851ecc8e99cfe74877 qt-gtk-theme-fix.patch e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl.patch +40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch 0c74a82080bcb8f4a700e907f4f1ed98a0338c6954620ee42c82002b199acedc qt-clucene-timeb.patch 8ef97783ff93a515a31c1e27c6b3b22e2ad2fd9cf0fa94965e5c413ae579e64c qsettings-recursive-global-mutex.patch 1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2 assistant.desktop @@ -293,6 +296,7 @@ e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl.patch sha512sums="47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb qt-everywhere-opensource-src-4.8.5.tar.gz 4be22db63c27ce2fa8c4f0af47f951b3aebb1f41c63c1ff02cec429be26d86f869ce8d137e313ea59a7540ebf1866ef2245471b754588776d20f881041141b55 qt-gtk-theme-fix.patch fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl.patch +a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch a4947c7210f5b9a39f78b1056d2fe87bc9e25dda7d6287f138f8889ae8a3a8687ed7346261f219e9e39afb5143e895b52804347484d10c42907868c4eac9ef0a qt-clucene-timeb.patch 277e5ceec4fcc5d77a8591eafdb24125a54770576b7997aee6df39d85a7f1deabf8547fb42127cb118ebb8e7f81e3a3624a75d461581052dadf7abb99f1c9bd7 qsettings-recursive-global-mutex.patch 005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614 assistant.desktop diff --git a/main/qt/qt-musl-iconv-no-bom.patch b/main/qt/qt-musl-iconv-no-bom.patch new file mode 100644 index 000000000..35380ad67 --- /dev/null +++ b/main/qt/qt-musl-iconv-no-bom.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp +@@ -62,7 +62,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" |