diff options
| author | Jason Edson | 2022-01-18 07:33:38 -0800 |
|---|---|---|
| committer | Jason Edson | 2022-01-18 07:38:10 -0800 |
| commit | 5c2aff05f6b87869bfb46563c7b2b7bfe0d7e9cf (patch) | |
| tree | 273ae890572f7592990db217010bbc97267c7030 | |
| parent | c90c16c28f9a0452e4a2c5cb779d6c9bd37b9032 (diff) | |
| download | aur-5c2aff05f6b87869bfb46563c7b2b7bfe0d7e9cf.tar.gz | |
Temporarily add local patch to fix build
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-Fix-build-with-latest-meson.patch | 47 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
3 files changed, 57 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = gnome-terminal-fedora pkgdesc = The GNOME Terminal Emulator with Fedora patches pkgver = 3.42.2 - pkgrel = 1 + pkgrel = 2 url = https://wiki.gnome.org/Apps/Terminal arch = i686 arch = x86_64 @@ -23,8 +23,10 @@ pkgbase = gnome-terminal-fedora source = https://download.gnome.org/sources/gnome-terminal/3.42/gnome-terminal-3.42.2.tar.xz source = gnome-terminal-cntr-ntfy-autottl-ts.patch-6ce4c343f37e66397e42a4c1bfded7e083fd1bea::https://src.fedoraproject.org/rpms/gnome-terminal/raw/6ce4c343f37e66397e42a4c1bfded7e083fd1bea/f/gnome-terminal-cntr-ntfy-autottl-ts.patch source = org.gnome.Terminal.gschema.override-6ce4c343f37e66397e42a4c1bfded7e083fd1bea::https://src.fedoraproject.org/rpms/gnome-terminal/raw/6ce4c343f37e66397e42a4c1bfded7e083fd1bea/f/org.gnome.Terminal.gschema.override + source = 0001-Fix-build-with-latest-meson.patch sha256sums = 8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 sha256sums = 0b6adf6f8ec31c88044c349fe0e6d10a3cfce96896fd8a655a547fd55ca33838 sha256sums = a4a22834d6524fb697a8edf91c9489617d5ab2e513413fc84c6b8575320938f9 + sha256sums = f67d28346b2ea612a1633c40e2b120f6bebf20d68202330ab6446d4d9d71c94f pkgname = gnome-terminal-fedora diff --git a/0001-Fix-build-with-latest-meson.patch b/0001-Fix-build-with-latest-meson.patch new file mode 100644 index 000000000000..9da3bb57985b --- /dev/null +++ b/0001-Fix-build-with-latest-meson.patch @@ -0,0 +1,47 @@ +From 62a7229941fc2a52deb5d11d913cdb70a4d8834f Mon Sep 17 00:00:00 2001 +From: Jason Edson <jaysonedson@gmail.com> +Date: Fri, 14 Jan 2022 10:20:46 -0800 +Subject: [PATCH] Fix build with latest meson + +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5..e0bcbb9 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') +-- +2.34.1 + @@ -7,7 +7,7 @@ _pkgname='gnome-terminal' pkgname="${_pkgname}-fedora" pkgver=3.42.2 -pkgrel=1 +pkgrel=2 pkgdesc='The GNOME Terminal Emulator with Fedora patches' url='https://wiki.gnome.org/Apps/Terminal' license=('GPL') @@ -38,16 +38,21 @@ _fgsoverridefile='org.gnome.Terminal.gschema.override' source=("https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/${_pkgname}-${pkgver}.tar.xz" "${_fpatchfile100}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile100}" "${_fgsoverridefile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fgsoverridefile}" + "0001-Fix-build-with-latest-meson.patch" ) sha256sums=('8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0' '0b6adf6f8ec31c88044c349fe0e6d10a3cfce96896fd8a655a547fd55ca33838' - 'a4a22834d6524fb697a8edf91c9489617d5ab2e513413fc84c6b8575320938f9') + 'a4a22834d6524fb697a8edf91c9489617d5ab2e513413fc84c6b8575320938f9' + 'f67d28346b2ea612a1633c40e2b120f6bebf20d68202330ab6446d4d9d71c94f') prepare () { cd "${_pkgname}-${pkgver}" # Apply patches patch -p1 -i "../${_fpatchfile100}-${_fcommit}" + + # Apply meson patch until fixed upstream + patch -p1 -i "../0001-Fix-build-with-latest-meson.patch" } build() { |