summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Weber2020-03-29 15:35:04 +0200
committerPeter Weber2020-03-29 15:35:04 +0200
commit1be87d4f2a2c402f7208f72937da2b69ccb4c285 (patch)
tree6ba111129a2a2201656438f01f816482fc393204
parenta2fc7b69075a3032c284bea01a42ecbb68afaa00 (diff)
downloadaur-1be87d4f2a2c402f7208f72937da2b69ccb4c285.tar.gz
upstream update, will readd uk.po later
-rw-r--r--.SRCINFO16
-rw-r--r--0001-screen-Fix-non-preserved-working-dir.patch47
-rw-r--r--PKGBUILD14
-rw-r--r--package.changelog6
-rw-r--r--transparency.patch50
5 files changed, 18 insertions, 115 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38227044c0b..5f2dc8c680e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnome-terminal-transparency
pkgdesc = The GNOME Terminal Emulator, with background transparency
- pkgver = 3.36.0.1
- pkgrel = 2
+ pkgver = 3.36.1.1
+ pkgrel = 1
url = https://wiki.gnome.org/Apps/Terminal
changelog = package.changelog
arch = x86_64
@@ -14,16 +14,14 @@ pkgbase = gnome-terminal-transparency
makedepends = gnome-shell
makedepends = vala
makedepends = yelp-tools
- depends = vte3>=0.60.0
+ depends = vte3>=0.60.1
depends = gsettings-desktop-schemas
- provides = gnome-terminal=3.36.0.1
+ provides = gnome-terminal=3.36.1.1
conflicts = gnome-terminal
- source = https://download.gnome.org/sources/gnome-terminal/3.36/gnome-terminal-3.36.0.1.tar.xz
- source = 0001-screen-Fix-non-preserved-working-dir.patch
+ source = https://download.gnome.org/sources/gnome-terminal/3.36/gnome-terminal-3.36.1.1.tar.xz
source = transparency.patch
- sha256sums = 8b31c1ce622031b860aef6dd9295e1cac89edcc58c27b925543c9a17dffb40e2
- sha256sums = 32f26314ba3b33c95acb41510fa9e4f46d00bb575d3a32cc765b65303c30734a
- sha256sums = af3348189059ba9df0e2a59aa9ab38c14571ced3602b017c2f9aacd13a6572ea
+ sha256sums = f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376
+ sha256sums = 1e17f16d269e045ddaf3c88624d4ba0472403be2681012e4c1bafc25a1b0167c
pkgname = gnome-terminal-transparency
diff --git a/0001-screen-Fix-non-preserved-working-dir.patch b/0001-screen-Fix-non-preserved-working-dir.patch
deleted file mode 100644
index 722257d24fc..00000000000
--- a/0001-screen-Fix-non-preserved-working-dir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0a68500b46668e4b9c027b630d0ba2ccb7bed555 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 10 Mar 2020 21:02:19 +0000
-Subject: [PATCH] screen: Fix non-preserved working dir
-
-If `preserve_cwd` is false, the code would leave `data->cwd` unset. This
-resulted in VTE keeping the current pwd, which in the case of
-`gnome-terminal-server` running as a systemd user service is `/`.
-
-Fixes https://gitlab.gnome.org/GNOME/gnome-terminal/issues/228
----
- src/terminal-screen.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index dc9f8447..6541c0a5 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -963,23 +963,22 @@ terminal_screen_exec (TerminalScreen *screen,
- return FALSE;
- }
-
-- if (preserve_cwd) {
-- data->cwd = g_strdup (cwd);
-- } else {
-+ if (!preserve_cwd) {
- cwd = g_get_home_dir ();
- envv = g_environ_unsetenv (envv, "PWD");
- }
-
- if (fd_list) {
- const int *fds;
-
- fds = g_unix_fd_list_peek_fds (fd_list, &data->fd_list_len);
- data->fd_list = g_memdup (fds, (data->fd_list_len + 1) * sizeof (int));
- data->fd_array = g_variant_get_fixed_array (fd_array, &data->fd_array_len, 2 * sizeof (int));
- }
-
- data->argv = g_strdupv (argv);
- data->exec_argv = g_strdupv (exec_argv);
-+ data->cwd = g_strdup (cwd);
- data->envv = g_strdupv (envv);
- data->as_shell = as_shell;
- data->pty_flags = VTE_PTY_DEFAULT;
---
-2.25.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 0ae86e4ff08..6ccd4d77691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,13 @@
pkgname=gnome-terminal-transparency
_pkgname=gnome-terminal
-pkgver=3.36.0.1
-pkgrel=2
+pkgver=3.36.1.1
+pkgrel=1
pkgdesc="The GNOME Terminal Emulator, with background transparency"
url="https://wiki.gnome.org/Apps/Terminal"
arch=(x86_64)
license=(GPL)
-depends=('vte3>=0.60.0' gsettings-desktop-schemas)
+depends=('vte3>=0.60.1' gsettings-desktop-schemas)
makedepends=(itstool docbook-xsl libnautilus-extension appstream-glib
gnome-shell vala yelp-tools)
provides=("$_pkgname=$pkgver")
@@ -23,16 +23,12 @@ conflicts=("$_pkgname")
groups=(gnome)
changelog=package.changelog
source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
- 0001-screen-Fix-non-preserved-working-dir.patch
transparency.patch)
-sha256sums=('8b31c1ce622031b860aef6dd9295e1cac89edcc58c27b925543c9a17dffb40e2'
- '32f26314ba3b33c95acb41510fa9e4f46d00bb575d3a32cc765b65303c30734a'
- 'af3348189059ba9df0e2a59aa9ab38c14571ced3602b017c2f9aacd13a6572ea')
+sha256sums=('f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376'
+ '1e17f16d269e045ddaf3c88624d4ba0472403be2681012e4c1bafc25a1b0167c')
prepare() {
cd $_pkgname-$pkgver
- # https://bugs.archlinux.org/task/65774
- patch -Np1 -i ../0001-screen-Fix-non-preserved-working-dir.patch
patch -Np1 -i ../transparency.patch
# autogen.sh not in tarball
autoreconf -fiv
diff --git a/package.changelog b/package.changelog
index f82dc14913f..90d3d5ea437 100644
--- a/package.changelog
+++ b/package.changelog
@@ -1,3 +1,9 @@
+2020-03-29
+ upstream update: 3.36.0.1 -> 3.36.1.1
+ requires vte3 >= 0.60.1
+ dropped patch "fix non-preserved working dir"
+ dropped changes for "uk.po", will readd it later again
+
2020-03-24
upstream upgrade: 3.34.2 -> 3.36.0.1
requires vte3 >= 0.60.0
diff --git a/transparency.patch b/transparency.patch
index bda9e2a865b..a139fb8e83b 100644
--- a/transparency.patch
+++ b/transparency.patch
@@ -523,7 +523,6 @@ Subject: [PATCH 11/16] Restore translations for setting a title and
po/th.po | 20 ++++++++++----------
po/tr.po | 12 ++++++++++++
po/ug.po | 4 ++--
- po/uk.po | 19 +++++++++++--------
po/vi.po | 15 +++++++++------
po/wa.po | 12 ++++++------
po/xh.po | 12 ++++++------
@@ -2925,55 +2924,6 @@ index 313f76b98eae..be6089762082 100644
#~ msgid ""
#~ "You already have a profile called “%s”. Do you want to create another "
-diff --git a/po/uk.po b/po/uk.po
-index eac987c92a7a..10ad3394f4ec 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -2647,11 +2647,11 @@ msgstr "Закр_ити вікно"
- #~ msgid "Default size:"
- #~ msgstr "Типовий розмір:"
-
--#~ msgid "Title"
--#~ msgstr "Заголовок"
-+msgid "Title"
-+msgstr "Заголовок"
-
--#~ msgid "_Title:"
--#~ msgstr "За_головок:"
-+msgid "_Title:"
-+msgstr "За_головок:"
-
- #~ msgid "Title and Command"
- #~ msgstr "Заголовок та команда"
-@@ -2659,12 +2659,15 @@ msgstr "Закр_ити вікно"
- #~ msgid "_Unlimited"
- #~ msgstr "_Нескінченно"
-
--#~ msgid "Set Title"
--#~ msgstr "Встановлення заголовка"
-+msgid "Set Title"
-+msgstr "Встановлення заголовка"
-
- #~ msgid "Current Locale"
- #~ msgstr "Теперішня локаль"
-
-+msgid "_Set Title…"
-+msgstr "_Встановити заголовок…"
-+
- #~ msgid "What to do with dynamic title"
- #~ msgstr "Що робити з динамічним заголовком"
-
-@@ -3398,8 +3401,8 @@ msgstr "Закр_ити вікно"
- #~ msgid "_Solid color"
- #~ msgstr "_Суцільний колір"
-
--#~ msgid "_Transparent background"
--#~ msgstr "П_розоре тло"
-+msgid "Transparent background"
-+msgstr "Прозоре тло"
-
- #~ msgid "Switch to Tab 3"
- #~ msgstr "До вкладки 3"
diff --git a/po/vi.po b/po/vi.po
index d5f27612f4be..8bb576b6d875 100644
--- a/po/vi.po