<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d553399425de4e4a8e2184719c6fe7e082785af8">https://github.com/macports/macports-ports/commit/d553399425de4e4a8e2184719c6fe7e082785af8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d553399425d stlink: update version to 1.7.0
</span>d553399425d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d553399425de4e4a8e2184719c6fe7e082785af8
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Dec 17 21:05:53 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> stlink: update version to 1.7.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> make gui optional since it is generally used from console
</span>---
cross/stlink/Portfile | 21 ++++++++++------
cross/stlink/files/patch-CMakeList.txt.diff | 11 ---------
cross/stlink/files/patch-src-logging.c.diff | 38 -----------------------------
3 files changed, 14 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/Portfile b/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba29dd4a15a..737744c7c8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup stlink-org stlink 1.6.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup stlink-org stlink 1.7.0 v
</span>
categories cross devel
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +15,21 @@ description Stlink Tools Texane
</span> long_description Open source version of the STMicroelectronics Stlink Tools. \
Provides the following tools: st-flash, st-info, st-term, st-util.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3fdbf5e856aadcbe92a34266481682bd013a0941 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3979a165612aa2ad7ef98b5f429c101e8b2a38fba1bc1bda311f5550e2d49892 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 295987
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 40627ba83e3a4749b0a7bbcbb8a66873df346c88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7fa9d8984a224357f516a5b483c5de99ebb97ed8afe1b29a8a0fb676360731db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 334972
</span>
depends_lib-append path:lib/pkgconfig/libusb-1.0.pc:libusb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-logging.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeList.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description "Enable st-link GUI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup app 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.name stlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.executable stlink-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.icon src/stlink-gui/icons/hicolor/128x128/apps/stlink-gui.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.retina yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-CMakeList.txt.diff b/cross/stlink/files/patch-CMakeList.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 01ec1bd58ae..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/files/patch-CMakeList.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.ori 2020-06-01 10:56:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-06-01 10:56:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_minimum_required(VERSION 3.4.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0042 NEW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-src-logging.c.diff b/cross/stlink/files/patch-src-logging.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a3c24d1fc57..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/files/patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/logging.c.orig 2019-01-26 11:28:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/logging.c 2019-01-26 11:42:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define UNUSED(x) (void)(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ugly_log(int level, const char *tag, const char *format, ...) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UNUSED(tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (level > max_level) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,19 +33,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "%d-%02d-%02dT%02d:%02d:%02d ", tt->tm_year + 1900, tt->tm_mon + 1, tt->tm_mday, tt->tm_hour, tt->tm_min, tt->tm_sec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (level) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case UDEBUG:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "DEBUG %s: ", tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "DEBUG: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case UINFO:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "INFO %s: ", tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "INFO: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case UWARN:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "WARN %s: ", tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "WARN: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case UERROR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "ERROR %s: ", tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "ERROR: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "%d %s: ", level, tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "%d: ", level);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vfprintf(stderr, format, args);
</span></pre><pre style='margin:0'>
</pre>