<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/370498b727f3ae29a53899bdb0371f731e40fab0">https://github.com/macports/macports-ports/commit/370498b727f3ae29a53899bdb0371f731e40fab0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 370498b727f3ae29a53899bdb0371f731e40fab0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue May 30 11:59:07 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> gpick: update version 0.2.5->0.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/65641
</span>---
graphics/gpick/Portfile | 51 +++++++++--------------
graphics/gpick/files/patch-bool_vector_fix.diff | 13 ++++++
graphics/gpick/files/patch-getExecutablePath.diff | 33 +++++++++++++++
3 files changed, 66 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/Portfile b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51662572977..6bdf3d7b5f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup lua 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gpick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup thezbyg gpick 0.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,41 +19,29 @@ long_description Gpick is a program used to pick colors from anywhere \
</span> shades and tints and export palettes to common file \
formats or simply copy them to the clipboard.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://code.google.com/p/gpick/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites googlecode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7c65539780b1eb74f44538b165dbff923762beb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d57dcbc55dcd1b10a103de8ae6a7028063a4ec8934372c587107dd772da5397f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 337112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 19ebed9cb8229e319d8b68013b46c87a6842cffc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 90b03ce10d2f3e211a3f37d262596e4ae40d05cbd633aa0560d0891562c93474 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 368100
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.depends_type build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-getExecutablePath.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bool_vector_fix.diff
</span>
depends_build-append port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ragel
</span>
depends_lib-append port:expat \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/thezbyg/gpick/blob/dd27232a4dd08cf6271ecc2a7e96da25f8071ed5/CMakeLists.txt#L33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lua.version 5.4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.google.com/p/gpick/issues/detail?id=112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lexpat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${prefix}/bin/scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# latest version of Boost that produced no configure warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.depends_type build
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.google.com/p/gpick/issues/detail?id=109
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir DESTDIR=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/files/patch-bool_vector_fix.diff b/graphics/gpick/files/patch-bool_vector_fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2e43d3e3789
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gpick/files/patch-bool_vector_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/thezbyg/gpick/pull/219
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/dynv/Xml.cpp.orig 2022-05-08 03:20:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/dynv/Xml.cpp 2023-05-30 10:53:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (const auto &i: values) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!writeStart(stream, "li"s))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!types::xml::write(stream, i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!types::xml::write(stream, T(i)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!writeEnd(stream, "li"s))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/files/patch-getExecutablePath.diff b/graphics/gpick/files/patch-getExecutablePath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e858a5115da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gpick/files/patch-getExecutablePath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/thezbyg/gpick/pull/220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Paths.cpp.orig 2022-05-08 03:20:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Paths.cpp 2023-05-30 19:26:04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if BOOST_OS_WINDOWS != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif BOOST_OS_MACOS != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,6 +64,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (length < buffer.size())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return std::string(buffer.begin(), buffer.begin() + length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffer.resize(buffer.size() * 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif BOOST_OS_MACOS != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static std::string getExecutablePath() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t bufsize = 4096;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<char> buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buffer.resize(bufsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int sizeOk = _NSGetExecutablePath(buffer.data(), &bufsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sizeOk==0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::string(buffer.begin(), buffer.begin() + std::strlen(buffer.data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buffer.resize(bufsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>