mdw@git.distorted.org.uk Git - termux-packages/blob - packages/apt/aptconfiguration.patch

   1 diff -u -r ../upstream.git/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc
   2 --- ../upstream.git/apt-pkg/aptconfiguration.cc 2014-04-25 13:39:00.000000000 +0200
   3 +++ ./apt-pkg/aptconfiguration.cc       2014-06-03 11:39:43.931774391 +0200
   4 @@ -193,7 +193,7 @@
   5         // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
   6         // we extract both, a long and a short code and then we will
   7         // check if we actually need both (rare) or if the short is enough
   8 -       string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
   9 +       string const envMsg = "en_US.UTF-8"; // string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
  10         size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2;
  11         size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3);
  12
  13 @@ -405,8 +405,8 @@
  14  // setDefaultConfigurationForCompressors                               /*{{{*/
  15  void Configuration::setDefaultConfigurationForCompressors() {
  16         // Set default application paths to check for optional compression types
  17 -       _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
  18 -       _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
  19 +       _config->CndSet("Dir::Bin::bzip2", "bin/bzip2");
  20 +       _config->CndSet("Dir::Bin::xz", "bin/xz");
  21         if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
  22                 _config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz"));
  23                 _config->Set("APT::Compressor::lzma::Binary", "xz");
  24 @@ -419,7 +419,7 @@
  25                         _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
  26                 }
  27         } else {
  28 -               _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
  29 +               _config->CndSet("Dir::Bin::lzma", "bin/lzma");
  30                 if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
  31                         _config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
  32                         _config->Set("APT::Compressor::lzma::CompressArg::", "-9");