From ad69f62e42c131dcccd33b0e39c61a431f581bea Mon Sep 17 00:00:00 2001 From: Ionut Radu Date: Wed, 31 Jul 2013 16:58:51 +0300 Subject: apt: Upgrade from 0.9.8.2 to 0.9.9.4 makerace.patch: adapted to the new version Signed-off-by: Ionut Radu Signed-off-by: Saul Wold --- .../apt/apt-0.9.9.4/no-nls-dpkg.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch (limited to 'meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch') diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch new file mode 100644 index 0000000000..a0996d4d44 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +--- a/apt-pkg/deb/dpkgpm.cc ++++ b/apt-pkg/deb/dpkgpm.cc +@@ -42,6 +42,12 @@ + #include + /*}}}*/ + ++#ifdef USE_NLS ++#define _dpkg(x) dgettext("dpkg", x) ++#else ++#define _dpkg(x) x ++#endif ++ + using namespace std; + + namespace +@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + } + + // check if its not a follow up error +- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); ++ const char *needle = _dpkg("dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; -- cgit 1.2.3-korg