public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107854 from sikmir/gpxsee 

gpxsee: 7.37 → 8.0
This commit is contained in:
Pavol Rusnak 2020-12-29 01:11:30 +01:00 committed by GitHub
parent 0224ee64e7 2dc61f10ee
commit 226de73de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/gpxsee/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
pname = "gpxsee"; pname = "gpxsee";
version = "7.37"; version = "8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "GPXSee"; repo = "GPXSee";
rev = version; rev = version;
sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a";
}; };
patches = (substituteAll { patches = (substituteAll {
@ -37,7 +37,7 @@ mkDerivation rec {
''; '';
homepage = "https://www.gpxsee.org/"; homepage = "https://www.gpxsee.org/";
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
license = licenses.gpl3; license = licenses.gpl3Only;
maintainers = with maintainers; [ womfoo sikmir ]; maintainers = with maintainers; [ womfoo sikmir ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };

16
pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff
View File

@ -1,18 +1,18 @@
diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp
index 10e84d5..1e0abbe 100644 index 37e9d3f..d4a065c 100644
--- i/src/GUI/app.cpp --- i/src/GUI/app.cpp
+++ w/src/GUI/app.cpp +++ w/src/GUI/app.cpp
@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) @@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
installTranslator(gpxsee); installTranslator(gpxsee);
QTranslator *qt = new QTranslator(this); QTranslator *qt = new QTranslator(this);
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) +#if defined(Q_OS_WIN32)
qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
#else // Q_OS_WIN32 || Q_OS_MAC #else // Q_OS_WIN32 || Q_OS_MAC
- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( - if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
- QLibraryInfo::TranslationsPath)); - QLibraryInfo::TranslationsPath)))
+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")))
#endif // Q_OS_WIN32 || Q_OS_MAC #endif // Q_OS_WIN32 || Q_OS_MAC
installTranslator(qt); installTranslator(qt);