<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c42dd7467478fa6bb0584578315c3f6f4520f11">https://github.com/macports/macports-ports/commit/6c42dd7467478fa6bb0584578315c3f6f4520f11</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 6c42dd74674 qtruby: fix build, add modern ruby support
</span>6c42dd74674 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c42dd7467478fa6bb0584578315c3f6f4520f11
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Jul 29 05:46:17 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> qtruby: fix build, add modern ruby support
</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/66518
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67838
</span>---
kde/qtruby/Portfile | 28 ++++++++++++++++++++--------
kde/qtruby/files/patch-ptr-comparison.diff | 11 +++++++++++
2 files changed, 31 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtruby/Portfile b/kde/qtruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53f48f19a61..cf20ae85f6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name qtruby
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories kde kde4 devel
license GPL-2+ LGPL-2.1+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,6 @@ description Binding to Ruby for KDE.
</span> long_description Very complete bindings to both the KDE API and the Qt APIs. The Korundum \
package includes both a QtRuby Qt-only binding along with the full combined Qt/KDE one. \
The QtRuby package contains just Qt bindings with no dependencies on KDE.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://techbase.kde.org/Development/Languages/Ruby
master_sites kde:stable/${version}/src/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,18 +22,31 @@ checksums rmd160 a8a7dcef68b7e20c9d20f46ad0d4293c2c1c2a49 \
</span>
depends_lib-append port:smokeqt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ptr-comparison.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby18 conflicts ruby19 description {Select Ruby 1.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby18 conflicts ruby19 ruby32 description {Select Ruby 1.8} {
</span> depends_lib-append port:ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby1.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUBY_LIBRARY=${prefix}/lib/libruby.dylib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby19 conflicts ruby18 description {Select Ruby 1.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby19 conflicts ruby18 ruby32 description {Select Ruby 1.9} {
</span> depends_lib-append port:ruby19
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby1.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUBY_INCLUDE_DIRS=${prefix}/include/ruby-1.9.1/ruby \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUBY_LIBRARY=${prefix}/lib/libruby1.9.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby32 conflicts ruby18 ruby19 description {Select Ruby 3.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ruby32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby3.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUBY_INCLUDE_DIRS=${prefix}/include/ruby-3.2.2/ruby \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUBY_LIBRARY=${prefix}/lib/libruby3.2.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset ruby18] && ![variant_isset ruby19]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset ruby18] && ![variant_isset ruby19] && ![variant_isset ruby32]} {
</span> default_variants +ruby18
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtruby/files/patch-ptr-comparison.diff b/kde/qtruby/files/patch-ptr-comparison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d8336f805b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtruby/files/patch-ptr-comparison.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;'>+--- src/qtruby.cpp.orig 2013-06-02 05:39:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qtruby.cpp 2023-07-29 04:56:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2094,7 +2094,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void * ptr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr = value_to_ptr(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (ptr > 0 ? Qtrue : Qfalse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (ptr != 0 ? Qtrue : Qfalse);
</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;'>+ static VALUE
</span></pre><pre style='margin:0'>
</pre>