File fix-appimage_dir.patch of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

File fix-appimage_dir.patch of Package celestia (Revision b4c7f354d27f6cca7d67953fb5b3186e)

Currently displaying revision b4c7f354d27f6cca7d67953fb5b3186e , Show latest

diff -ruNp a/src/celestia/qt/qtmain.cpp b/src/celestia/qt/qtmain.cpp
--- a/src/celestia/qt/qtmain.cpp
+++ b/src/celestia/qt/qtmain.cpp
@@ -48,8 +48,11 @@ int main(int argc, char *argv[])
     // Gettext integration
     setlocale(LC_ALL, "");
     setlocale(LC_NUMERIC, "C");
+    QString appimageDir = QString::fromLocal8Bit(::getenv("APPDIR"));
 #ifdef ENABLE_NLS
     QString localeDir = LOCALEDIR;
+    if (!appimageDir.isEmpty())
+        localeDir = appimageDir + "/" + localeDir;
     bindtextdomain("celestia", localeDir.toUtf8().data());
     bind_textdomain_codeset("celestia", "UTF-8");
     bindtextdomain("celestia-data", localeDir.toUtf8().data());
diff -ruNp a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp
--- a/src/celestia/celestiacore.cpp
+++ b/src/celestia/celestiacore.cpp
@@ -160,13 +160,19 @@ bool is_valid_directory(const fs::path&
 
 bool ReadLeapSecondsFile(const fs::path& path, std::vector<astro::LeapSecondRecord> &leapSeconds)
 {
-    std::ifstream file(path);
+    fs::path myPath;
+    const auto *appimageDir = getenv("APPDIR");
+    if (appimageDir != nullptr)
+        myPath = fs::path(appimageDir);
+    myPath += path;
+
+    std::ifstream file(myPath);
     if (!file.good())
     {
-        GetLogger()->error("Failed to open leapseconds file {}\n", path);
+        GetLogger()->error("Failed to open leapseconds file {}\n", myPath);
         return false;
     }
-
+    GetLogger()->info("Leapseconds file {} found\n", myPath);
 
     std::string s;
     for (int line = 1; std::getline(file, s); line++)
@@ -180,7 +186,7 @@ bool ReadLeapSecondsFile(const fs::path&
         int seconds = 0;
         if (sscanf(ptr, "%u %i", &timestamp, &seconds) != 2)
         {
-            GetLogger()->error("Failed to parse leapseconds file {}, line {}, column {}\n", path, line, ptr - &s[0]);
+            GetLogger()->error("Failed to parse leapseconds file {}, line {}, column {}\n", myPath, line, ptr - &s[0]);
             leapSeconds.clear();
             return false;
         }

Places

File fix-appimage_dir.patch of Package celestia (Revision b4c7f354d27f6cca7d67953fb5b3186e)

Places