Dominique Leuenberger 2020-07-06 14:34:19 +00:00 committed by Git OBS Bridge
commit c6578665e9
6 changed files with 20 additions and 63 deletions

View File

@ -1,21 +0,0 @@
From fa3542ae702884c59dc2a1df9da22b9b939d5db8 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Wed, 8 Nov 2017 15:00:05 +0900
Subject: [PATCH] Properly set return value for lxterminal_socket_initialize
Fixes #40 #41
---
src/unixsocket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/unixsocket.c b/src/unixsocket.c
index b813f52..1874399 100644
--- a/src/unixsocket.c
+++ b/src/unixsocket.c
@@ -263,5 +263,5 @@ static gboolean handle_request(GIOChannel* gio, GIOCondition condition, ClientIn
}
gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, gint argc, gchar** argv) {
- init(lxtermwin, argc, argv);
+ return init(lxtermwin, argc, argv);
}

View File

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

3
lxterminal-0.3.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3166b18493a8e55811b02aa0de825cbbea65e2b628e69006c1a65b98e1bb4484
size 198348

View File

@ -1,28 +0,0 @@
From 8f14525dd957c8040f9059911ceb6067d2761019 Mon Sep 17 00:00:00 2001
From: SauronfromMordor <fe98em39ght6dv4@yandex.ru>
Date: Tue, 23 Jan 2018 02:17:36 +0300
Subject: [PATCH] Fixed GTK3 compilation warning
---
src/lxterminal.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/lxterminal.c b/src/lxterminal.c
index b4201d9..a3abd40 100644
--- a/src/lxterminal.c
+++ b/src/lxterminal.c
@@ -1531,7 +1531,11 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
g_object_weak_ref(G_OBJECT(terminal->window), (GWeakNotify) terminal_window_exit, terminal);
/* Create a vertical box as the child of the toplevel window. */
+#if GTK_CHECK_VERSION(3, 0, 0)
+ terminal->box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
+#else
terminal->box = gtk_vbox_new(FALSE, 1);
+#endif
gtk_container_add(GTK_CONTAINER(terminal->window), terminal->box);
/* Create the menu bar as the child of the vertical box. */
--
2.1.4

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Jul 4 08:11:52 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
- lxterminal 0.3.2 (boo#1113553):
* fix bug wth libvte 0.54 where closing 1 tab can cause other
tabs to be closed
- drop upstreamed patches:
* lxterminal-0.3.1-return-value-unixterminal.patch
* lxterminal-fix-gtk3-comp-warnings.patch
-------------------------------------------------------------------
Mon Jun 11 18:12:58 UTC 2018 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package lxterminal
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,23 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: lxterminal
Version: 0.3.1
Version: 0.3.2
Release: 0
Summary: Lightweight LXDE Terminal
License: GPL-2.0-only
Group: System/GUI/LXDE
Url: http://www.lxde.org/
Source0: %{name}-%{version}.tar.xz
URL: http://www.lxde.org/
Source0: https://sourceforge.net/projects/lxde/files/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20%{version}/%{name}-%{version}.tar.xz
# 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: lxterminal-0.3.1-return-value-unixterminal.patch
Patch2: lxterminal-fix-gtk3-comp-warnings.patch
BuildRequires: docbook-utils
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -51,14 +49,12 @@ of the LXDE project.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure \
--enable-man \
--enable-gtk3=yes
make %{?_smp_mflags} V=1
%make_build
%install
%make_install
@ -82,7 +78,7 @@ make %{?_smp_mflags} V=1
%{_datadir}/lxterminal/lxterminal.conf
%{_datadir}/lxterminal/*.ui
%{_datadir}/icons/hicolor/128x128/apps/lxterminal.png
%{_mandir}/man1/lxterminal.1%{ext_man}
%{_mandir}/man1/lxterminal.1%{?ext_man}
%files lang -f %{name}.lang