<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/e7a4022aadd801afddabeac1d24e5232cc6e1c81">https://github.com/macports/macports-ports/commit/e7a4022aadd801afddabeac1d24e5232cc6e1c81</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 e7a4022aadd gegl, gegl-devel: drop redundant patch that fails to apply
</span>e7a4022aadd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7a4022aadd801afddabeac1d24e5232cc6e1c81
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Dec 1 00:25:23 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gegl, gegl-devel: drop redundant patch that fails to apply
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71428
</span>---
graphics/gegl-devel/Portfile | 5 -----
graphics/gegl-devel/files/patch-use-gcc.diff | 16 ----------------
graphics/gegl/Portfile | 5 -----
graphics/gegl/files/patch-use-gcc.diff | 16 ----------------
4 files changed, 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-devel/Portfile b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f83ddf47a9a..77ab11579e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,11 +81,6 @@ patchfiles-append patch-meson-unistd.diff
</span> # https://trac.macports.org/ticket/58524
patchfiles-append patch-gegl-32bit-host-statistics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/66233
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use-gcc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
patchfiles-append patch-gegl-opencl-fix-Leopard-and-less-only.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-devel/files/patch-use-gcc.diff b/graphics/gegl-devel/files/patch-use-gcc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a1a434b16f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-devel/files/patch-use-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2023-01-21 03:46:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2023-01-21 03:47:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,9 +139,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_android= host_os.contains('android')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_osx = host_os.contains('darwin')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- error('You should use Clang on OSx.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# error('You should use Clang on OSx.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Not necessarily.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_cpu_family == 'x86'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68a4b52d912..918d95d4a36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,11 +81,6 @@ patchfiles-append patch-meson-unistd.diff
</span> # https://trac.macports.org/ticket/58524
patchfiles-append patch-gegl-32bit-host-statistics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/66233
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use-gcc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
patchfiles-append patch-gegl-opencl-fix-Leopard-and-less-only.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-use-gcc.diff b/graphics/gegl/files/patch-use-gcc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a1a434b16f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/patch-use-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2023-01-21 03:46:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2023-01-21 03:47:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,9 +139,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_android= host_os.contains('android')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_osx = host_os.contains('darwin')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- error('You should use Clang on OSx.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# error('You should use Clang on OSx.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Not necessarily.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_cpu_family == 'x86'
</span></pre><pre style='margin:0'>
</pre>