From 7336bc9e993629063ec3ce995e6b9e0812858467 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sun, 18 Mar 2018 19:22:59 -0400
Subject: [PATCH] upgrade gnome terminal

---
 .../files/50_gnome-terminal.gschema.override  | 14 +++++++++++++
 .../files/gnome-terminal-citadel.service      |  7 +++++++
 .../files/org.gnome.TerminalCitadel.desktop   |  8 +++++++
 .../files/org.gnome.TerminalCitadel.service   |  4 ++++
 .../gnome-terminal/gnome-terminal_%.bbappend  | 21 +++++++++++++++++++
 meta-gnome/conf/include/gnome-3.26.2.inc      |  4 ++--
 .../gnome-terminal/gnome-terminal.inc         | 11 ++--------
 .../gnome-terminal/gnome-terminal_3.28.0.bb   |  6 ++++++
 meta-gnome/recipes-gnome/vte/vte_0.52.0.bb    |  4 ++++
 9 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override
 create mode 100644 meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service
 create mode 100644 meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop
 create mode 100644 meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service
 create mode 100644 meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend
 create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb
 create mode 100644 meta-gnome/recipes-gnome/vte/vte_0.52.0.bb

diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override b/meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override
new file mode 100644
index 0000000..0fd6cbb
--- /dev/null
+++ b/meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override
@@ -0,0 +1,14 @@
+[org.gnome.Terminal.Legacy.Settings]
+default-show-menubar=false
+
+[org.gnome.Terminal.Legacy.Profile]
+foreground-color='rgb(46,52,54)'
+visible-name='citadel'
+palette=['rgb(46,52,54)', 'rgb(204,0,0)', 'rgb(78,154,6)', 'rgb(196,160,0)', 'rgb(52,101,164)', 'rgb(117,80,123)', 'rgb(6,152,154)', 'rgb(211,215,207)', 'rgb(85,87,83)', 'rgb(239,41,41)', 'rgb(138,226,52)', 'rgb(252,233,79)', 'rgb(114,159,207)', 'rgb(173,127,168)', 'rgb(52,226,226)', 'rgb(238,238,236)']
+cursor-shape='block'
+use-system-font=false
+use-theme-colors=false
+font='Bitstream Vera Sans Mono 13'
+background-color='rgb(238,238,236)'
+scrollbar-policy='never'
+audible-bell=false
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service b/meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service
new file mode 100644
index 0000000..c5a5b4d
--- /dev/null
+++ b/meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=GNOME Terminal Server for Citadel
+[Service]
+KillMode=process
+Type=dbus
+BusName=org.gnome.TerminalCitadel
+ExecStart=/usr/libexec/gnome-terminal-server --class=org.gnome.TerminalCitadel --app-id org.gnome.TerminalCitadel
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop b/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop
new file mode 100644
index 0000000..a924f28
--- /dev/null
+++ b/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Citadel
+Keywords=shell;prompt;command;commandline;cmd;
+Exec=gnome-terminal --app-id org.gnome.TerminalCitadel --title "Citadel"
+Icon=utilities-root-terminal
+Type=Application
+StartupNotify=true
+X-GNOME-SingleWindow=false
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service b/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service
new file mode 100644
index 0000000..d80ad85
--- /dev/null
+++ b/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.TerminalCitadel
+SystemdService=gnome-terminal-citadel.service
+Exec=/usr/libexec/gnome-terminal-server --class=org.gnome.TerminalCitadel --app-id org.gnome.TerminalCitadel
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend
new file mode 100644
index 0000000..bc59479
--- /dev/null
+++ b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend
@@ -0,0 +1,21 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "\
+    file://gnome-terminal-citadel.service \
+    file://org.gnome.TerminalCitadel.desktop \
+    file://org.gnome.TerminalCitadel.service \
+    file://50_gnome-terminal.gschema.override \
+"
+
+DEPENDS += "paxctl-native"
+
+do_install_append() {
+    install -m 644 ${WORKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas
+    install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications
+    install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services
+    install -m 644 ${WORKDIR}/gnome-terminal-citadel.service ${D}${systemd_user_unitdir}
+    rm ${D}${datadir}/applications/org.gnome.Terminal.desktop
+    paxctl -cm ${D}${libexecdir}/gnome-terminal-server
+}
+
+
diff --git a/meta-gnome/conf/include/gnome-3.26.2.inc b/meta-gnome/conf/include/gnome-3.26.2.inc
index 4e7d82a..65c98f5 100644
--- a/meta-gnome/conf/include/gnome-3.26.2.inc
+++ b/meta-gnome/conf/include/gnome-3.26.2.inc
@@ -26,7 +26,7 @@ PREFERRED_VERSION_gnome-session = "3.26.1"
 PREFERRED_VERSION_gnome-settings-daemon = "3.26.1"
 PREFERRED_VERSION_gnome-shell = "3.26.1"
 PREFERRED_VERSION_gnome-system-monitor = "3.26.0"
-PREFERRED_VERSION_gnome-terminal = "3.26.2"
+#PREFERRED_VERSION_gnome-terminal = "3.26.2"
 PREFERRED_VERSION_gnome-themes-standard = "3.22.3"
 PREFERRED_VERSION_gsettings-desktop-schemas = "3.24.1"
 PREFERRED_VERSION_libcroco = "0.6.12"
@@ -42,7 +42,7 @@ PREFERRED_VERSION_networkmanager = "1.8.4"
 PREFERRED_VERSION_network-manager-applet = "1.8.4"
 PREFERRED_VERSION_pango = "1.40.13"
 PREFERRED_VERSION_pygobject = "3.26.1"
-PREFERRED_VERSION_vte = "0.50.2"
+#PREFERRED_VERSION_vte = "0.50.2"
 PREFERRED_VERSION_yelp = "3.26.0"
 PREFERRED_VERSION_yelp-xsl = "3.20.1"
 PREFERRED_VERSION_zenity = "3.24.0"
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc
index 2e0ec17..d539a51 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc
@@ -3,16 +3,10 @@ HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 
-DEPENDS = "intltool-native dconf gconf glib-2.0 util-linux gsettings-desktop-schemas glib-2.0-native vte libpcre gtk+3 vala-native libxml2-native desktop-file-utils-native yelp-tools-native paxctl-native"
-
-do_install_append() {
-    install -m 644 ${WORKDIR}/citadel.desktop ${D}${datadir}/applications
-    paxctl -cm ${D}${libexecdir}/gnome-terminal-server
-}
+DEPENDS = "intltool-native dconf gconf glib-2.0 util-linux gsettings-desktop-schemas glib-2.0-native vte libpcre gtk+3 vala-native libxml2-native desktop-file-utils-native yelp-tools-native"
 
 FILES_${PN} += "\
-    ${libdir}/systemd/user \
-    ${datadir}/help/sv/gnome-terminal \
+    ${systemd_user_unitdir} \
     ${datadir}/dbus-1/services \
     ${datadir}/glib-2.0/schemas \
     ${datadir}/metainfo \
@@ -24,7 +18,6 @@ FILES_${PN}-doc += "\
 
 # python3native is needed to run itstool during build
 inherit gettext gnome python3native
-SRC_URI += "file://citadel.desktop"
 
 EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension --disable-gterminal"
 
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb
new file mode 100644
index 0000000..79d26b2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.28.0.bb
@@ -0,0 +1,6 @@
+require gnome-terminal.inc
+SRC_URI[archive.md5sum] = "46827785f9de78329a1d894a6a957b83"
+SRC_URI[archive.sha256sum] = "a551d5eee10f66560fc7c6bdff6f7358ce9c60b526d8ba68a82f2ab024a3bcc4"
+EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension"
+
+
diff --git a/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb b/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb
new file mode 100644
index 0000000..1b3d436
--- /dev/null
+++ b/meta-gnome/recipes-gnome/vte/vte_0.52.0.bb
@@ -0,0 +1,4 @@
+require vte.inc
+EXTRA_OECONF = "--with-gnutls"
+SRC_URI[archive.md5sum] = "95b0d12864f7374128da33998e756e75"
+SRC_URI[archive.sha256sum] = "d5ae72dddd57af493afa10ca2a290f284e588021b0bd8aaaa63dbb75de7c0567"