pool/gnome-terminal
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 374928 from GNOME:Factory

Browse Source 
Scripted push of project GNOME:Next (forwarded request 374451 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/374928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-terminal?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger 2016-03-29 12:30:47 +00:00 committed by Git OBS Bridge
commit 5036e1540c
5 changed files with 110 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-terminal-3.18.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa
size 1836144

3
gnome-terminal-3.19.92.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55b337f05b170b90ebacdb2ee59d15d6037fd80e46dd71ddead8ef298b8103e4
size 1890148

176
gnome-terminal-dark-theme.patch
View File

@ -1,176 +0,0 @@
From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
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 @@
<summary>Whether to show the menubar in new windows</summary>
</key>
+ <key name="dark-theme" type="b">
+ <default>false</default>
+ <summary>Whether to use a dark theme variant</summary>
+ </key>
+
<key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
<default>'window'</default>
<summary>Whether to open new terminals as windows or tabs</summary>
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 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="dark-theme-checkbutton">
+ <property name="label" translatable="yes">Use _dark theme variant</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="hbox140">
<property name="visible">True</property>
<property name="can_focus">False</property>
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 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
+ type="guide"
+ id="pref-theme">
+
+ <info>
+ <link type="guide" xref="index#appearance"/>
+ <revision pkgversion="3.12" date="2014-02-26" status="review"/>
+
+ <credit type="author copyright">
+ <name>Ekaterina Gerasimova</name>
+ <email its:translate="no">kittykat3756@gmail.com</email>
+ <years>2014</years>
+ </credit>
+ <!--<credit type="copyright editor">
+ <name></name>
+ <email its:translate="no"></email>
+ <years></years>
+ </credit>-->
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+ <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
+ </info>
+
+ <title>Chose the window theme</title>
+
+ <p>You can chose to use either the dark theme or the light theme for the
+ terminal window.</p>
+
+ <steps>
+ <item>
+ <p>Select
+ <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
+ </item>
+ <item>
+ <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
+ </item>
+ </steps>
+
+</page>
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 \

84
gnome-terminal.changes
View File

@ -1,3 +1,87 @@
-------------------------------------------------------------------
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
- 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
- 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 Mon Nov 9 21:11:26 UTC 2015 - zaitor@opensuse.org

38
gnome-terminal.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gnome-terminal # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,21 +17,18 @@
Name: gnome-terminal Name: gnome-terminal
Version: 3.18.2 Version: 3.19.92
Release: 0 Release: 0
Summary: GNOME Terminal Summary: GNOME Terminal
License: GPL-3.0+ and LGPL-2.1+ License: GPL-3.0+ and LGPL-2.1+
Group: System/X11/Terminals Group: System/X11/Terminals
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-terminal/3.18/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-terminal/3.19/%{name}-%{version}.tar.xz
BuildRequires: appdata-tools
BuildRequires: fdupes
# PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimstar@opensuse.org -- Allow gnome-terminal to have transparent windows # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimstar@opensuse.org -- Allow gnome-terminal to have transparent windows
Patch100: gnome-terminal-transparency.patch 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 # 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 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. BuildRequires: fdupes
Patch102: gnome-terminal-dark-theme.patch
# 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. # 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: gnome-shell
BuildRequires: intltool >= 0.50.0 BuildRequires: intltool >= 0.50.0
@ -42,21 +39,26 @@ BuildRequires: update-desktop-files
BuildRequires: vala >= 0.26 BuildRequires: vala >= 0.26
BuildRequires: yelp-tools BuildRequires: yelp-tools
BuildRequires: pkgconfig(dconf) >= 0.12.0 BuildRequires: pkgconfig(dconf) >= 0.12.0
%if 0%{?sle_version}
BuildRequires: pkgconfig(gconf-2.0) >= 2.31.3 BuildRequires: pkgconfig(gconf-2.0) >= 2.31.3
%endif
BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 BuildRequires: pkgconfig(gio-2.0) >= 2.34.0
BuildRequires: pkgconfig(glib-2.0) >= 2.42.0 BuildRequires: pkgconfig(glib-2.0) >= 2.42.0
BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gsettings-desktop-schemas)
# for gtk-builder-convert BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.8
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0
BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0 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(uuid)
BuildRequires: pkgconfig(vte-2.91) >= 0.42.1 BuildRequires: pkgconfig(vte-2.91) >= 0.43.91
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
Recommends: %{name}-lang Recommends: %{name}-lang
Obsoletes: gnome-core Obsoletes: gnome-core
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): filesystem Requires(pre): filesystem
%if 0%{?sle_version}
Requires(pre): gconf2
%endif
%description %description
This package provides the GNOME terminal emulator application. This package provides the GNOME terminal emulator application.
@ -88,7 +90,6 @@ arbitrary folders.
%setup -q %setup -q
#patch100 -p1 #patch100 -p1
#patch101 -p1 #patch101 -p1
#patch102 -p1
translation-update-upstream translation-update-upstream
%build %build
@ -96,7 +97,10 @@ translation-update-upstream
#autoreconf -fiv #autoreconf -fiv
%configure \ %configure \
--disable-static \ --disable-static \
--without-pcre2 \
%if !0%{?sle_version}
--disable-migration \ --disable-migration \
%endif
--with-gtk=3.0 \ --with-gtk=3.0 \
--with-nautilus-extension --with-nautilus-extension
make %{?_smp_mflags} make %{?_smp_mflags}
@ -104,7 +108,7 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print 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} %find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot} %fdupes %{buildroot}
@ -125,9 +129,12 @@ rm -rf %{buildroot}
%doc %{_datadir}/help/C/%{name}/ %doc %{_datadir}/help/C/%{name}/
%{_bindir}/gnome-terminal %{_bindir}/gnome-terminal
%dir %{_datadir}/appdata %dir %{_datadir}/appdata
%{_datadir}/appdata/gnome-terminal.appdata.xml %{_datadir}/appdata/org.gnome.Terminal.appdata.xml
%{_datadir}/applications/gnome-terminal.desktop %{_datadir}/applications/org.gnome.Terminal.desktop
%{_libexecdir}/gnome-terminal-server %{_libexecdir}/gnome-terminal-server
%if 0%{?sle_version}
%{_libexecdir}/gnome-terminal-migration
%endif
%{_datadir}/dbus-1/services/org.gnome.Terminal.service %{_datadir}/dbus-1/services/org.gnome.Terminal.service
%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
@ -138,6 +145,7 @@ rm -rf %{buildroot}
%files -n nautilus-extension-terminal %files -n nautilus-extension-terminal
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%{_datadir}/appdata/org.gnome.Terminal.Nautilus.appdata.xml
%files lang -f %{name}.lang %files lang -f %{name}.lang