diff --git a/9a168cc23962ce9fa106dc8a40407d381a3db403.patch b/9a168cc23962ce9fa106dc8a40407d381a3db403.patch deleted file mode 100644 index 8f0e21f..0000000 --- a/9a168cc23962ce9fa106dc8a40407d381a3db403.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 -From: Christian Persch -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/_service b/_service new file mode 100644 index 0000000..005bac1 --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + + https://gitlab.gnome.org/GNOME/gnome-terminal.git + git + @PARENT_TAG@ + enable + refs/tags/3.43.90 + + + + *.tar + xz + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..6723c98 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/gnome-terminal.git + d533f7704815e079ba667799dba9f4104f2775df \ No newline at end of file diff --git a/gnome-terminal-3.42.2.tar.xz b/gnome-terminal-3.42.2.tar.xz deleted file mode 100644 index cc6eb04..0000000 --- a/gnome-terminal-3.42.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 -size 1806388 diff --git a/gnome-terminal-3.43.90.obscpio b/gnome-terminal-3.43.90.obscpio new file mode 100644 index 0000000..a0bf4ee --- /dev/null +++ b/gnome-terminal-3.43.90.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d6790fa08f824436d8a59c4243f15b9b68d991d725c93e3b2eadbe9345e9c8a +size 13547533 diff --git a/gnome-terminal.changes b/gnome-terminal.changes index c1a0253..2d4cb7a 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,9 +1,36 @@ +------------------------------------------------------------------- +Sat Feb 12 19:15:20 UTC 2022 - bjorn.lie@gmail.com + +- Update to version 3.43.90: + * Revert "screen: Use clean env when creating new tab" + * nautilus: + - Work around gtk_get_current_event_time() absence on gtk4 + - Undef gtk min/max version defines + * regex: Fix path-less URL recognition + * Revert "regex: Workaround a PCRE bug resulting in not + recognizing schemeless URLs" + * build: Fix for newer meson + * Updated translations. +- Switch to using source service checkout of released tag, upstream + is not making News/Changelog/Release Notes available, so doing it + this way is simpler. +- Drop 9a168cc23962ce9fa106dc8a40407d381a3db403.patch: Fixed + upstream. +- Switch bcond_with to bcond_without for nautilus_extension, + nautilus was reverted to gtk3 again for this release cycle. + ------------------------------------------------------------------- Wed Feb 2 07:16:22 UTC 2022 - Bjørn Lie - Add 9a168cc23962ce9fa106dc8a40407d381a3db403.patch: Fix build with meson 0.61.0 and newer. +------------------------------------------------------------------- +Wed Jan 12 14:41:17 UTC 2022 - Dominique Leuenberger + +- Temporarily disable nautilus extension: not yet compatible to + Nautilus/GTK4. + ------------------------------------------------------------------- Sat Dec 4 17:36:20 UTC 2021 - Bjørn Lie diff --git a/gnome-terminal.obsinfo b/gnome-terminal.obsinfo new file mode 100644 index 0000000..c02a60c --- /dev/null +++ b/gnome-terminal.obsinfo @@ -0,0 +1,4 @@ +name: gnome-terminal +version: 3.43.90 +mtime: 1644691524 +commit: d533f7704815e079ba667799dba9f4104f2775df diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 0734c65..0c0b1fe 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -16,16 +16,15 @@ # +%bcond_without nautilus_extension Name: gnome-terminal -Version: 3.42.2 +Version: 3.43.90 Release: 0 Summary: GNOME Terminal License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: System/X11/Terminals URL: https://wiki.gnome.org/Apps/Terminal -Source0: https://download.gnome.org/sources/gnome-terminal/3.42/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 9a168cc23962ce9fa106dc8a40407d381a3db403.patch -- Fix build with meson 0.61.0 and newer -Patch0: https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/9a168cc23962ce9fa106dc8a40407d381a3db403.patch +Source0: %{name}-%{version}.tar.xz BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -44,7 +43,9 @@ BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 0.1.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 +%if %{with nautilus_extension} BuildRequires: pkgconfig(libnautilus-extension) >= 3.28.0 +%endif BuildRequires: pkgconfig(libpcre2-8) >= 10.00 BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vte-2.91) >= 0.66.0 @@ -82,18 +83,25 @@ arbitrary folders. %autosetup -p1 %build -%meson +%meson \ +%if %{with nautilus_extension} + -Dnautilus_extension=true +%else + -Dnautilus_extension=false +%endif %meson_build %install %meson_install +%if ! %{with nautilus_extension} +rm %{buildroot}/usr/share/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml +%endif %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} %files %license COPYING -%doc AUTHORS ChangeLog %doc %{_datadir}/help/C/%{name}/ %{_bindir}/gnome-terminal %{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml @@ -112,9 +120,11 @@ arbitrary folders. %dir %{_datadir}/gnome-shell/search-providers %{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini +%if %{with nautilus_extension} %files -n nautilus-extension-terminal %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml +%endif %files lang -f %{name}.lang