<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/ac6a5894b3fb41f084503b0e253d17bf11e9f379">https://github.com/macports/macports-ports/commit/ac6a5894b3fb41f084503b0e253d17bf11e9f379</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ac6a5894b3fb41f084503b0e253d17bf11e9f379
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 18 07:15:17 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gtk-sharp2: combine relate patchfiles
</span>---
x11/gtk-sharp2/Portfile | 6 +--
x11/gtk-sharp2/files/patch-dllmaps.diff | 47 ++++++++++++++++++++++
.../files/patch-gdk-sharp.dll.config.in.diff | 10 -----
.../files/patch-glade-sharp.dll.config.in.diff | 9 -----
.../files/patch-glib-sharp.dll.config.in.diff | 10 -----
.../files/patch-gtk-sharp.dll.config.in.diff | 8 ----
.../files/patch-pango-sharp.dll.config.in.diff | 10 -----
7 files changed, 48 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/Portfile b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c03b76b..4832e31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,7 @@ checksums md5 c278da6a472c6c13b698af012f543c64 \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gdk-sharp.dll.config.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glade-sharp.dll.config.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib-sharp.dll.config.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gtk-sharp.dll.config.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pango-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-dllmaps.diff
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-dllmaps.diff b/x11/gtk-sharp2/files/patch-dllmaps.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4f53514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-sharp2/files/patch-dllmaps.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** gdk/gdk-sharp.dll.config.in.orig 2008-01-18 05:33:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/gdk-sharp.dll.config.in 2008-01-18 05:34:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+***************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3,7 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dllmap dll="gdksharpglue-2" target="libgdksharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </configuration>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** glade/glade-sharp.dll.config.in.orig 2008-01-18 04:38:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glade/glade-sharp.dll.config.in 2008-01-18 04:41:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+***************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 1,3 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 1,4 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <configuration>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dllmap dll="gladesharpglue-2" target="gladesharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </configuration>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** glib/glib-sharp.dll.config.in.orig 2008-01-18 04:38:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glib-sharp.dll.config.in 2008-01-18 04:41:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+***************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3,7 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dllmap dll="glibsharpglue-2" target="libglibsharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </configuration>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gtk/gtk-sharp.dll.config.in.orig 2012-04-13 10:54:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gtk/gtk-sharp.dll.config.in 2012-04-13 10:55:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,4 +3,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dllmap dll="gtksharpglue-2" target="libgtksharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </configuration>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** pango/pango-sharp.dll.config.in.orig 2008-01-18 05:35:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango/pango-sharp.dll.config.in 2008-01-18 05:35:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+***************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3,7 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dllmap dll="pangosharpglue-2" target="libpangosharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </configuration>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-gdk-sharp.dll.config.in.diff b/x11/gtk-sharp2/files/patch-gdk-sharp.dll.config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f74420..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/files/patch-gdk-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** gdk/gdk-sharp.dll.config.in.orig 2008-01-18 05:33:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/gdk-sharp.dll.config.in 2008-01-18 05:34:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3,7 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dllmap dll="gdksharpglue-2" target="libgdksharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </configuration>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-glade-sharp.dll.config.in.diff b/x11/gtk-sharp2/files/patch-glade-sharp.dll.config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63b4817..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/files/patch-glade-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** glade/glade-sharp.dll.config.in.orig 2008-01-18 04:38:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glade/glade-sharp.dll.config.in 2008-01-18 04:41:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 1,3 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 1,4 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <configuration>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dllmap dll="gladesharpglue-2" target="gladesharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </configuration>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-glib-sharp.dll.config.in.diff b/x11/gtk-sharp2/files/patch-glib-sharp.dll.config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 07eae70..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/files/patch-glib-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** glib/glib-sharp.dll.config.in.orig 2008-01-18 04:38:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/glib-sharp.dll.config.in 2008-01-18 04:41:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3,7 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dllmap dll="glibsharpglue-2" target="libglibsharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </configuration>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-gtk-sharp.dll.config.in.diff b/x11/gtk-sharp2/files/patch-gtk-sharp.dll.config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b66500d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/files/patch-gtk-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gtk/gtk-sharp.dll.config.in.orig 2012-04-13 10:54:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gtk/gtk-sharp.dll.config.in 2012-04-13 10:55:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,4 +3,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dllmap dll="gtksharpglue-2" target="libgtksharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </configuration>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/files/patch-pango-sharp.dll.config.in.diff b/x11/gtk-sharp2/files/patch-pango-sharp.dll.config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62cf236..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/files/patch-pango-sharp.dll.config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** pango/pango-sharp.dll.config.in.orig 2008-01-18 05:35:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pango/pango-sharp.dll.config.in 2008-01-18 05:35:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 3,6 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3,7 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dllmap dll="pangosharpglue-2" target="libpangosharpglue-2.so"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </configuration>
</span></pre><pre style='margin:0'>
</pre>