<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e437cc84e7b05fbd953dd868410766a83aac8bb">https://github.com/macports/macports-ports/commit/8e437cc84e7b05fbd953dd868410766a83aac8bb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8e437cc84e7b05fbd953dd868410766a83aac8bb
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Sep 17 17:51:00 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdk-pixbuf2: Fix configure broken by upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream inadvertently removed os_win32=no for the darwin platform,
</span><span style='display:block; white-space:pre;color:#404040;'> causing various configure checks to be skipped, for example for libjpeg.
</span><span style='display:block; white-space:pre;color:#404040;'> This resulted in missing pixbuf loaders which were not included in the
</span><span style='display:block; white-space:pre;color:#404040;'> build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reverting the upstream change completely, as it is not clear to me why
</span><span style='display:block; white-space:pre;color:#404040;'> we would not want to use shared-mime-info as before.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=786167
</span>---
graphics/gdk-pixbuf2/Portfile | 4 +++-
graphics/gdk-pixbuf2/files/patch-shared-mime-info.diff | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gdk-pixbuf2/Portfile b/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cfaf630..8fea031 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ name gdk-pixbuf2
</span> set my_name gdk-pixbuf
epoch 2
version 2.36.10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license LGPL
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +35,8 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:jpeg \
port:tiff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-tests-pixbuf-readonly-to-mutable.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-tests-pixbuf-readonly-to-mutable.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-shared-mime-info.diff
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gdk-pixbuf2/files/patch-shared-mime-info.diff b/graphics/gdk-pixbuf2/files/patch-shared-mime-info.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f014e8c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gdk-pixbuf2/files/patch-shared-mime-info.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=786167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Revert upstream patch to restore shared-mime-info. Note that the missing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+os_win32=no also inadvertently broke other configure checks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,9 +116,6 @@ case "$host" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gio_can_sniff=no
</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;'>+ os_win32=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span></pre><pre style='margin:0'>
</pre>