pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qcad: add some system info to About window



Module Name:	pkgsrc-wip
Committed By:	Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By:	plunky
Date:		Thu Aug 4 14:13:49 2016 +0100
Changeset:	24641c98b376b551a7f27a06b923411b521c570e

Modified Files:
	qcad/distinfo
Added Files:
	qcad/patches/patch-scripts_Help_About_About.js
	qcad/patches/patch-src_core_RSPlatform.cpp

Log Message:
qcad: add some system info to About window

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=24641c98b376b551a7f27a06b923411b521c570e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qcad/distinfo                                  |  2 ++
 qcad/patches/patch-scripts_Help_About_About.js | 23 ++++++++++++++++
 qcad/patches/patch-src_core_RSPlatform.cpp     | 37 ++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)

diffs:
diff --git a/qcad/distinfo b/qcad/distinfo
index 3e1a03c..e0be6e9 100644
--- a/qcad/distinfo
+++ b/qcad/distinfo
@@ -5,6 +5,7 @@ RMD160 (qcad-3.15.4.1.zip) = 7deec07e81d17c3a80ef67314a53b650c7509ebb
 SHA512 (qcad-3.15.4.1.zip) = d3d9ae386920ec5102ab8c49c0a3967994dbae0b9b04b256d64ccd6fcf865ae3c26770204fec3c2feecddf91b4cfe12997fe9a975f5ccc78bb5c88c2012d0696
 Size (qcad-3.15.4.1.zip) = 37420623 bytes
 SHA1 (patch-qcad.1) = 64beab5b4d83e889352d80b64ab09aaa080421c2
+SHA1 (patch-scripts_Help_About_About.js) = a0425c9fab1a5828d4ec87eedfffe771c72e5f95
 SHA1 (patch-shared.pri) = fa940892d1deab185a752cab8e5346a04ba1bf03
 SHA1 (patch-shared__app.pri) = e0361f809815691b435d5112ee67e86918a85189
 SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = f16fb28a741a8a99e38adc2faa8037298bd174e2
@@ -16,6 +17,7 @@ SHA1 (patch-src_3rdparty_quazip_quazip.pro) = b59c24acc4171c7ef9ab21a5220dd57bf8
 SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = 0faab0065e3fa88a3e229e39390d3d8302024ce2
 SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 5a8a22574f3e84e7564ac7b6d64ffd8587973911
 SHA1 (patch-src_core_RS.cpp) = 6cb504d409737058c9eb7ab8058ce0ec889a71c4
+SHA1 (patch-src_core_RSPlatform.cpp) = 65fd373f228dcb8ebf9c35f35994e0435f960cca
 SHA1 (patch-src_core_RSettings.cpp) = 9dbb2137268b79f8f1e871712b830ae1fbc1b8bd
 SHA1 (patch-src_core_core.pro) = 3bcef6ba1a499808271c45c58693f2380d8a00c0
 SHA1 (patch-src_customwidgets_customwidgets.pro) = 2fc0b1f4b0110e8031f2d0b06ad22c823b2e26a6
diff --git a/qcad/patches/patch-scripts_Help_About_About.js b/qcad/patches/patch-scripts_Help_About_About.js
new file mode 100644
index 0000000..219bec1
--- /dev/null
+++ b/qcad/patches/patch-scripts_Help_About_About.js
@@ -0,0 +1,23 @@
+$NetBSD$
+
+add some system information to About window
+
+--- scripts/Help/About/About.js.orig	2016-08-04 12:53:50.087339591 +0000
++++ scripts/Help/About/About.js
+@@ -425,6 +425,16 @@ About.prototype.initAboutSystem = functi
+     if (RS.getSystemId()==="linux") {
+         text += "Linux";
+     }
++    if (RS.getSystemId()==="netbsd") {
++        text += "NetBSD";
++    }
++    if (RS.getSystemId()==="freebsd") {
++        text += "FreeBSD";
++    }
++    if (RS.getSystemId()==="solaris") {
++        text += "Solaris";
++    }
++    text += " [via pkgsrc]";
+     text += "\nOS version: " + RSettings.getOSVersion();
+
+     text += "\n";
diff --git a/qcad/patches/patch-src_core_RSPlatform.cpp b/qcad/patches/patch-src_core_RSPlatform.cpp
new file mode 100644
index 0000000..6a39fe6
--- /dev/null
+++ b/qcad/patches/patch-src_core_RSPlatform.cpp
@@ -0,0 +1,37 @@
+$NetBSD$
+
+enhance getSystemId for some common platforms
+
+--- src/core/RSPlatform.cpp.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/core/RSPlatform.cpp
+@@ -43,7 +43,7 @@
+ QString RS::getHostId() {
+     return QString("%1_%2")
+             .arg(getSystemId())
+-#if defined(Q_OS_LINUX)
++#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) || defined(Q_OS_FREEBSD) || defined(Q_OS_SOLARIS)
+     .arg(getenv("HOSTNAME"));
+ #elif defined(Q_OS_MAC)
+     // environment variable HOSTNAME not exported on OS X by default:
+@@ -56,7 +56,7 @@ QString RS::getHostId() {
+ }
+
+ /**
+- * \return Unique system ID ("linux", "osx", "win").
++ * \return Unique system ID ("linux", "osx", "win", "netbsd", "freebsd", "solaris").
+  */
+ QString RS::getSystemId() {
+ #if defined(Q_OS_LINUX)
+@@ -65,6 +65,12 @@ QString RS::getSystemId() {
+     return "osx";
+ #elif defined(Q_OS_WIN)
+     return "win";
++#elif defined(Q_OS_NETBSD)
++    return "netbsd";
++#elif defined(Q_OS_FREEBSD)
++    return "freebsd";
++#elif defined(Q_OS_SOLARIS)
++    return "solaris";
+ #else
+     return "unknown";
+ #endif


Home | Main Index | Thread Index | Old Index