diff -pruN 3.38.1-1/debian/changelog 3.38.1-1ubuntu1/debian/changelog --- 3.38.1-1/debian/changelog 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/changelog 2020-11-06 14:51:10.000000000 +0000 @@ -1,3 +1,29 @@ +gnome-terminal (3.38.1-1ubuntu1) hirsute; urgency=medium + + * Merge with debian, remaining changes: + - gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - add a build dependency on gettext to match the configure requirement + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Gunnar Hjalmarsson Fri, 06 Nov 2020 15:51:10 +0100 + gnome-terminal (3.38.1-1) unstable; urgency=medium * Team upload @@ -6,6 +32,32 @@ gnome-terminal (3.38.1-1) unstable; urge -- Simon McVittie Mon, 02 Nov 2020 10:26:35 +0000 +gnome-terminal (3.38.0-1ubuntu1) groovy; urgency=medium + + * Merge with debian, remaining changes: + - gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - add a build dependency on gettext to match the configure requirement + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Marco Trevisan (Treviño) Tue, 22 Sep 2020 21:03:04 +0200 + gnome-terminal (3.38.0-1) unstable; urgency=medium * Team upload @@ -35,6 +87,32 @@ gnome-terminal (3.37.90-1) experimental; -- Simon McVittie Thu, 03 Sep 2020 12:16:09 +0100 +gnome-terminal (3.36.2-3ubuntu1) UNRELEASED; urgency=medium + + * Merge with debian, remaining changes: + - gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - add a build dependency on gettext to match the configure requirement + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Marco Trevisan (Treviño) Sat, 29 Aug 2020 19:30:44 +0200 + gnome-terminal (3.36.2-3) unstable; urgency=medium * Team upload @@ -49,7 +127,7 @@ gnome-terminal (3.36.2-3) unstable; urge gnome-terminal (3.36.2-2) unstable; urgency=medium * debian/gnome-terminal.wrapper: - - Always wait for terminal to exit: + - Always wait for terminal to exit (LP: #1893555): GNOME Terminal now uses a dbus-activated service, so calling it would exit immediately once it dbus-activates the server, while the wrapper is supposed to mimic xterm behavior and so to wait until the terminal is @@ -70,6 +148,32 @@ gnome-terminal (3.36.2-2) unstable; urge -- Marco Trevisan (Treviño) Sat, 29 Aug 2020 19:24:35 +0200 +gnome-terminal (3.36.2-1ubuntu1) groovy; urgency=medium + + * Merge with debian, remaining changes: + - gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - add a build dependency on gettext to match the configure requirement + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Ken VanDine Wed, 10 Jun 2020 21:40:18 -0400 + gnome-terminal (3.36.2-1) unstable; urgency=medium * Team upload @@ -106,6 +210,32 @@ gnome-terminal (3.36.1.1-2) unstable; ur -- Simon McVittie Fri, 10 Apr 2020 15:51:16 +0100 +gnome-terminal (3.36.1.1-1ubuntu1) focal; urgency=medium + + * Merge with debian, remaining changes: + - gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - add a build dependency on gettext to match the configure requirement + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Olivier Tilloy Thu, 09 Apr 2020 23:20:01 +0200 + gnome-terminal (3.36.1.1-1) unstable; urgency=medium * Team upload @@ -128,6 +258,41 @@ gnome-terminal (3.36.0.1-1) unstable; ur -- Laurent Bigonville Tue, 10 Mar 2020 18:53:11 +0100 +gnome-terminal (3.35.91-0ubuntu1) focal; urgency=medium + + * New upstream release + * debian/control: + - Bump build-depends on libgtk-3-dev, libglib2.0-dev, + libnautilus-extension-dev + - Drop build-depends on intltool, add build-depends on gettext + + -- Robert Ancell Thu, 20 Feb 2020 12:22:52 +1300 + +gnome-terminal (3.34.2-1ubuntu1) eoan; urgency=medium + + * Merge with debian as SRU (LP: #1849285), remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Iain Lane Tue, 22 Oct 2019 11:22:40 +0100 + gnome-terminal (3.34.2-1) unstable; urgency=medium * New upstream translations update @@ -141,6 +306,38 @@ gnome-terminal (3.34.1-1) unstable; urge -- Jeremy Bicha Thu, 10 Oct 2019 07:00:42 -0400 +gnome-terminal (3.34.0-1ubuntu2) eoan; urgency=medium + + * gnome-terminal.wrap: Update gnome-terminal-server path for libexec + migration (LP: #1843872) + + -- Iain Lane Fri, 13 Sep 2019 09:43:11 +0100 + +gnome-terminal (3.34.0-1ubuntu1) eoan; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Iain Lane Thu, 12 Sep 2019 11:53:06 +0100 + gnome-terminal (3.34.0-1) unstable; urgency=medium * New upstream release @@ -152,6 +349,31 @@ gnome-terminal (3.34.0-1) unstable; urge -- Iain Lane Thu, 12 Sep 2019 11:30:16 +0100 +gnome-terminal (3.33.90-1ubuntu1) eoan; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Iain Lane Wed, 21 Aug 2019 17:19:09 +0100 + gnome-terminal (3.33.90-1) experimental; urgency=medium * New upstream release @@ -159,6 +381,31 @@ gnome-terminal (3.33.90-1) experimental; -- Iain Lane Wed, 21 Aug 2019 16:35:25 +0100 +gnome-terminal (3.32.1-1ubuntu1) disco; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Iain Lane Tue, 09 Apr 2019 13:17:19 +0100 + gnome-terminal (3.32.1-1) experimental; urgency=medium * New upstream release @@ -172,6 +419,31 @@ gnome-terminal (3.32.1-1) experimental; -- Iain Lane Tue, 09 Apr 2019 13:13:25 +0100 +gnome-terminal (3.32.0-1ubuntu1) disco; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Jeremy Bicha Wed, 13 Mar 2019 19:09:16 -0400 + gnome-terminal (3.32.0-1) experimental; urgency=medium * New upstream release @@ -181,6 +453,31 @@ gnome-terminal (3.32.0-1) experimental; -- Jeremy Bicha Wed, 13 Mar 2019 19:07:34 -0400 +gnome-terminal (3.31.90-1ubuntu1) disco; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + -- Jeremy Bicha Wed, 06 Feb 2019 10:03:58 -0500 + gnome-terminal (3.31.90-1) experimental; urgency=medium * New upstream development release @@ -190,6 +487,42 @@ gnome-terminal (3.31.90-1) experimental; -- Jeremy Bicha Wed, 06 Feb 2019 09:40:55 -0500 +gnome-terminal (3.30.2-2ubuntu2) disco; urgency=medium + + * Build-Depend on libpcre2-dev now that pcre2 is in Ubuntu main + * Drop revert-pcre2.patch + + -- Jeremy Bicha Wed, 23 Jan 2019 13:18:54 -0500 + +gnome-terminal (3.30.2-2ubuntu1) disco; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + + -- Iain Lane Fri, 11 Jan 2019 13:04:46 +0000 + gnome-terminal (3.30.2-2) unstable; urgency=medium * Restore -Wl,-O1 to our LDFLAGS @@ -205,8 +538,38 @@ gnome-terminal (3.30.2-1) unstable; urge -- Simon McVittie Fri, 02 Nov 2018 11:21:34 +0000 +gnome-terminal (3.30.1-1ubuntu1) cosmic; urgency=medium + + * Merge with debian, remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + + -- Iain Lane Wed, 10 Oct 2018 20:51:43 +0100 + gnome-terminal (3.30.1-1) unstable; urgency=medium + [ Simon McVittie ] * Team upload * New upstream release - d/p/app-Make-new-terminal-menu-a-hidden-pref.patch: @@ -216,7 +579,7 @@ gnome-terminal (3.30.1-1) unstable; urge * Standards-Version: 4.2.1 * Bump vte dependency to 0.54.1 as per configure.ac - -- Simon McVittie Fri, 05 Oct 2018 14:02:44 +0100 + -- Iain Lane Wed, 10 Oct 2018 20:50:46 +0100 gnome-terminal (3.30.0-2) unstable; urgency=medium @@ -228,6 +591,44 @@ gnome-terminal (3.30.0-2) unstable; urge -- Simon McVittie Fri, 05 Oct 2018 10:06:38 +0100 +gnome-terminal (3.30.0-1ubuntu1) cosmic; urgency=medium + + * Merge with debian (LP: #1791373), remaining changes: + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + * Keep 006-fix-invalid-appstream-metadata.patch: + - Ubuntu's AppStream versions and http://appstream.ubuntu.com/ + don't support gnome-terminal's syntax yet + * Refreshed Patches: + + debian/patches/50_add_unity_quicklist.patch: + - Dropped as upstream includes this feature now + * debian/rules: + - Stop installing compatibility version of gnome-terminal.desktop + (LP: #1739263) + + -- Marco Trevisan (Treviño) Wed, 12 Sep 2018 15:30:08 +0100 + gnome-terminal (3.30.0-1) unstable; urgency=medium [ Marco Trevisan (Treviño) ] @@ -245,6 +646,43 @@ gnome-terminal (3.30.0-1) unstable; urge -- Jeremy Bicha Sat, 08 Sep 2018 11:20:13 -0400 +gnome-terminal (3.28.2-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian. Remaining changes: + + debian/rules: + - Install compatibility version of gnome-terminal.desktop + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 50_add_unity_quicklist.patch: + - Add Unity quicklist menu item. + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + * Keep 006-fix-invalid-appstream-metadata.patch: + - Ubuntu's AppStream versions and http://appstream.ubuntu.com/ + don't support gnome-terminal's syntax yet + * debian/{gbp.conf,control{,.in}}: Update for Ubuntu + + -- Iain Lane Wed, 30 May 2018 13:47:09 +0100 + gnome-terminal (3.28.2-1) unstable; urgency=medium [ Iain Lane ] @@ -264,6 +702,49 @@ gnome-terminal (3.28.1-2) unstable; urge -- Jeremy Bicha Fri, 11 May 2018 19:37:03 -0400 +gnome-terminal (3.28.1-1ubuntu2) cosmic; urgency=medium + + * Restore File > New Tab menu item. Thanks Debarshi Ray for the suggestion. + (LP: #1747171) + + -- Jeremy Bicha Fri, 11 May 2018 17:15:21 -0400 + +gnome-terminal (3.28.1-1ubuntu1) bionic; urgency=medium + + * Merge with Debian. Remaining changes: + + debian/rules: + - Install compatibility version of gnome-terminal.desktop + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 50_add_unity_quicklist.patch: + - Add Unity quicklist menu item. + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + * Keep 006-fix-invalid-appstream-metadata.patch: + - Ubuntu's AppStream versions and http://appstream.ubuntu.com/ + don't support gnome-terminal's syntax yet + + -- Jeremy Bicha Tue, 10 Apr 2018 14:17:12 -0400 + gnome-terminal (3.28.1-1) unstable; urgency=medium * New upstream release @@ -274,6 +755,39 @@ gnome-terminal (3.28.1-1) unstable; urge -- Jeremy Bicha Mon, 09 Apr 2018 18:21:41 -0400 +gnome-terminal (3.28.0-1ubuntu1) bionic; urgency=medium + + * Merge with Debian. Remaining changes: + + debian/rules: + - Install compatibility version of gnome-terminal.desktop + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 50_add_unity_quicklist.patch: + - Add Unity quicklist menu item. + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + + -- Jeremy Bicha Wed, 21 Mar 2018 14:05:46 -0400 + gnome-terminal (3.28.0-1) unstable; urgency=medium * New upstream release @@ -283,6 +797,39 @@ gnome-terminal (3.28.0-1) unstable; urge -- Jeremy Bicha Mon, 12 Mar 2018 18:16:20 -0400 +gnome-terminal (3.27.92-1ubuntu1) bionic; urgency=medium + + * Merge with Debian. Remaining changes: + + debian/rules: + - Install compatibility version of gnome-terminal.desktop + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 50_add_unity_quicklist.patch: + - Add Unity quicklist menu item. + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + + -- Jeremy Bicha Tue, 06 Mar 2018 12:09:33 -0500 + gnome-terminal (3.27.92-1) unstable; urgency=medium * New upstream release candidate @@ -295,6 +842,44 @@ gnome-terminal (3.27.92-1) unstable; urg -- Jeremy Bicha Tue, 06 Mar 2018 11:56:33 -0500 +gnome-terminal (3.27.90-1ubuntu1) bionic; urgency=medium + + [ Jeremy Bicha ] + * Merge with Debian (LP: #1744711). Remaining changes: + + debian/rules: + - Install compatibility version of gnome-terminal.desktop + + gnome-terminal.wrap, debian/rules: + - Add a wrapper script to restore command line compatibility. + + debian/control.in: + - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for + the wrapper script. + - Don't Build-Depend on PCRE2 + + Add 0001-Restore-transparency.patch: + - Restore transparency support + + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch: + - Add CSS names and style classes so we can theme things more easily. + + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch: + - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @ + Fedora (LP: #1650395) + + Add 50_add_unity_quicklist.patch: + - Add Unity quicklist menu item. + + Add 52_support_apturl.patch: + - Support apt: urls. + + Add 60_add_lp_handler.patch: + - Add a handler for launchpad bug URLs. + + Add scrollbar-background-theming.patch: + - Draw background under the scrollbar that matches the actual terminal + background color. This allows proper theming. + + Add debian/patches/revert-pcre2.patch: + - Revert changes that require PCRE2 since it's not in main + (see MIR #163666) + + [ Egmont Koblinger ] + * Update patches to apply against new version + * Always show "Use transparency from system theme" checkbox (LP: #1745825) + + -- Egmont Koblinger Fri, 16 Feb 2018 13:09:20 -0500 + gnome-terminal (3.27.90-1) experimental; urgency=medium * New upstream development release diff -pruN 3.38.1-1/debian/control 3.38.1-1ubuntu1/debian/control --- 3.38.1-1/debian/control 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/control 2020-11-06 14:51:10.000000000 +0000 @@ -5,13 +5,16 @@ Source: gnome-terminal Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville Build-Depends: debhelper-compat (= 12), desktop-file-utils, dh-sequence-gnome, + dh-exec, docbook-to-man, docbook-xsl, + gettext (>= 0.19.8), gnome-common, gnome-pkg-tools (>= 0.10), gnome-shell-common (>= 3.36.1-6~) | gnome-shell, @@ -28,8 +31,10 @@ Build-Depends: debhelper-compat (= 12), yelp-tools Rules-Requires-Root: no Standards-Version: 4.5.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Terminal Package: gnome-terminal @@ -39,6 +44,9 @@ Depends: default-dbus-session-bus | dbus gnome-terminal-data (<< ${gnome:NextVersion}), gnome-terminal-data (>= ${gnome:Version}), gsettings-desktop-schemas (>= 0.1.0), + python3, + python3-gi, + gir1.2-glib-2.0, ${misc:Depends}, ${shlibs:Depends} Provides: x-terminal-emulator diff -pruN 3.38.1-1/debian/control.in 3.38.1-1ubuntu1/debian/control.in --- 3.38.1-1/debian/control.in 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/control.in 2020-11-06 14:51:10.000000000 +0000 @@ -1,13 +1,16 @@ Source: gnome-terminal Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 12), desktop-file-utils, dh-sequence-gnome, + dh-exec, docbook-to-man, docbook-xsl, + gettext (>= 0.19.8), gnome-common, gnome-pkg-tools (>= 0.10), gnome-shell-common (>= 3.36.1-6~) | gnome-shell, @@ -24,8 +27,10 @@ Build-Depends: debhelper-compat (= 12), yelp-tools Rules-Requires-Root: no Standards-Version: 4.5.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-terminal.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-terminal/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Terminal Package: gnome-terminal @@ -35,6 +40,9 @@ Depends: default-dbus-session-bus | dbus gnome-terminal-data (<< ${gnome:NextVersion}), gnome-terminal-data (>= ${gnome:Version}), gsettings-desktop-schemas (>= 0.1.0), + python3, + python3-gi, + gir1.2-glib-2.0, ${misc:Depends}, ${shlibs:Depends} Provides: x-terminal-emulator diff -pruN 3.38.1-1/debian/gbp.conf 3.38.1-1ubuntu1/debian/gbp.conf --- 3.38.1-1/debian/gbp.conf 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/gbp.conf 2020-11-06 14:51:10.000000000 +0000 @@ -1,8 +1,9 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master upstream-branch = upstream/latest upstream-vcs-tag = %(version)s +debian-tag = ubuntu/%(version)s [buildpackage] sign-tags = True diff -pruN 3.38.1-1/debian/gnome-terminal.wrap 3.38.1-1ubuntu1/debian/gnome-terminal.wrap --- 3.38.1-1/debian/gnome-terminal.wrap 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/gnome-terminal.wrap 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,109 @@ +#!/usr/bin/python3 + +import string +import subprocess +import sys +import random + +from argparse import ArgumentParser, SUPPRESS +from gi.repository import GLib, Gio + + +PREFIX = "com.canonical.Terminal." + + +class GnomeTerminal(object): + @staticmethod + def generate_random_string(length=32, + chars=string.ascii_lowercase + + string.ascii_uppercase): + return ''.join(random.choice(chars) for _ in range(length)) + + @staticmethod + def find_new_name(): + name = PREFIX + GnomeTerminal.generate_random_string() + proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_AUTO_START | + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS | + Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES, + None, + name, + "/org/gnome/Terminal", + "org.freedesktop.Application", + None) + return name if proxy.get_name_owner() is None else find_new_name() + + def exit_loop(self, a, b, subprocess): + sys.exit(subprocess.get_exit_status()) + + def server_appeared(self, con, name, owner): + # start gnome-terminal now + Gio.Subprocess.new(['/usr/bin/gnome-terminal.real', + '--app-id', name] + + self.args, + Gio.SubprocessFlags.NONE) + + def spawn_terminal_server(self, name, cls): + args = ['/usr/libexec/gnome-terminal-server', + '--app-id', + name] + if cls is not None: + args.extend(['--class', cls]) + ts = Gio.Subprocess.new(args, Gio.SubprocessFlags.NONE) + ts.wait_async(None, self.exit_loop, ts) + + def __init__(self, args, mainloop): + self.name = None + self.mainloop = mainloop + + parser = ArgumentParser(add_help=False, usage=SUPPRESS) + parser.add_argument('--app-id', action='store', dest='appid') + + # swallow these arguments + parser.add_argument('-h', '--help', action='store_true', dest='help') + parser.add_argument('--disable-factory', action='store_true') + parser.add_argument('--class', action='store', dest='cls') + + cmdargs, unknown = parser.parse_known_args() + + self.args = unknown + self.args.insert(0, "/usr/bin/gnome-terminal.real") + + if cmdargs.help: + self.args.append('--help') + + if cmdargs.cls is not None and cmdargs.appid is None: + self.name = PREFIX + cmdargs.cls + elif cmdargs.appid is not None: + self.name = cmdargs.appid + + # --disable-factory, --class and --app-id weren't supplied, so just + # invoke g-t + if not cmdargs.disable_factory and self.name is None: + sys.exit(subprocess.call(self.args)) + + if self.name is None: + self.name = self.find_new_name() + + Gio.bus_watch_name(Gio.BusType.SESSION, + self.name, + Gio.BusNameWatcherFlags.NONE, + self.server_appeared, + None) + + self.spawn_terminal_server(self.name, cmdargs.cls) + + +def main(): + mainloop = GLib.MainLoop() + GnomeTerminal(sys.argv[:], mainloop) + + try: + mainloop.run() + except KeyboardInterrupt: + pass + + +if __name__ == "__main__": + main() diff -pruN 3.38.1-1/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch 3.38.1-1ubuntu1/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch --- 3.38.1-1/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,66 @@ +From: Iain Lane +Date: Fri, 24 Jun 2016 14:51:22 +0100 +Subject: [PATCH] Add style classes and CSS names to some of our widgets + +--- + src/terminal-notebook.c | 6 ++++++ + src/terminal-screen.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c +index 356a389..5f5670f 100644 +--- a/src/terminal-notebook.c ++++ b/src/terminal-notebook.c +@@ -32,6 +32,8 @@ + #include "terminal-schemas.h" + #include "terminal-libgsystem.h" + ++#define TERMINAL_NOTEBOOK_STYLE_CLASS "terminal-notebook" ++ + #define TERMINAL_NOTEBOOK_GET_PRIVATE(notebook)(G_TYPE_INSTANCE_GET_PRIVATE ((notebook), TERMINAL_TYPE_NOTEBOOK, TerminalNotebookPrivate)) + + struct _TerminalNotebookPrivate +@@ -387,11 +389,15 @@ static void + terminal_notebook_init (TerminalNotebook *notebook) + { + TerminalNotebookPrivate *priv; ++ GtkStyleContext *context; + + priv = notebook->priv = TERMINAL_NOTEBOOK_GET_PRIVATE (notebook); + + priv->active_screen = NULL; + priv->policy = GTK_POLICY_AUTOMATIC; ++ ++ context = gtk_widget_get_style_context (GTK_WIDGET (notebook)); ++ gtk_style_context_add_class (context, TERMINAL_NOTEBOOK_STYLE_CLASS); + } + + static void +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 1280874..277e503 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -134,6 +134,8 @@ enum + TARGET_TAB + }; + ++#define TERMINAL_SCREEN_STYLE_CLASS "terminal-screen" ++ + static void terminal_screen_constructed (GObject *object); + static void terminal_screen_dispose (GObject *object); + static void terminal_screen_finalize (GObject *object); +@@ -553,9 +555,14 @@ terminal_screen_init (TerminalScreen *screen) + guint i; + uuid_t u; + char uuidstr[37]; ++ GtkStyleContext *context; + + priv = screen->priv = G_TYPE_INSTANCE_GET_PRIVATE (screen, TERMINAL_TYPE_SCREEN, TerminalScreenPrivate); + ++ context = gtk_widget_get_style_context (GTK_WIDGET (screen)); ++ ++ gtk_style_context_add_class (context, TERMINAL_SCREEN_STYLE_CLASS); ++ + uuid_generate (u); + uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); diff -pruN 3.38.1-1/debian/patches/0001-Restore-transparency.patch 3.38.1-1ubuntu1/debian/patches/0001-Restore-transparency.patch --- 3.38.1-1/debian/patches/0001-Restore-transparency.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/0001-Restore-transparency.patch 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,387 @@ +From: Debarshi Ray +Date: Mon, 12 May 2014 14:57:18 +0200 +Subject: [PATCH] Restore transparency + +The transparency settings were removed as a side effect of +2bff4b63ed3ceef6055e35563e9b0b33ad57349d + +This restores them and you will need a compositing window manager to +use it. The background image setting, also known as faux transparency, +was not restored. + +Also contains + +326c4f143511a3fae61aed1466568260a2ac1c4e Mon Sep 17 00:00:00 2001 +Lars Uebernickel +Wed, 28 May 2014 14:11:02 +0200 +[PATCH] window: Make the drawing robust across all themes + +There are lots of themes out there in the wild that do not specify a +background-color for all widgets and the default is transparent. This +is usually not a problem because GTK+ sets an opaque region on the +whole window and things without a background-color get drawn with the +theme's default background colour. However, to achieve transparency +we disable the opaque region by making the window app-paintable. This +can lead to transparent menubars or notebook tabs in some themes. We +can avoid this by ensuring that the window always renders a background. + +https://bugzilla.gnome.org/show_bug.cgi?id=730016 +--- + src/org.gnome.Terminal.gschema.xml | 14 +++++ + src/preferences.ui | 121 +++++++++++++++++++++++++++++++++++++ + src/profile-editor.c | 19 ++++++ + src/terminal-schemas.h | 4 ++ + src/terminal-screen.c | 42 ++++++++++++- + src/terminal-window.c | 28 +++++++++ + 6 files changed, 227 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index be00aa2..a7a2025 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -349,6 +349,20 @@ + 'narrow' + Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding + ++ ++ false ++ Whether to use a transparent background ++ ++ ++ true ++ Whether to use the value of TerminalScreen-background-darkness, ++ if available, from the theme for the transparency value. ++ ++ ++ 50 ++ Adjust the amount of transparency ++ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. ++ + + + +diff --git a/src/preferences.ui b/src/preferences.ui +index d1aca7b..c01f16b 100644 +--- a/src/preferences.ui ++++ b/src/preferences.ui +@@ -113,6 +113,11 @@ + + + ++ ++ 100 ++ 1 ++ 10 ++ + + + +@@ -1402,6 +1407,122 @@ + 1 + + ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Use t_ransparent background ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ False ++ horizontal ++ 6 ++ ++ ++ True ++ False ++ 0.5 ++ none ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ background-transparent-adjustment ++ False ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 0.5 ++ full ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 2 ++ ++ ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Use transparency from system theme ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ 3 ++ ++ + + + +diff --git a/src/profile-editor.c b/src/profile-editor.c +index 4098f90..0e333d1 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1431,6 +1431,25 @@ profile_prefs_load (const char *uuid, GSettings *profile) + profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, + "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0); ++ ++ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "use-transparent-background"), ++ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "background-transparent-scale-box"), ++ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, ++ gtk_builder_get_object (builder, "background-transparent-adjustment"), ++ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY, ++ gtk_builder_get_object (builder, "use-theme-transparency-checkbutton"), ++ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY, ++ gtk_builder_get_object (builder, "use-transparent-background-box"), ++ "sensitive", ++ G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_INVERT_BOOLEAN | ++ G_SETTINGS_BIND_NO_SENSITIVITY); + } + + /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index cffc4ed..2b6726b 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -76,6 +76,10 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" + #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" + ++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" ++#define TERMINAL_PROFILE_USE_THEME_TRANSPARENCY "use-theme-transparency" ++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" ++ + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" + #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 1dcda84..1280874 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -735,6 +735,11 @@ terminal_screen_class_init (TerminalScreenClass *klass) + + g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); + ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_float ("background-darkness", NULL, NULL, -1, 1, -1, ++ G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); ++ ++ + n_url_regexes = G_N_ELEMENTS (url_regex_patterns); + precompile_regexes (url_regex_patterns, n_url_regexes, &url_regexes, &url_regex_flavors); + n_extra_regexes = G_N_ELEMENTS (extra_regex_patterns); +@@ -1129,7 +1134,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || + prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || +- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) ++ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || ++ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || ++ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT) || ++ prop_name == I_(TERMINAL_PROFILE_USE_THEME_TRANSPARENCY)) + update_color_scheme (screen); + + if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) +@@ -1215,6 +1223,9 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; + GtkStyleContext *context; + gboolean use_theme_colors; ++ GtkWidget *toplevel; ++ gboolean transparent, theme_transparent; ++ gfloat style_darkness; + + context = gtk_widget_get_style_context (widget); + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg); +@@ -1257,6 +1268,31 @@ update_color_scheme (TerminalScreen *screen) + } + + colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); ++ theme_transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY); ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ ++ gtk_widget_style_get (GTK_WIDGET (screen), ++ "background-darkness", &style_darkness, ++ NULL); ++ ++ if (theme_transparent && style_darkness >= 0) ++ { ++ bg.alpha = style_darkness; ++ } ++ else if (transparent) ++ { ++ gint transparency_percent; ++ ++ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); ++ bg.alpha = (100 - transparency_percent) / 100.0; ++ } ++ else ++ bg.alpha = 1.0; ++ ++ /* If this gets out of range, let's not crash */ ++ if (bg.alpha < 0.0 || bg.alpha > 1.0) ++ bg.alpha = 1.0; ++ + vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, + colors, n_colors); + vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); +@@ -1264,6 +1300,10 @@ update_color_scheme (TerminalScreen *screen) + vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); + vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); + vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ gtk_widget_set_app_paintable (toplevel, transparent); + } + + static void +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 7a8953c..36d155a 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -1953,6 +1953,26 @@ terminal_window_realize (GtkWidget *widget) + terminal_window_update_size (window); + } + ++static gboolean ++terminal_window_draw (GtkWidget *widget, ++ cairo_t *cr) ++{ ++ if (gtk_widget_get_app_paintable (widget)) ++ { ++ GtkStyleContext *context; ++ int width; ++ int height; ++ ++ context = gtk_widget_get_style_context (widget); ++ width = gtk_widget_get_allocated_width (widget); ++ height = gtk_widget_get_allocated_height (widget); ++ gtk_render_background (context, cr, 0, 0, width, height); ++ gtk_render_frame (context, cr, 0, 0, width, height); ++ } ++ ++ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); ++} ++ + static gboolean + terminal_window_state_event (GtkWidget *widget, + GdkEventWindowState *event) +@@ -2094,6 +2114,8 @@ terminal_window_init (TerminalWindow *window) + }; + TerminalWindowPrivate *priv; + TerminalApp *app; ++ GdkScreen *screen; ++ GdkVisual *visual; + GSettings *gtk_debug_settings; + GtkWindowGroup *window_group; + // GtkAccelGroup *accel_group; +@@ -2109,6 +2131,11 @@ terminal_window_init (TerminalWindow *window) + + gtk_widget_init_template (GTK_WIDGET (window)); + ++ screen = gtk_widget_get_screen (GTK_WIDGET (window)); ++ visual = gdk_screen_get_rgba_visual (screen); ++ if (visual != NULL) ++ gtk_widget_set_visual (GTK_WIDGET (window), visual); ++ + uuid_generate (u); + uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); +@@ -2263,6 +2290,7 @@ terminal_window_class_init (TerminalWindowClass *klass) + + widget_class->show = terminal_window_show; + widget_class->realize = terminal_window_realize; ++ widget_class->draw = terminal_window_draw; + widget_class->window_state_event = terminal_window_state_event; + widget_class->screen_changed = terminal_window_screen_changed; + widget_class->style_updated = terminal_window_style_updated; diff -pruN 3.38.1-1/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch 3.38.1-1ubuntu1/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch --- 3.38.1-1/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,122 @@ +From: "Owen W. Taylor" +Date: Fri, 13 Nov 2015 15:16:42 +0100 +Subject: [PATCH] screen, + window: Extra padding around transparent terminals in Wayland + +https://bugzilla.redhat.com/show_bug.cgi?id=1207943 +--- + src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++--- + src/terminal-window.c | 18 ++++++++++++------ + 2 files changed, 49 insertions(+), 9 deletions(-) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 277e503..d3c0cf0 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -153,6 +153,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, + static gboolean terminal_screen_popup_menu (GtkWidget *widget); + static gboolean terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event); ++static void terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel); + static void terminal_screen_child_exited (VteTerminal *terminal, + int status); + +@@ -682,6 +684,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) + widget_class->drag_data_received = terminal_screen_drag_data_received; + widget_class->button_press_event = terminal_screen_button_press; + widget_class->popup_menu = terminal_screen_popup_menu; ++ widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; + + terminal_class->child_exited = terminal_screen_child_exited; + +@@ -1214,6 +1217,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, + g_object_thaw_notify (object); + } + ++static void ++update_toplevel_transparency (TerminalScreen *screen) ++{ ++ GtkWidget *widget = GTK_WIDGET (screen); ++ TerminalScreenPrivate *priv = screen->priv; ++ GSettings *profile = priv->profile; ++ GtkWidget *toplevel; ++ ++ toplevel = gtk_widget_get_toplevel (widget); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ { ++ gboolean transparent; ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (gtk_widget_get_app_paintable (toplevel) != transparent) ++ { ++ gtk_widget_set_app_paintable (toplevel, transparent); ++ ++ /* The opaque region of the toplevel isn't updated until the toplevel is allocated; ++ * set_app_paintable() doesn't force an allocation, so do that manually. ++ */ ++ gtk_widget_queue_resize (toplevel); ++ } ++ } ++} ++ + static void + update_color_scheme (TerminalScreen *screen) + { +@@ -1308,9 +1337,7 @@ update_color_scheme (TerminalScreen *screen) + vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); + vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); + +- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); +- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) +- gtk_widget_set_app_paintable (toplevel, transparent); ++ update_toplevel_transparency (screen); + } + + static void +@@ -1829,6 +1856,13 @@ terminal_screen_do_popup (TerminalScreen *screen, + terminal_screen_popup_info_unref (info); + } + ++static void ++terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel) ++{ ++ update_toplevel_transparency (TERMINAL_SCREEN (widget)); ++} ++ + static gboolean + terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event) +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 36d155a..c0219d8 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -1959,15 +1959,21 @@ terminal_window_draw (GtkWidget *widget, + { + if (gtk_widget_get_app_paintable (widget)) + { ++ GtkAllocation child_allocation; + GtkStyleContext *context; +- int width; +- int height; ++ GtkWidget *child; ++ ++ /* Get the *child* allocation, so we don't overwrite window borders */ ++ child = gtk_bin_get_child (GTK_BIN (widget)); ++ gtk_widget_get_allocation (child, &child_allocation); + + context = gtk_widget_get_style_context (widget); +- width = gtk_widget_get_allocated_width (widget); +- height = gtk_widget_get_allocated_height (widget); +- gtk_render_background (context, cr, 0, 0, width, height); +- gtk_render_frame (context, cr, 0, 0, width, height); ++ gtk_render_background (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); ++ gtk_render_frame (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); + } + + return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); diff -pruN 3.38.1-1/debian/patches/52_support_apturl.patch 3.38.1-1ubuntu1/debian/patches/52_support_apturl.patch --- 3.38.1-1/debian/patches/52_support_apturl.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/52_support_apturl.patch 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,21 @@ +From: Ubuntu Developers +Date: Sat, 20 Jan 2018 18:48:39 -0500 +Subject: _support_apturl + +=================================================================== +--- + src/terminal-regex.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/terminal-regex.h b/src/terminal-regex.h +index 143a8fa..4e8acb3 100644 +--- a/src/terminal-regex.h ++++ b/src/terminal-regex.h +@@ -157,6 +157,6 @@ + #define REGEX_URL_HTTP APOS_START_DEF "(? +Date: Sat, 20 Jan 2018 18:54:33 -0500 +Subject: add a handler for launchpad bug URLs. + +Forwarded: yes, https://bugzilla.gnome.org/show_bug.cgi?id=709087 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-terminal/+bug/1232589 +--- + src/terminal-regex.h | 1 + + src/terminal-screen.c | 1 + + src/terminal-screen.h | 1 + + src/terminal-util.c | 17 +++++++++++++++++ + src/terminal-util.h | 2 ++ + src/terminal-window.c | 13 ++++++++++++- + 6 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-regex.h b/src/terminal-regex.h +index 4e8acb3..5d90039 100644 +--- a/src/terminal-regex.h ++++ b/src/terminal-regex.h +@@ -158,5 +158,6 @@ + #define REGEX_URL_VOIP DEFS "(?i:h323:|sips?:)" USERPASS URL_HOST PORT VOIP_PATH + #define REGEX_EMAIL DEFS "(?i:mailto:)?" USER "@" EMAIL_HOST + #define REGEX_NEWS_MAN "(?i:news:|man:|info:|apt:)[-[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+" ++#define REGEX_LP "(?i:lp: #)[[:digit:]]+" + + #endif /* !TERMINAL_REGEX_H */ +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index d3c0cf0..ac9cc71 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -208,6 +208,7 @@ static const TerminalRegexPattern url_regex_patterns[] = { + { REGEX_URL_VOIP, FLAVOR_VOIP_CALL }, + { REGEX_EMAIL, FLAVOR_EMAIL }, + { REGEX_NEWS_MAN, FLAVOR_AS_IS }, ++ { REGEX_LP, FLAVOR_LP }, + }; + + static const TerminalRegexPattern extra_regex_patterns[] = { +diff --git a/src/terminal-screen.h b/src/terminal-screen.h +index 8ea3378..695aeeb 100644 +--- a/src/terminal-screen.h ++++ b/src/terminal-screen.h +@@ -32,6 +32,7 @@ typedef enum { + FLAVOR_VOIP_CALL, + FLAVOR_EMAIL, + FLAVOR_NUMBER, ++ FLAVOR_LP + } TerminalURLFlavor; + + /* Forward decls */ +diff --git a/src/terminal-util.c b/src/terminal-util.c +index 3155e3f..c746a20 100644 +--- a/src/terminal-util.c ++++ b/src/terminal-util.c +@@ -310,6 +310,9 @@ terminal_util_open_url (GtkWidget *parent, + case FLAVOR_AS_IS: + uri = g_strdup (orig_url); + break; ++ case FLAVOR_LP: ++ uri = terminal_util_get_lp_url (orig_url); ++ break; + default: + uri = NULL; + g_assert_not_reached (); +@@ -323,6 +326,20 @@ terminal_util_open_url (GtkWidget *parent, + } + } + ++char * ++terminal_util_get_lp_url (const char *orig_url) ++{ ++ char *uri; ++ const char *bugnum = orig_url; ++ ++ while (*bugnum && ! g_ascii_isdigit (*bugnum)) ++ bugnum++; ++ ++ uri = g_strdup_printf ("https://bugs.launchpad.net/bugs/%s", bugnum); ++ ++ return uri; ++} ++ + /** + * terminal_util_transform_uris_to_quoted_fuse_paths: + * @uris: +diff --git a/src/terminal-util.h b/src/terminal-util.h +index 0f3e6bf..ec09f4d 100644 +--- a/src/terminal-util.h ++++ b/src/terminal-util.h +@@ -44,6 +44,8 @@ void terminal_util_open_url (GtkWidget *parent, + TerminalURLFlavor flavor, + guint32 user_time); + ++char *terminal_util_get_lp_url (const char *orig_url); ++ + void terminal_util_transform_uris_to_quoted_fuse_paths (char **uris); + + char *terminal_util_concat_uris (char **uris, +diff --git a/src/terminal-window.c b/src/terminal-window.c +index c0219d8..3c19e3d 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -1019,7 +1019,17 @@ action_copy_match_cb (GSimpleAction *action, + if (info->url == NULL) + return; + +- gtk_clipboard_set_text (priv->clipboard, info->url, -1); ++ if (info->url_flavor == FLAVOR_LP) ++ { ++ char *uri; ++ uri = terminal_util_get_lp_url (info->url); ++ gtk_clipboard_set_text (priv->clipboard, uri, -1); ++ g_free (uri); ++ } ++ else ++ { ++ gtk_clipboard_set_text (priv->clipboard, info->url, -1); ++ } + } + + static void +@@ -1715,6 +1725,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen, + break; + case FLAVOR_AS_IS: + case FLAVOR_DEFAULT_TO_HTTP: ++ case FLAVOR_LP: + default: + open_label = _("_Open Link"); + copy_label = _("Copy _Link"); diff -pruN 3.38.1-1/debian/patches/scrollbar-background-theming.patch 3.38.1-1ubuntu1/debian/patches/scrollbar-background-theming.patch --- 3.38.1-1/debian/patches/scrollbar-background-theming.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/scrollbar-background-theming.patch 2020-11-06 14:51:10.000000000 +0000 @@ -0,0 +1,189 @@ +From: Marco Trevisan +Date: Sat, 20 Jan 2018 18:48:39 -0500 +Subject: draw proper background under the scrollbar + +Forwarded: yes, https://bugzilla.gnome.org/show_bug.cgi?id=754796 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-terminal/+bug/1493964 +--- + src/terminal-screen-container.c | 28 +++++++++++++++++++-- + src/terminal-screen.c | 54 +++++++++++++++++++++++++++++++++++++++++ + src/terminal-screen.h | 2 ++ + 3 files changed, 82 insertions(+), 2 deletions(-) + +diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c +index 459157b..d806bab 100644 +--- a/src/terminal-screen-container.c ++++ b/src/terminal-screen-container.c +@@ -121,9 +121,25 @@ terminal_screen_container_init (TerminalScreenContainer *container) + priv->vscrollbar_policy = GTK_POLICY_AUTOMATIC; + } + ++static gboolean ++scrollbar_bg_draw_cb (GtkWidget *widget, cairo_t *cr, TerminalScreenContainer *container) ++{ ++ TerminalScreenContainerPrivate *priv = container->priv; ++ GdkRGBA * bg = terminal_screen_get_bg_color (priv->screen); ++ ++ cairo_save (cr); ++ cairo_set_source_rgba (cr, bg->red, bg->green, bg->blue, bg->alpha); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_paint (cr); ++ cairo_restore (cr); ++ ++ return FALSE; ++} ++ + static void + terminal_screen_container_constructed (GObject *object) + { ++ GtkWidget *scrollbar; + TerminalScreenContainer *container = TERMINAL_SCREEN_CONTAINER (object); + TerminalScreenContainerPrivate *priv = container->priv; + +@@ -151,9 +167,12 @@ terminal_screen_container_constructed (GObject *object) + } + #else + priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++ priv->vscrollbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + +- priv->vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, +- gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); ++ scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, ++ gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); ++ ++ gtk_box_pack_start (GTK_BOX (priv->vscrollbar), scrollbar, TRUE, TRUE, 0); + + gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0); +@@ -163,6 +182,11 @@ terminal_screen_container_constructed (GObject *object) + #endif + + _terminal_screen_update_scrollbar (priv->screen); ++ ++ g_signal_connect (G_OBJECT (priv->vscrollbar), "draw", ++ G_CALLBACK (scrollbar_bg_draw_cb), container); ++ g_signal_connect_swapped (priv->screen, "notify::bg-color", ++ G_CALLBACK (gtk_widget_queue_draw), priv->vscrollbar); + } + + static void +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index ac9cc71..49fb6c3 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -107,6 +107,8 @@ struct _TerminalScreenPrivate + gboolean exec_on_realize; + guint idle_exec_source; + ExecData *exec_data; ++ GdkRGBA bg_color; ++ GdkRGBA fg_color; + }; + + enum +@@ -122,6 +124,8 @@ enum { + PROP_0, + PROP_PROFILE, + PROP_TITLE, ++ PROP_BG_COLOR, ++ PROP_FG_COLOR + }; + + enum +@@ -639,6 +643,12 @@ terminal_screen_get_property (GObject *object, + case PROP_TITLE: + g_value_set_string (value, terminal_screen_get_title (screen)); + break; ++ case PROP_BG_COLOR: ++ g_value_set_boxed (value, terminal_screen_get_bg_color (screen)); ++ break; ++ case PROP_FG_COLOR: ++ g_value_set_boxed (value, terminal_screen_get_bg_color (screen)); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -659,6 +669,8 @@ terminal_screen_set_property (GObject *object, + terminal_screen_set_profile (screen, g_value_get_object (value)); + break; + case PROP_TITLE: ++ case PROP_FG_COLOR: ++ case PROP_BG_COLOR: + /* not writable */ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -744,6 +756,20 @@ terminal_screen_class_init (TerminalScreenClass *klass) + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + ++ g_object_class_install_property ++ (object_class, ++ PROP_BG_COLOR, ++ g_param_spec_boxed ("bg-color", NULL, NULL, ++ GDK_TYPE_RGBA, ++ G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); ++ ++ g_object_class_install_property ++ (object_class, ++ PROP_FG_COLOR, ++ g_param_spec_boxed ("fg-color", NULL, NULL, ++ GDK_TYPE_RGBA, ++ G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); ++ + g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); + + gtk_widget_class_install_style_property (widget_class, +@@ -1086,6 +1112,22 @@ terminal_screen_get_title (TerminalScreen *screen) + return vte_terminal_get_window_title (VTE_TERMINAL (screen)); + } + ++GdkRGBA* ++terminal_screen_get_bg_color (TerminalScreen *screen) ++{ ++ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); ++ ++ return &screen->priv->bg_color; ++} ++ ++GdkRGBA* ++terminal_screen_get_fg_color (TerminalScreen *screen) ++{ ++ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); ++ ++ return &screen->priv->fg_color; ++} ++ + static void + terminal_screen_profile_changed_cb (GSettings *profile, + const char *prop_name, +@@ -1338,6 +1380,18 @@ update_color_scheme (TerminalScreen *screen) + vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); + vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); + ++ if (gdk_rgba_hash (&priv->bg_color) != gdk_rgba_hash (&bg)) ++ { ++ priv->bg_color = bg; ++ g_object_notify (G_OBJECT (screen), "bg-color"); ++ } ++ ++ if (gdk_rgba_hash (&priv->fg_color) != gdk_rgba_hash (&fg)) ++ { ++ priv->fg_color = fg; ++ g_object_notify (G_OBJECT (screen), "fg-color"); ++ } ++ + update_toplevel_transparency (screen); + } + +diff --git a/src/terminal-screen.h b/src/terminal-screen.h +index 695aeeb..bda8b7c 100644 +--- a/src/terminal-screen.h ++++ b/src/terminal-screen.h +@@ -115,6 +115,8 @@ GSettings* terminal_screen_get_profile (TerminalScreen *screen); + GSettings* terminal_screen_ref_profile (TerminalScreen *screen); + + const char* terminal_screen_get_title (TerminalScreen *screen); ++GdkRGBA* terminal_screen_get_bg_color (TerminalScreen *screen); ++GdkRGBA* terminal_screen_get_fg_color (TerminalScreen *screen); + + char *terminal_screen_get_current_dir (TerminalScreen *screen); + diff -pruN 3.38.1-1/debian/patches/series 3.38.1-1ubuntu1/debian/patches/series --- 3.38.1-1/debian/patches/series 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/patches/series 2020-11-06 14:51:10.000000000 +0000 @@ -1,2 +1,8 @@ 01_onlyshowin.patch Provide-fallback-for-reading-current-directory-if-OS.patch +0001-Restore-transparency.patch +0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch +0001-screen-window-Extra-padding-around-transparent-termi.patch +52_support_apturl.patch +60_add_lp_handler.patch +scrollbar-background-theming.patch diff -pruN 3.38.1-1/debian/rules 3.38.1-1ubuntu1/debian/rules --- 3.38.1-1/debian/rules 2020-11-02 10:26:35.000000000 +0000 +++ 3.38.1-1ubuntu1/debian/rules 2020-11-06 14:51:10.000000000 +0000 @@ -13,6 +13,10 @@ override_dh_install: find debian/tmp -name '*.a' -print -delete find debian/tmp -name '*.la' -print -delete dh_install + mv $(CURDIR)/debian/gnome-terminal/usr/bin/gnome-terminal \ + $(CURDIR)/debian/gnome-terminal/usr/bin/gnome-terminal.real + install -m0755 $(CURDIR)/debian/gnome-terminal.wrap \ + $(CURDIR)/debian/gnome-terminal/usr/bin/gnome-terminal override_dh_missing: dh_missing --fail-missing