git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107854 from sikmir/gpxsee

gpxsee: 7.37 → 8.0

commit226de73de7d833c265dcdb1162deb2dbb3fc6497 authorPavol Rusnak <pavol@rusnak.io> dateTue 29 Dec 2020, 01:11 (6 years ago) parent0224ee62dc61f1
2 files changed+11−11
pkgs/applications/misc/gpxsee/default.nix+3−3 pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff+8−8
pkgs/applications/misc/gpxsee/default.nix+3−3
@@ -2,13 +2,13 @@
22
33mkDerivation rec {
44 pname = "gpxsee";
5− version = "7.37";
5+ version = "8.0";
66
77 src = fetchFromGitHub {
88 owner = "tumic0";
99 repo = "GPXSee";
1010 rev = version;
11− sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8";
11+ sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a";
1212 };
1313
1414 patches = (substituteAll {
@@ -37,7 +37,7 @@ mkDerivation rec {
3737 '';
3838 homepage = "https://www.gpxsee.org/";
3939 changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
40− license = licenses.gpl3;
40+ license = licenses.gpl3Only;
4141 maintainers = with maintainers; [ womfoo sikmir ];
4242 platforms = with platforms; linux ++ darwin;
4343 };
pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff+8−8
@@ -1,18 +1,18 @@
11diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp
2−index 10e84d5..1e0abbe 100644
2+index 37e9d3f..d4a065c 100644
33--- i/src/GUI/app.cpp
44+++ w/src/GUI/app.cpp
5−@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
6− installTranslator(gpxsee);
5+@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
6+ installTranslator(gpxsee);
77
88 QTranslator *qt = new QTranslator(this);
99-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
1010+#if defined(Q_OS_WIN32)
11− qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir());
11+ if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
1212 #else // Q_OS_WIN32 || Q_OS_MAC
13−- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
14−- QLibraryInfo::TranslationsPath));
15−+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"));
13+- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
14+- QLibraryInfo::TranslationsPath)))
15++ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")))
1616 #endif // Q_OS_WIN32 || Q_OS_MAC
17− installTranslator(qt);
17+ installTranslator(qt);
1818