diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | build_fix_for_newer_meson.patch | 47 | ||||
| -rw-r--r-- | package.changelog | 4 | ||||
| -rw-r--r-- | transparency.patch | 2 |
5 files changed, 65 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = gnome-terminal-transparency pkgdesc = The GNOME Terminal Emulator with background transparency - pkgver = 3.42.1 + pkgver = 3.42.2 pkgrel = 1 url = https://wiki.gnome.org/Apps/Terminal changelog = package.changelog @@ -14,11 +14,13 @@ pkgbase = gnome-terminal-transparency makedepends = meson depends = vte3>=0.66.0 depends = gsettings-desktop-schemas - provides = gnome-terminal=3.42.1 + provides = gnome-terminal=3.42.2 conflicts = gnome-terminal - source = https://download.gnome.org/sources/gnome-terminal/3.42/gnome-terminal-3.42.1.tar.xz + source = https://download.gnome.org/sources/gnome-terminal/3.42/gnome-terminal-3.42.2.tar.xz source = transparency.patch - sha256sums = c319b1405501b8c7693e616f48eced41695d2e786148ca5f9e27bc7d98f4aeb1 - sha256sums = 8e7c72f0bad30d4a2ba98acd14aad956731ca0bc3521029fc2e1858a28ee108d + source = build_fix_for_newer_meson.patch + sha256sums = 8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 + sha256sums = 54dd17bdfacee0b7da5ddb2628eae3d5d2bb931ed5666faa7af8fd6cba1c5ea1 + sha256sums = 47ef721df168ba3e7e451df0669b01bec2ce3d553d4e59dcfb10462215470ba2 pkgname = gnome-terminal-transparency @@ -9,7 +9,7 @@ pkgname=gnome-terminal-transparency _pkgname=gnome-terminal -pkgver=3.42.1 +pkgver=3.42.2 pkgrel=1 pkgdesc="The GNOME Terminal Emulator with background transparency" url="https://wiki.gnome.org/Apps/Terminal" @@ -22,13 +22,16 @@ conflicts=("$_pkgname") groups=(gnome) changelog=package.changelog source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz - transparency.patch) -sha256sums=('c319b1405501b8c7693e616f48eced41695d2e786148ca5f9e27bc7d98f4aeb1' - '8e7c72f0bad30d4a2ba98acd14aad956731ca0bc3521029fc2e1858a28ee108d') + transparency.patch + build_fix_for_newer_meson.patch) +sha256sums=('8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0' + '54dd17bdfacee0b7da5ddb2628eae3d5d2bb931ed5666faa7af8fd6cba1c5ea1' + '47ef721df168ba3e7e451df0669b01bec2ce3d553d4e59dcfb10462215470ba2') prepare() { cd $_pkgname-$pkgver patch -Np1 -i ../transparency.patch + patch -Np1 -i ../build_fix_for_newer_meson.patch } build() { diff --git a/build_fix_for_newer_meson.patch b/build_fix_for_newer_meson.patch new file mode 100644 index 000000000000..8b6edbb923a2 --- /dev/null +++ b/build_fix_for_newer_meson.patch @@ -0,0 +1,47 @@ +From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe@src.gnome.org> +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5b..e0bcbb91 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons') +-- +GitLab + diff --git a/package.changelog b/package.changelog index 99082492e560..7373f20d8019 100644 --- a/package.changelog +++ b/package.changelog @@ -1,3 +1,7 @@ +2022-01-23 + upstream update: 3.42.1 -> 3.42.2 + build fix for meson + 2021-11-12 upstream update: 3.40.3 -> 3.42.1 migration from autotools to meson diff --git a/transparency.patch b/transparency.patch index c21b0098ece8..6d4c19ae2c6c 100644 --- a/transparency.patch +++ b/transparency.patch @@ -433,7 +433,6 @@ index 5019a3ac..5513eedc 100644 -- 2.33.1 - From d0534fad64788e6f70389b8fa815d277a00ae51a Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir@gnome.org> Date: Tue, 17 Feb 2015 17:06:17 +0100 @@ -3171,4 +3170,3 @@ index 80cb2343..20e2a93c 100644 +msgstr "透明背景" -- 2.33.1 - |