NotepadQQ: bump version

This commit is contained in:
Gerasim Troeglazov
2018-05-06 00:37:17 +10:00
parent a47b9dfa17
commit f41276c945
3 changed files with 30 additions and 26 deletions

View File

@@ -3,11 +3,11 @@ DESCRIPTION="Notepadqq is designed from developers, for developers. With its \
more than 100 supported languages, it is the ideal text editor for your daily \
tasks."
HOMEPAGE="http://notepadqq.altervista.org/"
COPYRIGHT="2012-2017 Notepadqq Project"
COPYRIGHT="2012-2018 Notepadqq Project"
LICENSE="GNU LGPL v3"
REVISION="4"
REVISION="1"
SOURCE_URI="https://github.com/notepadqq/notepadqq/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="423d224724deb5298837327ce7efa0d71dbe73693c783241eeb7bb2327ee97d4"
CHECKSUM_SHA256="f295353224848c06fafcc71c7f6a38780a98890075ab33f0179181ebf21bad08"
ADDITIONAL_FILES="notepadqq.rdef.in"
ARCHITECTURES="!x86_gcc2 x86_64"

View File

@@ -1,23 +0,0 @@
From e2b65b01938db4a78b1374f7e01729bf65e05fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 4 Jul 2017 20:54:53 +0200
Subject: [PATCH] Haiku got no qtchooser
---
src/ui/ui.pro | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ui/ui.pro b/src/ui/ui.pro
index f9e27b34..3d3f4a24 100644
--- a/src/ui/ui.pro
+++ b/src/ui/ui.pro
@@ -43,7 +43,8 @@ isEmpty(DESTDIR) {
}
isEmpty(LRELEASE) {
- !macx: LRELEASE = qtchooser -run-tool=lrelease -qt=5
+ !macx:!haiku: LRELEASE = qtchooser -run-tool=lrelease -qt=5
+ haiku: LRELEASE = lrelease
macx: LRELEASE = lrelease
}

View File

@@ -0,0 +1,27 @@
From 2cce2c0b4390c278f13564b13f16180f001d25c8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 2 May 2018 21:41:35 +1000
Subject: Disable root check for haiku
diff --git a/src/ui/main.cpp b/src/ui/main.cpp
index 7bae071..712b2e5 100644
--- a/src/ui/main.cpp
+++ b/src/ui/main.cpp
@@ -83,11 +83,13 @@ int main(int argc, char *argv[])
// Check for "run-and-exit" options like -h or -v
const auto parser = Notepadqq::getCommandLineArgumentsParser(QApplication::arguments());
+#ifndef Q_OS_HAIKU
// Check if we're running as root
if( getuid() == 0 && !parser->isSet("allow-root") ) {
qWarning() << QObject::tr("Running Notepadqq as root is not recommended. Use --allow-root if you really want to.");
return EXIT_SUCCESS;
}
+#endif
if (a.attachToOtherInstance()) {
return EXIT_SUCCESS;
--
2.16.2