Accepting request 616548 from X11:lxde

OBS-URL: https://build.opensuse.org/request/show/616548
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxterminal?expand=0&rev=31

lxterminal-fix-gtk3-comp-warnings.patch

@@ -0,0 +1,28 @@
+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
+

lxterminal.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 11 18:12:58 UTC 2018 - bjorn.lie@gmail.com
+
+- Build against gtk3:
+  * Replace gtk2-devel with pkgconfig(gtk+-3.0) and
+    pkgconfig(glib-2.0) BuildRequires.
+  * Replace vte2-devel with pkgconfig(vte-2.91) BuildRequires.
+  * Pass --enable-gtk3=yes to configure.
+- Add lxterminal-fix-gtk3-comp-warnings.patch: Silence some
+  warnings during compilation, patch from upstream git.
+- Add conditional for post(un) desktop_database_post(un) macros, no
+  longer needed for newer versions of openSUSE.
+
 -------------------------------------------------------------------
 Wed Jan 10 16:32:25 UTC 2018 - kbabioch@suse.com
 

lxterminal.spec

@@ -20,7 +20,7 @@ Name:           lxterminal
 Version:        0.3.1
 Release:        0
 Summary:        Lightweight LXDE Terminal
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/GUI/LXDE
 Url:            http://www.lxde.org/
 Source0:        %{name}-%{version}.tar.xz
@@ -28,15 +28,17 @@ Source0:        %{name}-%{version}.tar.xz
 # 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
-BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libxslt-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRequires:  vte2-devel
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(vte-2.91)
 Recommends:     %{name}-lang
 
 %description
@@ -50,9 +52,12 @@ of the LXDE project.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%configure --enable-man
+%configure \
+	--enable-man \
+	--enable-gtk3=yes
 make %{?_smp_mflags} V=1
 
 %install
@@ -61,14 +66,16 @@ make %{?_smp_mflags} V=1
 %find_lang %{name}
 %fdupes -s %{buildroot}
 
+%if 0%{?suse_version} < 1500
 %post
 %desktop_database_post
 
 %postun
 %desktop_database_postun
+%endif
 
 %files
-%doc COPYING
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/lxterminal.desktop
 %dir %{_datadir}/lxterminal