File fix-appimage_dir.patch of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision b69aa4ff5e28e71c431be9df5ed278de , 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
@@ -74,7 +74,11 @@ int main(int argc, char *argv[])
 
     ParseCommandLine();
 
-    QDir splashDir(SPLASH_DIR);
+    QString splashDirTmp = SPLASH_DIR;
+    QString appimageDir = QString::fromLocal8Bit(::getenv("APPDIR"));
+    if (!appimageDir.isEmpty())
+        splashDirTmp = appimageDir + "/" + splashDirTmp;
+    QDir splashDir(splashDirTmp);
     QPixmap pixmap(splashDir.filePath("splash.png"));
     QSplashScreen splash(pixmap);
     splash.setMask(pixmap.mask());
@@ -88,6 +92,8 @@ int main(int argc, char *argv[])
     setlocale(LC_NUMERIC, "C");
 #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
@@ -157,13 +157,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++)
@@ -177,7 +183,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 b69aa4ff5e28e71c431be9df5ed278de)

Places