Accepting request 258112 from X11:lxde
new upstream version 0.2.0 OBS-URL: https://build.opensuse.org/request/show/258112 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxterminal?expand=0&rev=28
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
d3e2ca6486
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b3efe7d1dddb81cf3221125cdd3814f9f841da8108b58ef189be61421786e1af
|
||||
size 243851
|
||||
@ -1,183 +0,0 @@
|
||||
diff -uNr lxterminal-0.1.11/src/lxterminal.c lxterminal-0.1.11-new/src/lxterminal.c
|
||||
--- lxterminal-0.1.11/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
|
||||
+++ lxterminal-0.1.11-new/src/lxterminal.c 2014-08-17 20:49:58.543192398 +0200
|
||||
@@ -69,29 +69,29 @@
|
||||
/* Menu and accelerator event handlers. */
|
||||
static void terminal_initialize_switch_tab_accelerator(Term * term);
|
||||
static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
|
||||
-static void terminal_switch_tab_accelerator(Term * term);
|
||||
+static gboolean terminal_switch_tab_accelerator(Term * term);
|
||||
static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
|
||||
static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_move_tab_execute(LXTerminal * terminal, gint direction);
|
||||
static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
+static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
|
||||
static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
|
||||
|
||||
/* Window creation, destruction, and control. */
|
||||
@@ -327,11 +327,14 @@
|
||||
|
||||
/* Handler for accelerator <ALT> n, where n is a digit.
|
||||
* Switch to the tab selected by the digit, if it exists. */
|
||||
-static void terminal_switch_tab_accelerator(Term * term)
|
||||
+static gboolean terminal_switch_tab_accelerator(Term * term)
|
||||
{
|
||||
LXTerminal * terminal = term->parent;
|
||||
- if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook)))
|
||||
+ if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) {
|
||||
gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index);
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ return FALSE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on File/New Window menu item.
|
||||
@@ -344,9 +347,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */
|
||||
-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_new_window_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on File/New Tab menu item.
|
||||
@@ -405,9 +409,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
|
||||
-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_new_tab_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on File/Close Tab menu item.
|
||||
@@ -419,9 +424,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */
|
||||
-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_close_tab_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Edit/Copy menu item.
|
||||
@@ -433,9 +439,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
|
||||
-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_copy_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Edit/Paste menu item.
|
||||
@@ -447,9 +454,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
|
||||
-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_paste_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "response" signal on Name Tab dialog. */
|
||||
@@ -521,9 +529,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */
|
||||
-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_name_tab_activate_event(NULL, terminal);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Tabs/Previous Tab menu item.
|
||||
@@ -538,10 +547,11 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */
|
||||
-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab");
|
||||
gtk_action_activate(_action);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Tabs/Next Tab menu item.
|
||||
@@ -556,10 +566,11 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */
|
||||
-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab");
|
||||
gtk_action_activate(_action);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Helper for move tab left and right. */
|
||||
@@ -594,9 +605,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */
|
||||
-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_move_tab_execute(terminal, -1);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Tabs/Move Tab Right menu item.
|
||||
@@ -607,9 +619,10 @@
|
||||
}
|
||||
|
||||
/* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */
|
||||
-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
+static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
|
||||
{
|
||||
terminal_move_tab_execute(terminal, 1);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/* Handler for "activate" signal on Help/About menu item. */
|
||||
3
lxterminal-0.2.0.tar.gz
Normal file
3
lxterminal-0.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:174b0e99652f72acd7a98b6ff1b75eba1a9bf364996e6f118cccdaba0d282baf
|
||||
size 248698
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 23 10:32:43 UTC 2014 - andrea@opensuse.org
|
||||
|
||||
- new upstream version 0.2.0
|
||||
- removed patch lxterminal-0.1.11_fix_ctrl_c_break.patch in upstream code
|
||||
- removed obsolete-suse-version-checks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 17 18:51:29 UTC 2014 - andrea@opensuse.org
|
||||
|
||||
|
||||
@ -17,17 +17,16 @@
|
||||
|
||||
|
||||
Name: lxterminal
|
||||
Version: 0.1.11
|
||||
Version: 0.2.0
|
||||
Release: 0
|
||||
Summary: Lightweight LXDE Terminal
|
||||
License: GPL-2.0
|
||||
Group: System/GUI/LXDE
|
||||
Url: http://www.lxde.org/
|
||||
Source0: %name-%version.tar.bz2
|
||||
Source0: %name-%version.tar.gz
|
||||
# PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
|
||||
# disable f10 shortcut because yast use it
|
||||
Patch0: %name-0.1.8-disable-f10.patch
|
||||
Patch1: %name-0.1.11_fix_ctrl_c_break.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
@ -37,11 +36,7 @@ BuildRequires: intltool
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: update-desktop-files
|
||||
%if %suse_version <= 1140
|
||||
BuildRequires: vte-devel
|
||||
%else
|
||||
BuildRequires: vte2-devel
|
||||
%endif
|
||||
Recommends: %name-lang
|
||||
|
||||
%description
|
||||
@ -54,7 +49,6 @@ of the LXDE project.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure --enable-man
|
||||
@ -62,32 +56,26 @@ of the LXDE project.
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
%suse_update_desktop_file %name System
|
||||
%suse_update_desktop_file %{name} System
|
||||
%find_lang %{name}
|
||||
%fdupes -s %{buildroot}
|
||||
|
||||
%clean
|
||||
%__rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if 0%{?suse_version} >= 1140
|
||||
|
||||
%post
|
||||
%desktop_database_post
|
||||
|
||||
%postun
|
||||
%desktop_database_postun
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,0755)
|
||||
%doc COPYING
|
||||
%_bindir/%name
|
||||
%_datadir/applications/lxterminal.desktop
|
||||
%dir %_datadir/lxterminal
|
||||
%_datadir/lxterminal/lxterminal.conf
|
||||
%_datadir/lxterminal/lxterminal-preferences.ui
|
||||
%_mandir/man1/lxterminal.1.gz
|
||||
%_datadir/pixmaps/lxterminal.png
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/lxterminal.desktop
|
||||
%dir %{_datadir}/lxterminal
|
||||
%{_datadir}/lxterminal/lxterminal.conf
|
||||
%{_datadir}/lxterminal/*.ui
|
||||
%{_datadir}/icons/hicolor/128x128/apps/lxterminal.png
|
||||
%{_mandir}/man1/lxterminal.1.gz
|
||||
|
||||
%files lang -f %name.lang
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user