Hello community, here is the log from the commit of package lxterminal for openSUSE:Factory checked in at 2018-06-19 11:58:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxterminal (Old) and /work/SRC/openSUSE:Factory/.lxterminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxterminal" Tue Jun 19 11:58:48 2018 rev:31 rq:616548 version:0.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxterminal/lxterminal.changes 2018-01-13 21:49:09.145865054 +0100 +++ /work/SRC/openSUSE:Factory/.lxterminal.new/lxterminal.changes 2018-06-19 11:58:50.180785698 +0200 @@ -1,0 +2,13 @@ +Mon Jun 11 18:12:58 UTC 2018 - [email protected] + +- 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. + +------------------------------------------------------------------- New: ---- lxterminal-fix-gtk3-comp-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxterminal.spec ++++++ --- /var/tmp/diff_new_pack.K9cuaO/_old 2018-06-19 11:58:50.860760451 +0200 +++ /var/tmp/diff_new_pack.K9cuaO/_new 2018-06-19 11:58:50.864760302 +0200 @@ -20,7 +20,7 @@ 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 @@ # 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 @@ %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 @@ %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 ++++++ lxterminal-fix-gtk3-comp-warnings.patch ++++++ >From 8f14525dd957c8040f9059911ceb6067d2761019 Mon Sep 17 00:00:00 2001 From: SauronfromMordor <[email protected]> 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
