29 lines
714 B
Diff
29 lines
714 B
Diff
|
diff -u -r ../apt-1.6~alpha3/apt-pkg/deb/debrecords.cc ./apt-pkg/deb/debrecords.cc
|
||
|
|
--- ../apt-1.6~alpha3/apt-pkg/deb/debrecords.cc 2017-10-28 17:57:05.000000000 +0200
|
||
|
|
+++ ./apt-pkg/deb/debrecords.cc 2017-11-02 17:40:35.816161798 +0100
|
||
|
|
@@ -23,7 +23,9 @@
|
||
|
|
#include <sstream>
|
||
|
|
#include <string>
|
||
|
|
#include <vector>
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
#include <langinfo.h>
|
||
|
|
+#endif
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
#include <apti18n.h>
|
||
|
|
@@ -151,12 +153,14 @@
|
||
|
|
orig = Section.FindS("Description");
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
char const * const codeset = nl_langinfo(CODESET);
|
||
|
|
if (strcmp(codeset,"UTF-8") != 0) {
|
||
|
|
string dest;
|
||
|
|
UTF8ToCodeset(codeset, orig, &dest);
|
||
|
|
return dest;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
return orig;
|
||
|
|
}
|