Codebase list gnome-terminal / 93ef3b0
Merge branch 'debian' into kali/master Sophie Brun 2 years ago
4 changed file(s) with 53 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
+6
-0
debian/changelog less more
0 gnome-terminal (3.42.2-2) unstable; urgency=medium
1
2 * Cherry-pick patch to fix build with latest meson
3
4 -- Jeremy Bicha <[email protected]> Thu, 03 Feb 2022 12:58:48 -0500
5
06 gnome-terminal (3.42.2-1+kali1) kali-dev; urgency=medium
17
28 * Sync with Debian
+2
-2
debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch less more
88 1 file changed, 66 insertions(+)
99
1010 diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
11 index 5feb8f7..618abf2 100644
11 index e2e7d2b..ef9da23 100644
1212 --- a/src/terminal-screen.cc
1313 +++ b/src/terminal-screen.cc
1414 @@ -354,6 +354,63 @@ terminal_screen_clear_exec_data (TerminalScreen *screen,
7575 static void
7676 free_tag_data (TagData *tagdata)
7777 {
78 @@ -1854,12 +1911,21 @@ terminal_screen_button_press (GtkWidget *widget,
78 @@ -1834,12 +1891,21 @@ terminal_screen_button_press (GtkWidget *widget,
7979 char *
8080 terminal_screen_get_current_dir (TerminalScreen *screen)
8181 {
+44
-0
debian/patches/build-Fix-for-newer-meson.patch less more
0 From: Christian Persch <[email protected]>
1 Date: Fri, 14 Jan 2022 11:33:32 +0100
2 Subject: build: Fix for newer meson
3
4 (cherry picked from commit 9a168cc23962ce9fa106dc8a40407d381a3db403)
5 ---
6 data/meson.build | 5 +----
7 1 file changed, 1 insertion(+), 4 deletions(-)
8
9 diff --git a/data/meson.build b/data/meson.build
10 index 79d97e5..e0bcbb9 100644
11 --- a/data/meson.build
12 +++ b/data/meson.build
13 @@ -18,7 +18,6 @@
14 metainfodir = gt_datadir / 'metainfo'
15
16 i18n.merge_file(
17 - gt_dns_name + '.metainfo.xml',
18 input: gt_dns_name + '.metainfo.xml.in',
19 output: '@BASENAME@',
20 po_dir: po_dir,
21 @@ -27,7 +26,6 @@ i18n.merge_file(
22 )
23
24 i18n.merge_file(
25 - gt_dns_name + '.Nautilus.metainfo.xml',
26 input: gt_dns_name + '.Nautilus.metainfo.xml.in',
27 output: '@BASENAME@',
28 po_dir: po_dir,
29 @@ -40,7 +38,6 @@ i18n.merge_file(
30 desktopdatadir = gt_datadir / 'applications'
31
32 i18n.merge_file(
33 - gt_dns_name + '.desktop',
34 input: gt_dns_name + '.desktop.in',
35 output: '@BASENAME@',
36 type: 'desktop',
37 @@ -57,4 +54,4 @@ meson.add_install_script(
38
39 # Subdirs
40
41 -subdir('icons')
42 \ No newline at end of file
43 +subdir('icons')
+1
-0
debian/patches/series less more
11 restore-transparency-po.patch
22 01_onlyshowin.patch
33 Provide-fallback-for-reading-current-directory-if-OS.patch
4 build-Fix-for-newer-meson.patch