mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
GPXSee: bump to 7.2
This commit is contained in:
committed by
Gerasim Troeglazov
parent
83c8b0f1ac
commit
2fdfb05ab7
@@ -1,16 +1,16 @@
|
||||
From f7cf312a742231ce97d2042def45760b84fb4a1a Mon Sep 17 00:00:00 2001
|
||||
From fe04f0617bbc82466a473718b1643ea7e0548bf6 Mon Sep 17 00:00:00 2001
|
||||
From: Nikolay Korotkiy <sikmir@gmail.com>
|
||||
Date: Mon, 7 Jan 2019 22:29:26 +0300
|
||||
Date: Tue, 29 Jan 2019 03:17:45 +0300
|
||||
Subject: Fix APP_NAME
|
||||
|
||||
|
||||
diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp
|
||||
index d9573da..f4c29ff 100644
|
||||
index 6f62d88..a642ca1 100644
|
||||
--- a/src/GUI/app.cpp
|
||||
+++ b/src/GUI/app.cpp
|
||||
@@ -21,7 +21,7 @@
|
||||
App::App(int &argc, char **argv) : QApplication(argc, argv),
|
||||
_argc(argc), _argv(argv)
|
||||
|
||||
App::App(int &argc, char **argv) : QApplication(argc, argv)
|
||||
{
|
||||
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
|
||||
@@ -21,17 +21,17 @@ index d9573da..f4c29ff 100644
|
||||
2.19.1
|
||||
|
||||
|
||||
From 19b8fd90adea3d3d0a7bbcf6da031ffe011da7b2 Mon Sep 17 00:00:00 2001
|
||||
From 15b7e94410b3e5e6707e8e252c3ad56df63e80c6 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 18:04:38 +1000
|
||||
Date: Tue, 29 Jan 2019 13:24:49 +0300
|
||||
Subject: Dirty hack for fix crash on exit
|
||||
|
||||
|
||||
diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp
|
||||
index f4c29ff..e396d8b 100644
|
||||
index a642ca1..250855a 100644
|
||||
--- a/src/GUI/app.cpp
|
||||
+++ b/src/GUI/app.cpp
|
||||
@@ -17,6 +17,9 @@
|
||||
@@ -18,6 +18,9 @@
|
||||
#include "settings.h"
|
||||
#include "app.h"
|
||||
|
||||
@@ -39,13 +39,12 @@ index f4c29ff..e396d8b 100644
|
||||
+#include <sys/types.h>
|
||||
+#include <signal.h>
|
||||
|
||||
App::App(int &argc, char **argv) : QApplication(argc, argv),
|
||||
_argc(argc), _argv(argv)
|
||||
@@ -81,8 +84,9 @@ int App::run()
|
||||
QStringList args(arguments());
|
||||
App::App(int &argc, char **argv) : QApplication(argc, argv)
|
||||
{
|
||||
@@ -82,7 +85,9 @@ int App::run()
|
||||
for (int i = 1; i < args.count(); i++)
|
||||
_gui->openFile(args.at(i));
|
||||
-
|
||||
|
||||
- return exec();
|
||||
+ exec();
|
||||
+ kill(::getpid(), SIGKILL);
|
||||
Reference in New Issue
Block a user