- updated to 3.42.0; uses meson now
authorJakub Bogusz <qboosh@pld-linux.org>
Mon, 27 Sep 2021 19:39:35 +0000 (21:39 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Mon, 27 Sep 2021 19:39:35 +0000 (21:39 +0200)
- updated transparency patch

gnome-terminal-transparency.patch
gnome-terminal.spec

index be595e987731a857d4eb83ce88e75af15cb165fe..42fcf969b56685b9c1fa652220456690e2a951e2 100644 (file)
@@ -110,35 +110,33 @@ index 6259aac0f02f..f5c366f14e10 100644
                                        </object>
                                      </child>
                                    </object>
-diff --git a/src/profile-editor.c b/src/profile-editor.c
-index eaad9182fed2..e03e35fc1bea 100644
---- gnome-terminal-3.38.0/src/profile-editor.c.orig    2020-09-20 11:56:27.749274156 +0200
-+++ gnome-terminal-3.38.0/src/profile-editor.c 2020-09-20 11:59:49.354848632 +0200
-@@ -1427,6 +1427,22 @@
-                                "active-id",
-                                G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+--- gnome-terminal-3.42.0/src/profile-editor.cc.orig   2021-09-22 18:38:05.775667700 +0200
++++ gnome-terminal-3.42.0/src/profile-editor.cc        2021-09-27 21:23:43.302820304 +0200
+@@ -1486,6 +1486,22 @@ profile_prefs_load (const char *uuid, GS
+                                GSettingsBindFlags(G_SETTINGS_BIND_GET |
+                                                 G_SETTINGS_BIND_SET));
  
 +  profile_prefs_settings_bind (profile,
 +                               TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
 +                               gtk_builder_get_object (builder, "use-transparent-background"),
 +                               "active",
-+                               G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++                               GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET));
 +  profile_prefs_settings_bind (profile,
 +                               TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
 +                               gtk_builder_get_object (builder, "background-transparent-scale"),
 +                               "sensitive",
-+                               G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
++                               GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY));
 +  profile_prefs_settings_bind (profile,
 +                               TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
 +                               gtk_builder_get_object (builder, "background-transparent-adjustment"),
 +                               "value",
-+                               G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++                               GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET));
 +
    w = (GtkWidget *) gtk_builder_get_object (builder, "enable-sixel-checkbutton");
    profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w,
-                                "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
---- gnome-terminal-3.40.0/src/terminal-schemas.h.orig  2021-04-17 08:51:31.266561277 +0200
-+++ gnome-terminal-3.40.0/src/terminal-schemas.h       2021-04-17 09:04:42.797545957 +0200
+                                "active",
+--- gnome-terminal-3.42.0/src/terminal-schemas.hh.orig 2021-04-17 08:51:31.266561277 +0200
++++ gnome-terminal-3.42.0/src/terminal-schemas.hh      2021-04-17 09:04:42.797545957 +0200
 @@ -76,6 +76,9 @@ G_BEGIN_DECLS
  #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
  #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
@@ -149,10 +147,8 @@ index eaad9182fed2..e03e35fc1bea 100644
  #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
  #define TERMINAL_SETTING_CONTEXT_INFO_KEY               "context-info"
  #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index a85fcefd40e1..26202e4555ea 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
+--- a/src/terminal-screen.cc
++++ b/src/terminal-screen.cc
 @@ -800,7 +800,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) ||
        prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) ||
@@ -203,10 +199,8 @@ index a85fcefd40e1..26202e4555ea 100644
  }
  
  static void
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 4ed3647498b2..8fc70ce74252 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
+--- a/src/terminal-window.cc
++++ b/src/terminal-window.cc
 @@ -2088,6 +2088,8 @@ terminal_window_init (TerminalWindow *window)
    };
    TerminalWindowPrivate *priv;
@@ -251,10 +245,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016
  src/terminal-window.c | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
 
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 8fc70ce74252..1707ada83ce8 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
+--- a/src/terminal-window.cc
++++ b/src/terminal-window.cc
 @@ -1944,6 +1944,26 @@ terminal_window_realize (GtkWidget *widget)
    terminal_window_update_size (window);
  }
@@ -306,10 +298,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
  src/terminal-window.c | 18 ++++++++++++------
  2 files changed, 49 insertions(+), 9 deletions(-)
 
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 26202e4555ea..c0ce8a89126c 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
+--- a/src/terminal-screen.cc
++++ b/src/terminal-screen.cc
 @@ -155,6 +155,8 @@ static void terminal_screen_system_font_
  static gboolean terminal_screen_popup_menu (GtkWidget *widget);
  static gboolean terminal_screen_button_press (GtkWidget *widget,
@@ -385,10 +375,8 @@ index 26202e4555ea..c0ce8a89126c 100644
  static gboolean
  terminal_screen_button_press (GtkWidget      *widget,
                                GdkEventButton *event)
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 1707ada83ce8..a3c5a7fc2f46 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
+--- a/src/terminal-window.cc
++++ b/src/terminal-window.cc
 @@ -1950,15 +1950,21 @@ terminal_window_draw (GtkWidget *widget,
  {
    if (gtk_widget_get_app_paintable (widget))
@@ -431,10 +419,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
  src/terminal-screen.c | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index c0ce8a89126c..1b763a3890dd 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
+--- a/src/terminal-screen.cc
++++ b/src/terminal-screen.cc
 @@ -908,7 +908,6 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
@@ -787,19 +773,15 @@ index 82ef0664ae1e..27e9877f96e8 100644
  
  #: ../src/profile-preferences.glade.h:74
  msgid "_Update login records when command is launched"
-diff --git a/po/bg.po b/po/bg.po
-index 9a4f32e4b135..6ac17c17efb8 100644
---- a/po/bg.po
-+++ b/po/bg.po
-@@ -2305,3 +2305,6 @@ msgstr ""
- #: ../src/terminal-window.c:3953
- msgid "C_lose Window"
- msgstr "_Затваряне на този прозорец"
+--- gnome-terminal-3.42.0/po/bg.po.orig        2021-09-27 20:34:18.648881212 +0200
++++ gnome-terminal-3.42.0/po/bg.po     2021-09-27 20:42:08.969666599 +0200
+@@ -2448,3 +2448,6 @@ msgstr "_Ð\97аÑ\82ваÑ\80Ñ\8fне Ð½Ð° Ñ\82озÐ
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "Аргументите не могат да бъдат анализирани: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Прозрачен фон"
-diff --git a/po/bn.po b/po/bn.po
-index 4906009cf46f..f97d43b0e515 100644
 --- a/po/bn.po
 +++ b/po/bn.po
 @@ -1217,8 +1217,8 @@ msgid "_Base on:"
@@ -912,12 +894,12 @@ index a6e8fb4250dc..c9ed8508228d 100644
 +
 +msgid "Transparent background"
 +msgstr "Fons transparent"
---- gnome-terminal-3.40.0/po/cs.po.orig        2021-04-17 09:13:42.492163594 +0200
-+++ gnome-terminal-3.40.0/po/cs.po     2021-04-17 09:15:32.217846326 +0200
-@@ -2432,3 +2432,6 @@ msgstr ""
- #: src/terminal-window.c:3242
- msgid "C_lose Window"
- msgstr "_Zavřít okno"
+--- gnome-terminal-3.42.0/po/cs.po.orig        2021-09-27 20:42:33.806198715 +0200
++++ gnome-terminal-3.42.0/po/cs.po     2021-09-27 20:43:28.429236130 +0200
+@@ -2452,3 +2452,6 @@ msgstr "_Zavřít okno"
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "Selhala analýza argumentů: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Průsvitné pozadí"
@@ -1329,12 +1311,12 @@ index 93d5fa9d1481..feb87dce3d6b 100644
 +
 +msgid "Transparent background"
 +msgstr "Cúlra trédhearcach"
---- gnome-terminal-3.40.0/po/gl.po.orig        2021-04-17 11:24:17.591609307 +0200
-+++ gnome-terminal-3.40.0/po/gl.po     2021-04-17 11:24:36.055901966 +0200
-@@ -2454,3 +2454,6 @@ msgstr ""
- #: src/terminal-window.c:3245
- msgid "C_lose Window"
- msgstr "P_echar a xanela"
+--- gnome-terminal-3.42.0/po/gl.po.orig        2021-09-27 20:43:51.119113208 +0200
++++ gnome-terminal-3.42.0/po/gl.po     2021-09-27 20:45:04.598715135 +0200
+@@ -2481,3 +2481,6 @@ msgstr "P_echar a xanela"
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "Produciuse un erro ao analizar os argumentos: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Fondo transparente"
@@ -1486,12 +1468,12 @@ index aec2eaa8bac1..207b5c774b32 100644
 +#: ../src/profile-preferences.glade.h:69
 +msgid "Transparent background"
 +msgstr "Prozirna pozadina"
---- gnome-terminal-3.40.0/po/hu.po.orig        2021-04-17 11:24:59.037095972 +0200
-+++ gnome-terminal-3.40.0/po/hu.po     2021-04-17 11:28:58.849555608 +0200
-@@ -2442,3 +2442,6 @@ msgstr ""
- #: src/terminal-window.c:3245
- msgid "C_lose Window"
- msgstr "_Ablak bezárása"
+--- gnome-terminal-3.42.0/po/hu.po.orig        2021-09-27 20:45:45.238494971 +0200
++++ gnome-terminal-3.42.0/po/hu.po     2021-09-27 20:48:32.504255481 +0200
+@@ -2463,3 +2463,6 @@ msgstr "_Ablak bezárása"
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "A paraméterek feldolgozása meghiúsult: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Áttetsző háttér"
@@ -2160,38 +2142,12 @@ index 5181419ad973..3df37f6d5bc7 100644
  
  #~ msgid "S_hade transparent or image background:"
  #~ msgstr "Transparente som_breado ou imagem de fundo:"
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index c40dba26b08a..9be7eec414e9 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -2687,17 +2687,17 @@ msgstr "_Fechar janela"
- #~ msgid "Default size:"
- #~ msgstr "Tamanho padrão:"
--#~ msgid "Title"
--#~ msgstr "Título"
-+msgid "Title"
-+msgstr "Título"
--#~ msgid "_Title:"
--#~ msgstr "_Título:"
-+msgid "_Title:"
-+msgstr "_Título:"
- #~ msgid "Title and Command"
- #~ msgstr "Título e comando"
--#~ msgid "Set Title"
--#~ msgstr "Definir título"
-+msgid "Set Title"
-+msgstr "Definir título"
- #~ msgid "Current Locale"
- #~ msgstr "Codificação atual"
-@@ -3323,3 +3323,6 @@ msgstr "_Fechar janela"
- #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de "
- #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato "
- #~ "hexadecimal. Exemplo: \"#FF00FF\""
+--- gnome-terminal-3.42.0/po/pt_BR.po.orig     2021-09-27 20:48:56.414125950 +0200
++++ gnome-terminal-3.42.0/po/pt_BR.po  2021-09-27 20:52:08.016421285 +0200
+@@ -2482,3 +2482,6 @@ msgstr "_Fechar janela"
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "Falha ao analisar os argumentos: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Fundo transparente"
@@ -2697,17 +2653,15 @@ index 313f76b98eae..be6089762082 100644
  
  #~ msgid ""
  #~ "You already have a profile called “%s”. Do you want to create another "
---- gnome-terminal-3.40.0/po/uk.po.orig        2021-04-17 12:13:49.869425706 +0200
-+++ gnome-terminal-3.40.0/po/uk.po     2021-04-17 12:17:37.387909749 +0200
-@@ -2431,3 +2431,6 @@ msgstr ""
- #: src/terminal-window.c:3242
- msgid "C_lose Window"
- msgstr "Ð\97акÑ\80_иÑ\82и Ð²Ñ\96кно"
+--- gnome-terminal-3.42.0/po/uk.po.orig        2021-09-27 20:52:35.752937690 +0200
++++ gnome-terminal-3.42.0/po/uk.po     2021-09-27 20:54:10.739089772 +0200
+@@ -2453,3 +2453,6 @@ msgstr "Закр_ити вікно"
+ #, c-format
+ msgid "Failed to parse arguments: %s\n"
+ msgstr "Ð\9dе Ð²Ð´Ð°Ñ\94Ñ\82Ñ\8cÑ\81Ñ\8f Ð²Ð¸Ð·Ð½Ð°Ñ\87иÑ\82и Ð°Ñ\80гÑ\83менÑ\82и: %s\n"
 +
 +msgid "Transparent background"
 +msgstr "Прозоре тло"
-diff --git a/po/vi.po b/po/vi.po
-index 67eb9326545f..5a279ad647b6 100644
 --- a/po/vi.po
 +++ b/po/vi.po
 @@ -2673,8 +2673,8 @@ msgstr "Đón_g cửa sổ"
index cfa0537fc9c6243714b95c163ded8d72fc0b6662..e40ed986854996ec4054e576404627e961babe41 100644 (file)
@@ -7,16 +7,14 @@
 Summary:       GNOME Terminal
 Summary(pl.UTF-8):     Terminal dla GNOME
 Name:          gnome-terminal
-Version:       3.40.3
+Version:       3.42.0
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/gnome-terminal/3.40/%{name}-%{version}.tar.xz
-# Source0-md5: 06db1340df1c10a1b159b940c30db87c
+Source0:       https://download.gnome.org/sources/gnome-terminal/3.42/%{name}-%{version}.tar.xz
+# Source0-md5: 401ef2b1b7af62448d11dae251c2a159
 Patch1:                %{name}-transparency.patch
 URL:           https://wiki.gnome.org/Apps/Terminal/
-BuildRequires: autoconf >= 2.53
-BuildRequires: automake >= 1:1.9
 BuildRequires: dconf-devel >= 0.14
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-dtd412-xml
@@ -25,17 +23,20 @@ BuildRequires:      glib2-devel >= 1:2.52.0
 %{?with_search_provider:BuildRequires: gnome-shell-devel >= 3.12.0}
 BuildRequires: gsettings-desktop-schemas-devel >= 0.1.0
 BuildRequires: gtk+3-devel >= 3.22.27
-BuildRequires: libtool
+BuildRequires: libstdc++-devel >= 6:4.8.1
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-progs
 BuildRequires: libxslt-progs
+BuildRequires: meson >= 0.49.0
 %{?with_nautilus:BuildRequires:        nautilus-devel >= 3.28.0}
+BuildRequires: ninja >= 1.5
 BuildRequires: pcre2-8-devel >= 10.00
 BuildRequires: pkgconfig >= 1:0.12.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: vte-devel >= 0.63.0
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires(post,postun): glib2 >= 1:2.52.0
@@ -75,29 +76,16 @@ w Nautilusie.
 %{?with_transparency:%patch1 -p1}
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-silent-rules \
-       --disable-static \
-       %{!?with_nautilus:--without-nautilus-extension} \
-       %{!?with_search_provider:--disable-search-provider}
-
-%{__make}
+%meson build \
+       %{!?with_nautilus:-Dnautilus_extension=false} \
+       %{!?with_search_provider:-Dsearch_provider=false}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       localedir=%{_localedir}
-
-%if %{with nautilus}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.la
-%endif
+%ninja_install -C build
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -114,7 +102,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-terminal
 %attr(755,root,root) %{_libexecdir}/gnome-terminal-server
 %dir %{_libdir}/gnome-terminal
@@ -122,7 +110,7 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Terminal.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
 %{?with_search_provider:%{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini}
-%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml
+%{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml
 %{_desktopdir}/org.gnome.Terminal.desktop
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.Terminal.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg
This page took 0.122882 seconds and 4 git commands to generate.