<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/71bf5447ceb29cc7116cbce756d6d3d486d96ee8">https://github.com/macports/macports-ports/commit/71bf5447ceb29cc7116cbce756d6d3d486d96ee8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 71bf5447ceb29cc7116cbce756d6d3d486d96ee8
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 31 05:29:25 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk-chtheme: Fix build failure (deprecated gtk)
</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/62389
</span>---
x11/gtk-chtheme/Portfile | 30 ++++++++++++++++++++----------
x11/gtk-chtheme/files/Makefile.patch | 19 +++++++++++++++++++
x11/gtk-chtheme/files/Metadata.diff | 10 ----------
3 files changed, 39 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-chtheme/Portfile b/x11/gtk-chtheme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8be7e18ec0..2736cdf008d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-chtheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-chtheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,33 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name gtk-chtheme
version 0.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5d080e905fc5d60c085e8c46d9338ddad805f38c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 26f4b6dd60c220d20d612ca840b6beb18b59d139078be72c7b1efefc447df844 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18205
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers gmail.com:alexandernx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description gtk-2 theme switcher
long_description Simple and tiny GTK-2 theme switcher. \
If you don't need full gnome and don't like \
changing .rc files by hand, use this app.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://plasmasturm.org/programs/gtk-chtheme/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://plasmasturm.org/code/gtk-chtheme/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://plasmasturm.org/code/gtk-chtheme/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f688053bf26dd6c4f1cd0bf2ee33de2a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib lib:libgtk.2:gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Metadata.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.patch \
</span> patch-gtk-2.20.diff \
patch-gtk-2.24.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir DESTDIR=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${makefile.prefix_name}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-chtheme/files/Makefile.patch b/x11/gtk-chtheme/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e3c9c704733
</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-chtheme/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override MacPorts CPPFLAGS, CXXFLAGS, or LDFLAGS. Don't disable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deprecated GTK functions because that causes the build to fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2004-02-09 11:08:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-03-31 05:23:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,12 +2,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(CFLAGS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += $(shell pkg-config --libs gtk+-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CPPFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRC = util stock theme_sel font_sel preview_pane about_dialog mainwin main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-chtheme/files/Metadata.diff b/x11/gtk-chtheme/files/Metadata.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4bd3a54b97a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-chtheme/files/Metadata.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;'>-diff -urN gtk-chtheme-0.3.1/Metadata gtk-chtheme-0.3.1-new/Metadata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Metadata.orig 2004-02-09 16:47:23.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Metadata 2005-05-23 15:37:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installed on the system are presented for selection and previewed on the fly.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- A large variety of widgets provides a comprehensive demonstration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = /usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR = $(PREFIX)/bin
</span></pre><pre style='margin:0'>
</pre>