From e1a408c8ec88b0f1291358a0c5f8a7dd2d293365f3571cee0bee0c8c93f6c4fb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 19 Feb 2016 14:53:06 +0000 Subject: [PATCH 1/3] Accepting request 360386 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/360386 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=152 --- gnome-terminal-3.18.2.tar.xz | 3 - gnome-terminal-3.19.90.tar.xz | 3 + gnome-terminal-dark-theme.patch | 176 -------------------------------- gnome-terminal.changes | 70 +++++++++++++ gnome-terminal.spec | 38 ++++--- 5 files changed, 96 insertions(+), 194 deletions(-) delete mode 100644 gnome-terminal-3.18.2.tar.xz create mode 100644 gnome-terminal-3.19.90.tar.xz delete mode 100644 gnome-terminal-dark-theme.patch diff --git a/gnome-terminal-3.18.2.tar.xz b/gnome-terminal-3.18.2.tar.xz deleted file mode 100644 index b721654..0000000 --- a/gnome-terminal-3.18.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa -size 1836144 diff --git a/gnome-terminal-3.19.90.tar.xz b/gnome-terminal-3.19.90.tar.xz new file mode 100644 index 0000000..4b16d43 --- /dev/null +++ b/gnome-terminal-3.19.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2be96fc8bdc9a52872d5f4eeb3fa230f3f3cbecf71f253465b20d209a0193fa +size 1853940 diff --git a/gnome-terminal-dark-theme.patch b/gnome-terminal-dark-theme.patch deleted file mode 100644 index 6da9a96..0000000 --- a/gnome-terminal-dark-theme.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 17 Feb 2015 13:22:11 +0100 -Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref" - -This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. ---- - src/org.gnome.Terminal.gschema.xml | 5 +++++ - src/preferences.ui | 16 ++++++++++++++++ - src/terminal-app.c | 4 ++++ - src/terminal-prefs.c | 9 ++++++++- - src/terminal-schemas.h | 1 + - 5 files changed, 34 insertions(+), 1 deletion(-) - -Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml -=================================================================== ---- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml -+++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml -@@ -658,6 +658,11 @@ - Whether to show the menubar in new windows - - -+ -+ false -+ Whether to use a dark theme variant -+ -+ - - 'window' - Whether to open new terminals as windows or tabs -Index: gnome-terminal-3.17.91/src/preferences.ui -=================================================================== ---- gnome-terminal-3.17.91.orig/src/preferences.ui -+++ gnome-terminal-3.17.91/src/preferences.ui -@@ -99,6 +99,22 @@ - - - -+ -+ Use _dark theme variant -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ True -+ 3 -+ -+ -+ - - True - False -Index: gnome-terminal-3.17.91/src/terminal-app.c -=================================================================== ---- gnome-terminal-3.17.91.orig/src/terminal-app.c -+++ gnome-terminal-3.17.91/src/terminal-app.c -@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app) - - /* Terminal global settings */ - app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); -+ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY, -+ gtk_settings_get_default (), -+ "gtk-application-prefer-dark-theme", -+ G_SETTINGS_BIND_GET); - - /* Check if we need to migrate from gconf to dconf */ - maybe_migrate_settings (app); -Index: gnome-terminal-3.17.91/src/terminal-prefs.c -=================================================================== ---- gnome-terminal-3.17.91.orig/src/terminal-prefs.c -+++ gnome-terminal-3.17.91/src/terminal-prefs.c -@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWind - GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; - GtkWidget *disable_shortcuts_button; - GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; -- GtkWidget *new_terminal_mode_combo; -+ GtkWidget *dark_theme_button, *new_terminal_mode_combo; - GtkWidget *default_hbox, *default_label; - GtkWidget *close_button, *help_button; - GtkTreeSelection *selection; -@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWind - "close-button", &close_button, - "help-button", &help_button, - "default-show-menubar-checkbutton", &show_menubar_button, -+ "dark-theme-checkbutton", &dark_theme_button, - "new-terminal-mode-combobox", &new_terminal_mode_combo, - "disable-mnemonics-checkbutton", &disable_mnemonics_button, - "disable-shortcuts-checkbutton", &disable_shortcuts_button, -@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWind - "active", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - -+ g_settings_bind (settings, -+ TERMINAL_SETTING_DARK_THEME_KEY, -+ dark_theme_button, -+ "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -+ - g_settings_bind (settings, - TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, - new_terminal_mode_combo, -Index: gnome-terminal-3.17.91/src/terminal-schemas.h -=================================================================== ---- gnome-terminal-3.17.91.orig/src/terminal-schemas.h -+++ gnome-terminal-3.17.91/src/terminal-schemas.h -@@ -68,6 +68,7 @@ G_BEGIN_DECLS - - #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" - #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" -+#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" - #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" - #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" - #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" -Index: gnome-terminal-3.17.91/help/C/pref-theme.page -=================================================================== ---- /dev/null -+++ gnome-terminal-3.17.91/help/C/pref-theme.page -@@ -0,0 +1,41 @@ -+ -+ -+ -+ -+ -+ -+ -+ Ekaterina Gerasimova -+ kittykat3756@gmail.com -+ 2014 -+ -+ -+ -+ -+ -+ Use either the light or dark theme for Terminal. -+ -+ -+ Chose the window theme -+ -+

You can chose to use either the dark theme or the light theme for the -+ terminal window.

-+ -+ -+ -+

Select -+ EditPreferencesGeneral.

-+ -+ -+

To use the dark theme, select Use dark theme variant.

-+ -+ -+ -+ -Index: gnome-terminal-3.17.91/help/Makefile.am -=================================================================== ---- gnome-terminal-3.17.91.orig/help/Makefile.am -+++ gnome-terminal-3.17.91/help/Makefile.am -@@ -35,6 +35,7 @@ HELP_FILES = \ - pref-profile-encoding.page \ - pref-scrolling.page \ - pref-tab-window.page \ -+ pref-theme.page \ - pref-user-input.page \ - profile.page \ - prob-reset.page \ diff --git a/gnome-terminal.changes b/gnome-terminal.changes index 0d47dd9..0fe04cb 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Thu Feb 18 22:01:52 UTC 2016 - zaitor@opensuse.org + +- Due to pcre2 support beeing disabled in vte, disable + pkconfig(pcre-2.8) BuildRequires, and pass --without-pcre2 to + configure. + +------------------------------------------------------------------- +Tue Feb 16 23:03:44 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.19.90: + + search: Revert to using a window instead of a popover. + + profile: + - Increase maximum of default column prefs. + - Don't compare alpha colour components. + - Add cursor colour prefs. + - editor: + . Add highlight colour prefs. + . Make it clearer what the colour pickers select. + . Don't compare alpha colour components. + . Unset colour alpha component. + . Add cursor colour prefs. + . Try to fix the UI file. + . Use new show-editor property on GtkColorButton. + + client: + - legacy: + . Reimplement deprecated --title option. + . --geometry option is unsupported on gtk+ >= 3.19.5. + + window: Try again to find and fix a clipboard related crash. + + util: + . Fix compilation error in previous commit. + . Unset colour alpha component. + + screen: Don't use extra colours when using theme colors. + + Add more appdata. + + Updated translations. + +------------------------------------------------------------------- +Fri Feb 12 11:46:50 UTC 2016 - zaitor@opensuse.org + +- Add pkgconfig(libpcre2-8) BuildRequires and stop passing + --without-pcre2 to configure. +- Alter how we run %suse_update_desktop_file macro, upstream now + ships a correct .desktop file. +- Drop disabled patch gnome-terminal-dark-theme.patch: Dark theme + restored upstream, so no longer needed. + +------------------------------------------------------------------- +Fri Feb 12 08:54:56 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.19.2: + + Bugs fixed: bgo#711059, bgo#755825, bgo#757314, bgo#757512. + + Updated translations. +- Drop appdata-tools BuildRequires: validating the appdata's + validity is upstreams task. + +------------------------------------------------------------------- +Mon Dec 21 14:51:48 UTC 2015 - fcrozat@suse.com + +- Drop BuildRequires(gtk-2.0), we don't need gtk-builder-convert + anymore. +- Enable back gconf2 migration code when building package for SLE + and disable gconf2 BuildRequires when building for openSUSE. + +------------------------------------------------------------------- +Mon Nov 23 23:57:18 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.19.1: + + Updated translations. +- Pass --without-pcre2 to configure, we are missing it in openSUSE + ------------------------------------------------------------------- Mon Nov 9 21:11:26 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 804fbb0..160d0ec 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-terminal # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,18 @@ Name: gnome-terminal -Version: 3.18.2 +Version: 3.19.90 Release: 0 Summary: GNOME Terminal License: GPL-3.0+ and LGPL-2.1+ Group: System/X11/Terminals Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-terminal/3.18/%{name}-%{version}.tar.xz -BuildRequires: appdata-tools -BuildRequires: fdupes +Source: http://download.gnome.org/sources/gnome-terminal/3.19/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimstar@opensuse.org -- Allow gnome-terminal to have transparent windows Patch100: gnome-terminal-transparency.patch # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency-fix-for-broken-themes.patch dimstar@opensuse.org -- Ensure the window is always painted Patch101: gnome-terminal-transparency-fix-for-broken-themes.patch -# PATCH-FEATURE-OPENSUSE gnome-terminal-dark-theme.patch zaitor@opensuse.org -- Allow gnome-terminal to have dark theme preferance. -Patch102: gnome-terminal-dark-theme.patch +BuildRequires: fdupes # Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source. BuildRequires: gnome-shell BuildRequires: intltool >= 0.50.0 @@ -42,21 +39,26 @@ BuildRequires: update-desktop-files BuildRequires: vala >= 0.26 BuildRequires: yelp-tools BuildRequires: pkgconfig(dconf) >= 0.12.0 +%if 0%{?sle_version} BuildRequires: pkgconfig(gconf-2.0) >= 2.31.3 +%endif BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 BuildRequires: pkgconfig(glib-2.0) >= 2.42.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) -# for gtk-builder-convert -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.8 BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0 +# Temp disabled as pcre support in vte got disabled, NB when reenabling, make sure to remove --without-pcre2 from configure. +#BuildRequires: pkgconfig(libpcre2-8) >= 10.00 BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(vte-2.91) >= 0.42.1 +BuildRequires: pkgconfig(vte-2.91) >= 0.43.1 BuildRequires: pkgconfig(x11) Recommends: %{name}-lang Obsoletes: gnome-core BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): filesystem +%if 0%{?sle_version} +Requires(pre): gconf2 +%endif %description This package provides the GNOME terminal emulator application. @@ -88,7 +90,6 @@ arbitrary folders. %setup -q #patch100 -p1 #patch101 -p1 -#patch102 -p1 translation-update-upstream %build @@ -96,7 +97,10 @@ translation-update-upstream #autoreconf -fiv %configure \ --disable-static \ + --without-pcre2 \ +%if !0%{?sle_version} --disable-migration \ +%endif --with-gtk=3.0 \ --with-nautilus-extension make %{?_smp_mflags} @@ -104,7 +108,7 @@ make %{?_smp_mflags} %install %make_install find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -%suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %{name} TerminalEmulator +%suse_update_desktop_file org.gnome.Terminal %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} @@ -125,9 +129,12 @@ rm -rf %{buildroot} %doc %{_datadir}/help/C/%{name}/ %{_bindir}/gnome-terminal %dir %{_datadir}/appdata -%{_datadir}/appdata/gnome-terminal.appdata.xml -%{_datadir}/applications/gnome-terminal.desktop +%{_datadir}/appdata/org.gnome.Terminal.appdata.xml +%{_datadir}/applications/org.gnome.Terminal.desktop %{_libexecdir}/gnome-terminal-server +%if 0%{?sle_version} +%{_libexecdir}/gnome-terminal-migration +%endif %{_datadir}/dbus-1/services/org.gnome.Terminal.service %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml @@ -138,6 +145,7 @@ rm -rf %{buildroot} %files -n nautilus-extension-terminal %defattr(-,root,root) %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so +%{_datadir}/appdata/org.gnome.Terminal.Nautilus.appdata.xml %files lang -f %{name}.lang From 5b9d0b5520050826f80f0555ba14d88c0ebf4e9df24ac46c86811fedaae2dcf5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 2 Mar 2016 10:27:43 +0000 Subject: [PATCH 2/3] Accepting request 363545 from GNOME:Next Update to 3.19.91 OBS-URL: https://build.opensuse.org/request/show/363545 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=153 --- gnome-terminal-3.19.90.tar.xz | 3 --- gnome-terminal-3.19.91.tar.xz | 3 +++ gnome-terminal.changes | 8 ++++++++ gnome-terminal.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 gnome-terminal-3.19.90.tar.xz create mode 100644 gnome-terminal-3.19.91.tar.xz diff --git a/gnome-terminal-3.19.90.tar.xz b/gnome-terminal-3.19.90.tar.xz deleted file mode 100644 index 4b16d43..0000000 --- a/gnome-terminal-3.19.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2be96fc8bdc9a52872d5f4eeb3fa230f3f3cbecf71f253465b20d209a0193fa -size 1853940 diff --git a/gnome-terminal-3.19.91.tar.xz b/gnome-terminal-3.19.91.tar.xz new file mode 100644 index 0000000..ccad126 --- /dev/null +++ b/gnome-terminal-3.19.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0828660b17f5d03ab5cffc4e13902877adcb801332e3727957f57339e77e840b +size 1873748 diff --git a/gnome-terminal.changes b/gnome-terminal.changes index 0fe04cb..cb8d268 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 1 12:29:22 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.19.91: + + Bugs fixed: bgo#732128, bgo#734875, bgo#747316, bgo#756038, + rh#1310892. + + Updated translations. + ------------------------------------------------------------------- Thu Feb 18 22:01:52 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 160d0ec..bb365ee 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -17,7 +17,7 @@ Name: gnome-terminal -Version: 3.19.90 +Version: 3.19.91 Release: 0 Summary: GNOME Terminal License: GPL-3.0+ and LGPL-2.1+ @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0 # Temp disabled as pcre support in vte got disabled, NB when reenabling, make sure to remove --without-pcre2 from configure. #BuildRequires: pkgconfig(libpcre2-8) >= 10.00 BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(vte-2.91) >= 0.43.1 +BuildRequires: pkgconfig(vte-2.91) >= 0.43.91 BuildRequires: pkgconfig(x11) Recommends: %{name}-lang Obsoletes: gnome-core From ac926be1eebac44d6ece609064593deceaa870caa1a4298a87a754eeaa22f325 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 18 Mar 2016 10:06:46 +0000 Subject: [PATCH 3/3] Accepting request 374451 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/374451 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=154 --- gnome-terminal-3.19.91.tar.xz | 3 --- gnome-terminal-3.19.92.tar.xz | 3 +++ gnome-terminal.changes | 6 ++++++ gnome-terminal.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 gnome-terminal-3.19.91.tar.xz create mode 100644 gnome-terminal-3.19.92.tar.xz diff --git a/gnome-terminal-3.19.91.tar.xz b/gnome-terminal-3.19.91.tar.xz deleted file mode 100644 index ccad126..0000000 --- a/gnome-terminal-3.19.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0828660b17f5d03ab5cffc4e13902877adcb801332e3727957f57339e77e840b -size 1873748 diff --git a/gnome-terminal-3.19.92.tar.xz b/gnome-terminal-3.19.92.tar.xz new file mode 100644 index 0000000..d384530 --- /dev/null +++ b/gnome-terminal-3.19.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55b337f05b170b90ebacdb2ee59d15d6037fd80e46dd71ddead8ef298b8103e4 +size 1890148 diff --git a/gnome-terminal.changes b/gnome-terminal.changes index cb8d268..78c62ce 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 17 16:38:02 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.19.92: + + Updated translations. + ------------------------------------------------------------------- Tue Mar 1 12:29:22 UTC 2016 - dimstar@opensuse.org diff --git a/gnome-terminal.spec b/gnome-terminal.spec index bb365ee..9ca5457 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -17,7 +17,7 @@ Name: gnome-terminal -Version: 3.19.91 +Version: 3.19.92 Release: 0 Summary: GNOME Terminal License: GPL-3.0+ and LGPL-2.1+