<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5f5cf89f51eca05f24f310423c9f1351caeb0724">https://github.com/macports/macports-ports/commit/5f5cf89f51eca05f24f310423c9f1351caeb0724</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5f5cf89f51eca05f24f310423c9f1351caeb0724
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Tue Apr 23 08:42:31 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> sysutils/amttools: update to 1.6, rework patchset, switch to Perl 5.28.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/58361
</span>---
sysutils/amttools/Portfile | 35 ++--
.../patch-GNUmakefile-check-for-GTK2-only.diff | 20 ---
.../files/patch-GNUmakefile-disable-gamt.diff | 8 +-
.../amttools/files/patch-GNUmakefile-use-GTK3.diff | 20 ---
.../files/patch-GNUmakefile-use-vte-2.91.diff | 20 ---
...tch-amttool-prepare-hashbang-for-reinplace.diff | 4 +-
.../files/patch-gamt.c-switch-to-GTK3.diff | 197 ---------------------
.../files/patch-gamt.c-switch-to-libvte-2.91.diff | 81 ---------
...ariables.mk-no-special-usr-local-treatment.diff | 4 +-
9 files changed, 21 insertions(+), 368 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/Portfile b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57796ed..c94080c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name amttools
set my_distname amtterm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories sysutils
license GPL-2+
maintainers {ionic @Ionic} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,17 +23,22 @@ long_description AMT (included in Intel vPro and Centrino Pro) provides \
</span> amtterm and gamt are two terminal tools to connect to \
that pseudo serial interface from a remote computer. \
amttool is a perl script to gather information about \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- and remotely control AMT managed computers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and remotely control AMT managed computers. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that AMT 9.0 dropped support for the old SOAP- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ protocol-based communication this package implements. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Newer versions use WS Management implemented starting \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with AMT 3.0 and are not supported by this software.
</span> homepage https://www.kraxel.org/blog/linux/${my_distname}/
master_sites https://www.kraxel.org/releases/${my_distname}/
distname ${my_distname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fac39807990870f88884e541f4b062db8b8d1236 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e10af2b02dbf66fb24abd292b9ddc6d86b31eea09887da5cb0eb8fb2ee900e21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9fb55ade1f5ca3015be0794236ea3031fc137367 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1242cea467827aa1e2e91b41846229ca0a5b3f3e09260b0df9d78dc875075590 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 40804
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_branch 5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set perl_branch 5.28
</span> depends_build port:pkgconfig
depends_run port:p${perl_branch}-soap-lite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +56,6 @@ variant universal {}
</span> # (And drop this patch in the gtk variant...)
patchfiles patch-amttool-prepare-hashbang-for-reinplace.diff \
patch-mk_Variables.mk-no-special-usr-local-treatment.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-GNUmakefile-check-for-GTK2-only.diff \
</span> patch-GNUmakefile-disable-gamt.diff
build.type gnu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,24 +76,11 @@ post-patch {
</span> reinplace -W "${worksrcpath}" "s|@@PERL_BINARY@@|${prefix}/bin/perl${perl_branch}|" amttool
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk description {Enable gamt (GTK2-based AMT terminal)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gtk-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk description {Enable gamt (GTK3-based AMT terminal)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/pkgconfig/gtk-3.0.pc:gtk3 \
</span> port:vte
patchfiles-delete patch-GNUmakefile-disable-gamt.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Our libvte is GTK3-only, we need to switch the check to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that version explicitly. Also holds for the (newer) libvte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version, which now appends its library version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-GNUmakefile-use-GTK3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-GNUmakefile-use-vte-2.91.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is a "rebased" patch taken from upstream's git repository,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # c.f., https://www.kraxel.org/cgit/amtterm/patch/?id=f08799bee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gamt.c-switch-to-GTK3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (More or less) trivial fixups for libvte 2.91.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gamt.c-switch-to-libvte-2.91.diff
</span> }
livecheck.name ${my_distname}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff b/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b053038..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.old 2015-07-27 14:08:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile 2016-02-25 00:16:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@ include mk/Autoconf.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define make-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB := $(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--HAVE_GTK := $(call ac_pkg_config,gtk+-x11-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_GTK := $(call ac_pkg_config,gtk+-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_VTE := $(call ac_pkg_config,vte)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@ endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGETS += gamt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gamt : CFLAGS += -Wno-strict-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gamt : pkglst += gtk+-x11-2.0 vte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gamt : pkglst += gtk+-2.0 vte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff b/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 084baf7..5e1d83f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.old 2016-02-25 00:16:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile 2016-02-25 00:29:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,18 +25,6 @@ endef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GNUmakefile.old 2017-02-27 11:24:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GNUmakefile 2019-04-23 08:27:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,18 +26,6 @@ endef
</span>
#################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> -ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
- TARGETS += gamt
- gamt : CFLAGS += -Wno-strict-prototypes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- gamt : pkglst += gtk+-2.0 vte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gamt : pkglst += gtk+-3.0 gdk-3.0 vte-2.91
</span> -endif
-
-CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff b/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ade7f19..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.old 2016-02-25 00:39:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile 2016-02-25 00:41:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@ include mk/Autoconf.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define make-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB := $(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--HAVE_GTK := $(call ac_pkg_config,gtk+-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_GTK := $(call ac_pkg_config,gtk+-3.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_VTE := $(call ac_pkg_config,vte)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@ endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGETS += gamt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gamt : CFLAGS += -Wno-strict-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gamt : pkglst += gtk+-2.0 vte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gamt : pkglst += gtk+-3.0 vte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff b/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a9bb458..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.old 2016-02-25 01:54:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile 2016-02-25 01:55:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@ include mk/Autoconf.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define make-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB := $(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_GTK := $(call ac_pkg_config,gtk+-3.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--HAVE_VTE := $(call ac_pkg_config,vte)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_VTE := $(call ac_pkg_config,vte-2.91)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@ endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGETS += gamt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gamt : CFLAGS += -Wno-strict-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gamt : pkglst += gtk+-3.0 vte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gamt : pkglst += gtk+-3.0 vte-2.91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff b/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d06c14..0332d9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- amttool.old 2015-07-27 14:08:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ amttool 2016-02-25 00:45:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- amttool.old 2017-02-27 11:24:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ amttool 2019-04-23 08:22:57.000000000 +0200
</span> @@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL_BINARY@@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff b/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a8bb36a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,197 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gamt.c.old 2015-07-27 14:08:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gamt.c 2016-02-25 02:08:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,10 +259,9 @@ static void menu_cb_config_font(GtkActio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *fontname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int done = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialog = gtk_font_selection_dialog_new("Terminal font");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dialog = gtk_font_chooser_dialog_new("Terminal font", NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontname = cfg_get_str(CFG_FONT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_font_selection_dialog_set_font_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (GTK_FONT_SELECTION_DIALOG(dialog), fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dialog), fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_show_all(dialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (!done) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,8 +270,7 @@ static void menu_cb_config_font(GtkActio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* fall through */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GTK_RESPONSE_APPLY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fontname = gtk_font_selection_dialog_get_font_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (GTK_FONT_SELECTION_DIALOG(dialog));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg_set_str(CFG_FONT, fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -284,22 +282,19 @@ static void menu_cb_config_font(GtkActio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_destroy(dialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static int pickcolor(char *title, GdkColor *color)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int pickcolor(char *title, GdkRGBA *color)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GtkWidget *dialog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GtkColorSelection *csel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialog = gtk_color_selection_dialog_new(title);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- csel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_color_selection_set_has_opacity_control(csel, FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_color_selection_set_current_color(csel, color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dialog = gtk_color_chooser_dialog_new(title, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(dialog), color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_show_all(dialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (gtk_dialog_run(GTK_DIALOG(dialog))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GTK_RESPONSE_OK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_color_selection_get_current_color(csel, color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog), color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_destroy(dialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return rc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -308,30 +303,34 @@ static int pickcolor(char *title, GdkCol
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void menu_cb_config_fg(GtkAction *action, void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gamt_window *gamt = data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GdkColor color = {0,0,0,0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GdkRGBA color = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char name[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdk_color_parse(cfg_get_str(CFG_FOREGROUND), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 != pickcolor("Text color", &color))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(name, sizeof(name), "#%04x%04x%04x",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- color.red, color.green, color.blue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.red * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.green * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.blue * 65535));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg_set_str(CFG_FOREGROUND, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void menu_cb_config_bg(GtkAction *action, void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gamt_window *gamt = data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GdkColor color = {0,0,0,0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GdkRGBA color = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char name[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdk_color_parse(cfg_get_str(CFG_BACKGROUND), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 != pickcolor("Background color", &color))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(name, sizeof(name), "#%04x%04x%04x",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- color.red, color.green, color.blue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.red * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.green * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(color.blue * 65535));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg_set_str(CFG_BACKGROUND, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,11 +338,13 @@ static void menu_cb_blink_cursor(GtkTogg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gamt_window *gamt = user_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean state = gtk_toggle_action_get_active(action);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VteTerminalCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (amt_debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "%s: %s\n", __FUNCTION__, state ? "on" : "off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg_set_bool(CFG_BLINK, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_cursor_blinks(VTE_TERMINAL(gamt->vte), state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ blink = state ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(gamt->vte), blink);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void menu_cb_quit(GtkAction *action, void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,7 +371,7 @@ static void show_manpage(char *page, cha
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ... fallback is an xterm with man */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(buf, sizeof(buf), "manual page: %s(%s)", page, section);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execlp("xterm", "xterm",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "-title", buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-title", buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-e", "man", section, page,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- perror("execlp(xterm)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -624,7 +625,7 @@ static char hosts_xml_end[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int gamt_getstring(GtkWidget *window, char *title, char *message,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *dest, int dlen, int hide)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GtkWidget *dialog, *label, *entry;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GtkWidget *dialog, *label, *entry, *box;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *txt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -648,11 +649,12 @@ static int gamt_getstring(GtkWidget *win
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (hide)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), entry);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ box = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_container_add(GTK_CONTAINER(box), label);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_container_add(GTK_CONTAINER(box), entry);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if 0 /* FIXME: doesn't work ... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_box_set_spacing(GTK_BOX(box), 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_container_set_border_width(GTK_CONTAINER(box), 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* show and wait for response */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -779,7 +781,8 @@ static int gamt_connect(struct gamt_wind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GtkWidget *vbox, *hbox, *frame, *item;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GdkColor color;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VteTerminalCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GdkRGBA color;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GError *err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gamt_window *gamt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -831,7 +834,8 @@ static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item = gtk_ui_manager_get_widget(gamt->ui, "/MainMenu/ConfigMenu/BlinkCursor");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state = cfg_get_bool(CFG_BLINK, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_cursor_blinks(VTE_TERMINAL(gamt->vte), state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ blink = state ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(gamt->vte), blink);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* other widgets */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gamt->status = gtk_label_new("idle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -841,8 +845,8 @@ static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GTK_ICON_SIZE_SMALL_TOOLBAR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Make a vbox and put stuff in */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vbox = gtk_vbox_new(FALSE, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hbox = gtk_hbox_new(FALSE, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_container_set_border_width(GTK_CONTAINER(vbox), 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_container_add(GTK_CONTAINER(gamt->win), vbox);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item = gtk_ui_manager_get_widget(gamt->ui, "/MainMenu");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -867,13 +871,13 @@ static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = cfg_get_str(CFG_FOREGROUND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdk_color_parse(str, &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdk_rgba_parse(&color, str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = cfg_get_str(CFG_BACKGROUND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdk_color_parse(str, &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdk_rgba_parse(&color, str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gamt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in amtterm-1.4: index.html?id=f08799bee9ee53100360d86a47bb71591530158b
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff b/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c87a785..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gamt.c.old 2016-02-25 02:24:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gamt.c 2016-02-25 02:32:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gdk/gdkx.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vte/vte.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <pango/pango-font.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "parseconfig.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "redir.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,7 +272,8 @@ static void menu_cb_config_font(GtkActio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* fall through */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GTK_RESPONSE_APPLY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PangoFontDescription *font_desc = pango_font_description_from_string(fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font_desc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg_set_str(CFG_FONT, fontname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,7 +311,7 @@ static void menu_cb_config_fg(GtkAction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 != pickcolor("Text color", &color))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(name, sizeof(name), "#%04x%04x%04x",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)(color.red * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)(color.green * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,7 +328,7 @@ static void menu_cb_config_bg(GtkAction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 != pickcolor("Background color", &color))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(name, sizeof(name), "#%04x%04x%04x",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)(color.red * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)(color.green * 65535),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,7 +340,7 @@ static void menu_cb_blink_cursor(GtkTogg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gamt_window *gamt = user_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean state = gtk_toggle_action_get_active(action);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VteTerminalCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VteCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (amt_debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "%s: %s\n", __FUNCTION__, state ? "on" : "off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -781,7 +783,7 @@ static int gamt_connect(struct gamt_wind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GtkWidget *vbox, *hbox, *frame, *item;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VteTerminalCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VteCursorBlinkMode blink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkRGBA color;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GError *err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -823,7 +825,8 @@ static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_connect(gamt->vte, "commit", G_CALLBACK(user_input), gamt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vte_terminal_set_scrollback_lines(VTE_TERMINAL(gamt->vte), 4096);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = cfg_get_str(CFG_FONT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PangoFontDescription *font_desc = pango_font_description_from_string(str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font_desc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* FIXME: make configurable */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vte_terminal_set_backspace_binding(VTE_TERMINAL(gamt->vte),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -872,12 +875,12 @@ static struct gamt_window *gamt_window()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = cfg_get_str(CFG_FOREGROUND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_rgba_parse(&color, str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = cfg_get_str(CFG_BACKGROUND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_rgba_parse(&color, str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gamt;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff b/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd92b6b..02730c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mk/Variables.mk.old 2015-07-27 14:08:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mk/Variables.mk 2016-02-25 00:10:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mk/Variables.mk.old 2017-02-27 11:24:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mk/Variables.mk 2019-04-23 08:24:44.000000000 +0200
</span> @@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -W
-Wpointer-arith -Wunused
CXXFLAGS += -Wall -Wpointer-arith -Wunused
</pre><pre style='margin:0'>
</pre>