<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dbb63e5b7658878ec9f89d023e8eb25ab3a87613">https://github.com/macports/macports-ports/commit/dbb63e5b7658878ec9f89d023e8eb25ab3a87613</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dbb63e5b7658878ec9f89d023e8eb25ab3a87613
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 5 20:52:07 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> stlink: Update to 1.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Removes gui variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53474
</span>---
cross/stlink/Portfile | 17 ++++-------
.../patch-cmake-modules-FindLibUSB.cmake.diff | 11 +++++++
cross/stlink/files/patch-src-logging.c.diff | 34 ++++++++++++++++++++++
3 files changed, 51 insertions(+), 11 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 6c63cb3..b325758 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;'>@@ -1,9 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup texane stlink 1.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup texane stlink 1.3.0
</span> categories cross devel
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,16 +14,10 @@ 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 72646788e3b4d45c7676471d1d19d5fcbbe525f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b43dc6569c60cf0d8b44806776bdfa3fbb3e92f2154e6fdbdfeeb4e260ea5a6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1fffecc282c328e1a3b493f0ff49830f83af5afa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c392d3005f6b3059c4e4e11a1eaf2451d41130de2c7dac9192d3a8dd61c4eb5
</span>
depends_lib-append path:lib/libusb-1.0.dylib:libusb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#Does not default variant gui, it is crashing on Snow Leopard.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gui description "Provide tool: stlink-gui" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cmake-modules-FindLibUSB.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff b/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..927334f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/FindLibUSB.cmake.orig 2017-01-28 04:55:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindLibUSB.cmake 2017-02-05 20:44:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(LIBUSB_NAME libusb-1.0.a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LIBUSB_NAME libusb-1.0.dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(MSYS OR MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LIBUSB_NAME usb-1.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(WIN32 OR CMAKE_VS_PLATFORM_NAME)
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8c7091e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/files/patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/logging.c.orig 2017-01-28 11:55:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/logging.c 2017-02-03 00:12:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,25 +30,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ switch (level) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UDEBUG:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "DEBUG %s: ", tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "DEBUG: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UINFO:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "INFO %s: ", tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "INFO: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UWARN:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "WARN %s: ", tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "WARN: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UERROR:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "ERROR %s: ", tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "ERROR: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UFATAL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "FATAL %s: ", tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "FATAL: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vfprintf(stderr, format, args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // NEVER GETS HERE!!!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "%d %s: ", level, tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "%d: ", level);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vfprintf(stderr, format, args);
</span></pre><pre style='margin:0'>
</pre>