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

monero-gui: 0.12.0.0 -> 0.12.3.0

Browse Source
This commit is contained in:
rnhmjoj 2018-09-04 12:11:19 +02:00
parent 90ab6c8400
commit fd95d30609
No known key found for this signature in database
GPG Key ID: 91BE884FBA4B591A
3 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/altcoins/monero-gui/default.nix
View File

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-gui-${version}"; name = "monero-gui-${version}";
version = "0.12.0.0"; version = "0.12.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];
@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
# install translations # install translations
cp -r release/bin/translations $out/share/ mkdir -p $out/share/translations
cp translations/*.qm $out/share/translations/
# install icons # install icons
for n in 16 24 32 48 64 96 128 256; do for n in 16 24 32 48 64 96 128 256; do

55
pkgs/applications/altcoins/monero-gui/move-log-file.patch
View File

@ -1,38 +1,27 @@
diff --git a/main.cpp b/main.cpp diff --git a/main.cpp b/main.cpp
index c03b160..a8ea263 100644 index 79223c0..e80b317 100644
--- a/main.cpp --- a/main.cpp
+++ b/main.cpp +++ b/main.cpp
@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) @@ -115,6 +115,9 @@ int main(int argc, char *argv[])
// qDebug() << "High DPI auto scaling - enabled"; QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
//#endif QCoreApplication::translate("main", "Log to specified file"),
QCoreApplication::translate("main", "file"));
- // Log settings + logPathOption.setDefaultValue(
- Monero::Wallet::init(argv[0], "monero-wallet-gui"); + QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-// qInstallMessageHandler(messageHandler); + + "/monero-wallet-gui.log");
- parser.addOption(logPathOption);
MainApp app(argc, argv); parser.addHelpOption();
parser.process(app);
qDebug() << "app startd"; diff --git a/Logger.cpp b/Logger.cpp
index 660bafc..dae24d4 100644
+ // Log settings --- a/Logger.cpp
+ QString logfile = +++ b/Logger.cpp
+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) @@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
+ + "/monero-wallet-gui.log"; #elif defined(Q_OS_MAC)
+ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
+ #else // linux + bsd
app.setApplicationName("monero-core"); - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
app.setOrganizationDomain("getmonero.org"); + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
app.setOrganizationName("monero-project");
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 74649ce..fe1efc6 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const
#ifdef Q_OS_MACOS
return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename;
#else
- return QCoreApplication::applicationDirPath() + "/" + filename;
+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename;
#endif #endif
}

15
pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
View File

@ -1,14 +1,13 @@
diff --git a/TranslationManager.cpp b/TranslationManager.cpp diff --git a/TranslationManager.cpp b/TranslationManager.cpp
index fa39d35..5a410f7 100644 index e7fc52a..83534cc 100644
--- a/TranslationManager.cpp --- a/TranslationManager.cpp
+++ b/TranslationManager.cpp +++ b/TranslationManager.cpp
@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language) @@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language)
#ifdef Q_OS_MACX return true;
QString dir = qApp->applicationDirPath() + "/../Resources/translations"; }
#else
- QString dir = qApp->applicationDirPath() + "/translations"; - QString dir = qApp->applicationDirPath() + "/translations";
+ QString dir = qApp->applicationDirPath() + "/../share/translations"; + QString dir = qApp->applicationDirPath() + "/../share/translations";
#endif
QString filename = "monero-core_" + language; QString filename = "monero-core_" + language;
qDebug("%s: loading translation file '%s' from '%s'",