diff options
| author | Martchus | 2018-05-28 21:50:43 +0200 |
|---|---|---|
| committer | Martchus | 2018-05-28 21:50:43 +0200 |
| commit | 1de5b17c1169b308c3a014303dc8217228b90cca (patch) | |
| tree | d2cdeb79f6dc53b2c55cbfbc84e191ca59508b7b /0028-Enable-and-fix-use-of-iconv.patch | |
| parent | 5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (diff) | |
| download | aur-1de5b17c1169b308c3a014303dc8217228b90cca.tar.gz | |
Update to 5.11.0
Diffstat (limited to '0028-Enable-and-fix-use-of-iconv.patch')
| -rw-r--r-- | 0028-Enable-and-fix-use-of-iconv.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0028-Enable-and-fix-use-of-iconv.patch b/0028-Enable-and-fix-use-of-iconv.patch index 3ad2c176f785..72ac55163b14 100644 --- a/0028-Enable-and-fix-use-of-iconv.patch +++ b/0028-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From d7e459560199395f4ee339490ca5afebb7b5168a Mon Sep 17 00:00:00 2001 +From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 -Subject: [PATCH 28/32] Enable and fix use of iconv +Subject: [PATCH 28/33] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- @@ -24,7 +24,7 @@ index fe4b87b923..be4236436f 100644 size_t inbytes, outbytes; iconv(x, &inp, &inbytes, &outp, &outbytes); diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp -index d6362b6fbc..4da4546a24 100644 +index 330eb7c038..88a782b863 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv); @@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 8cd73d6ce4..dd259157e3 100644 +index 5e48024def..15e7372dcb 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json -@@ -521,9 +521,9 @@ +@@ -539,9 +539,9 @@ }, "gnu-libiconv": { "label": "GNU iconv", @@ -79,5 +79,5 @@ index 8cd73d6ce4..dd259157e3 100644 }, "icu": { -- -2.16.1 +2.17.0 |