<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8d9ecaac8a87a98b857a48f6fe5960485112c70d">https://github.com/macports/macports-ports/commit/8d9ecaac8a87a98b857a48f6fe5960485112c70d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d9ecaac8a87a98b857a48f6fe5960485112c70d
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Fri Jun 19 13:10:51 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> spice-gtk: update to 0.38; add quartz variant
</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/60684
</span>---
gnome/spice-gtk/Portfile | 36 +++++++++++++++++++++++-------------
gnome/spice-gtk/files/no-werror.diff | 12 ++++++++++++
2 files changed, 35 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/Portfile b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f328b503a8..bb801b6c490 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,10 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name spice-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.38
</span> maintainers {danchr @danchr} openmaintainer
categories gnome devel
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,23 +24,27 @@ long_description gtk-vnc is a VNC viewer widget for GTK. It is built using \
</span> homepage https://www.spice-space.org/page/Spice-Gtk
master_sites https://www.spice-space.org/download/gtk/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fb6644c0c70af290929329382f317ab5784856cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4e6073de5125e2bdecdf1fbe7c9e8c4cabe9c85518889b42f72bf63c8ab9e86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1437231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a9e44097fa0b7cc0b658e39a879fec205d9288f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5ae974731baf2b41316d4f0b3ae0c2e47f00bff91a5a617e189cd3dedcd96d8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 796112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-werror.diff
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-six port:py38-parsing \
</span> port:intltool port:vala
depends_lib \
port:spice-protocol \
port:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-glib \
</span> path:lib/pkgconfig/pixman-1.pc:libpixman \
port:lz4 \
port:jpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pulseaudio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1 port:gstreamer1-gst-plugins-base \
</span> port:libepoxy \
port:libusb \
port:libopus
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,14 +54,19 @@ configure.cppflags-append \
</span> -D_XOPEN_SOURCE
variant quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # src/vncdisplaykeymap.c includes <gdk/gdkquartz.h>, which in turn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # includes AppKit -- and that one fails hard in a regular C compiler...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -ObjC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Quartz & X11 binaries are incompatible, although built similarly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 quartz x11
</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;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Quartz & X11 binaries are incompatible, although built similarly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 x11 quartz
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[active_variants gtk3 quartz x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 "" quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/files/no-werror.diff b/gnome/spice-gtk/files/no-werror.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..77df06d42e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/files/no-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/spice-common/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ #<buffer spice-common/meson.build>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some global vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spice_common_global_cflags = ['-DG_LOG_DOMAIN="Spice"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-Werror',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wno-unused-parameter']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_option('alignment-checks')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Diff finished. Fri Jun 19 13:53:45 2020
</span></pre><pre style='margin:0'>
</pre>