commit libtsm for openSUSE:Factory

30 Aug 2022

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libtsm for openSUSE:Factory checked in at 2022-08-30 14:49:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libtsm (Old)
 and      /work/SRC/openSUSE:Factory/.libtsm.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libtsm"

Tue Aug 30 14:49:41 2022 rev:2 rq:1000041 version:4.0.2

Changes:
--------

--- /work/SRC/openSUSE:Factory/libtsm/libtsm.changes	2018-08-02 15:01:06.872578473 +0200
+++ /work/SRC/openSUSE:Factory/.libtsm.new.2083/libtsm.changes	2022-08-30 14:50:14.748237666 +0200
@@ -1,0 +2,8 @@
+Mon Aug 29 07:54:47 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.0.2
+  * Arbitrary color palette configurable via API
+  * Fix the build of gtktsm with recent versions of pango
+- Delete 0001-Fix-filename-in-test_common.h.patch (obsolete)
+
+-------------------------------------------------------------------

Old:
----
  0001-Fix-filename-in-test_common.h.patch
  libtsm-4.0.0.tar.gz

New:
----
  v4.0.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libtsm.spec ++++++
--- /var/tmp/diff_new_pack.WB7iFH/_old	2022-08-30 14:50:15.240238922 +0200
+++ /var/tmp/diff_new_pack.WB7iFH/_new	2022-08-30 14:50:15.248238942 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package libtsm
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,31 +12,26 @@
 # 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/
 #
 
 
 %global sover   4
 %global lname   libtsm%{sover}
 Name:           libtsm
-Version:        4.0.0
+Version:        4.0.2
 Release:        0
 Summary:        DEC-VT terminal emulator state machine
-License:        MIT AND LGPL-2.1-or-later
+License:        LGPL-2.1-or-later AND MIT
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/Aetf/libtsm
-Source:         https://github.com/Aetf/libtsm/archive/libtsm-%{version}.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
+Source:         https://github.com/Aetf/libtsm/archive/refs/tags/v%{version}.tar.gz
+Patch1:         0001-Add-new-palette-with-standard-VGA-colors.patch
+BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  xz
-BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(check)
-# PATCH-FIX-UPSTREAM (https://github.com/Aetf/libtsm/pull/9)
-Patch1:         0001-Fix-filename-in-test_common.h.patch
-# PATCH-FIX-UPSTREAM (https://github.com/Aetf/libtsm/pull/10)
-Patch2:         0001-Add-new-palette-with-standard-VGA-colors.patch
+BuildRequires:  pkgconfig(xkbcommon)
 
 %description
 TSM is a state machine for DEC VT100-VT520 compatible terminal
@@ -72,31 +67,27 @@
 in %{lname}.
 
 %prep
-# The version contains a "libtsm-" prefix...
-%autosetup -p1 -n libtsm-libtsm-%{version}
+%autosetup -p1
 
 %build
-NOCONFIGURE=1 ./autogen.sh
-%configure --disable-static
-
-%check
-make check
+%cmake
+%make_build
 
 %install
-make install DESTDIR="%{buildroot}"
-rm %{buildroot}%{_libdir}/libtsm.la
+%cmake_install
 
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 
 %files -n %{lname}
-%doc README
 %license COPYING LICENSE_htable
 %{_libdir}/libtsm.so.%{sover}*
 
 %files devel
+%doc README
 %{_includedir}/libtsm.h
 %{_libdir}/libtsm.so
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/
 
 %changelog

++++++ 0001-Add-new-palette-with-standard-VGA-colors.patch ++++++
--- /var/tmp/diff_new_pack.WB7iFH/_old	2022-08-30 14:50:15.268238993 +0200
+++ /var/tmp/diff_new_pack.WB7iFH/_new	2022-08-30 14:50:15.272239003 +0200
@@ -6,43 +6,43 @@
 The standard VGA colors are used by fbcon by default as well, which means
 this is now as close to the linux console as possible.
 ---
- src/tsm/tsm-vte.c | 24 ++++++++++++++++++++++++
+ src/tsm/tsm-vte.c |   24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
-diff --git a/src/tsm/tsm-vte.c b/src/tsm/tsm-vte.c
-index eaa32be..d778346 100644
---- a/src/tsm/tsm-vte.c
-+++ b/src/tsm/tsm-vte.c
-@@ -367,6 +367,28 @@ static uint8_t color_palette_base16_light[COLOR_NUM][3] = {
- 	[COLOR_BACKGROUND]    = { 0xd8, 0xd8, 0xd8 }, /* light grey */
+Index: libtsm-4.0.2/src/tsm/tsm-vte.c
+===================================================================
+--- libtsm-4.0.2.orig/src/tsm/tsm-vte.c
++++ libtsm-4.0.2/src/tsm/tsm-vte.c
+@@ -343,6 +343,28 @@ static uint8_t color_palette_base16_ligh
+ 	[TSM_COLOR_BACKGROUND]    = { 0xd8, 0xd8, 0xd8 }, /* light grey */
  };
  
-+static uint8_t color_palette_vga[COLOR_NUM][3] = {
-+	[COLOR_BLACK]         = {   0,   0,   0 }, /* black */
-+	[COLOR_RED]           = { 170,   0,   0 }, /* red */
-+	[COLOR_GREEN]         = {   0, 170,   0 }, /* green */
-+	[COLOR_YELLOW]        = { 170,  85,   0 }, /* yellow */
-+	[COLOR_BLUE]          = {   0,   0, 170 }, /* blue */
-+	[COLOR_MAGENTA]       = { 170,   0, 170 }, /* magenta */
-+	[COLOR_CYAN]          = {   0, 170, 170 }, /* cyan */
-+	[COLOR_LIGHT_GREY]    = { 170, 170, 170 }, /* light grey */
-+	[COLOR_DARK_GREY]     = {  85,  85,  85 }, /* dark grey */
-+	[COLOR_LIGHT_RED]     = { 255,  85,  85 }, /* light red */
-+	[COLOR_LIGHT_GREEN]   = {  85, 255,  85 }, /* light green */
-+	[COLOR_LIGHT_YELLOW]  = { 255, 255,  85 }, /* light yellow */
-+	[COLOR_LIGHT_BLUE]    = {  85,  85, 255 }, /* light blue */
-+	[COLOR_LIGHT_MAGENTA] = { 255,  85, 255 }, /* light magenta */
-+	[COLOR_LIGHT_CYAN]    = {  85, 255, 255 }, /* light cyan */
-+	[COLOR_WHITE]         = { 255, 255, 255 }, /* white */
++static uint8_t color_palette_vga[TSM_COLOR_NUM][3] = {
++	[TSM_COLOR_BLACK]         = {   0,   0,   0 },
++	[TSM_COLOR_RED]           = { 170,   0,   0 },
++	[TSM_COLOR_GREEN]         = {   0, 170,   0 },
++	[TSM_COLOR_YELLOW]        = { 170,  85,   0 },
++	[TSM_COLOR_BLUE]          = {   0,   0, 170 },
++	[TSM_COLOR_MAGENTA]       = { 170,   0, 170 },
++	[TSM_COLOR_CYAN]          = {   0, 170, 170 },
++	[TSM_COLOR_LIGHT_GREY]    = { 170, 170, 170 },
++	[TSM_COLOR_DARK_GREY]     = {  85,  85,  85 },
++	[TSM_COLOR_LIGHT_RED]     = { 255,  85,  85 },
++	[TSM_COLOR_LIGHT_GREEN]   = {  85, 255,  85 },
++	[TSM_COLOR_LIGHT_YELLOW]  = { 255, 255,  85 },
++	[TSM_COLOR_LIGHT_BLUE]    = {  85,  85, 255 },
++	[TSM_COLOR_LIGHT_MAGENTA] = { 255,  85, 255 },
++	[TSM_COLOR_LIGHT_CYAN]    = {  85, 255, 255 },
++	[TSM_COLOR_WHITE]         = { 255, 255, 255 },
 +
-+	[COLOR_FOREGROUND]    = { 170, 170, 170 }, /* light grey */
-+	[COLOR_BACKGROUND]    = {   0,   0,   0 }, /* black */
++	[TSM_COLOR_FOREGROUND]    = { 170, 170, 170 },
++	[TSM_COLOR_BACKGROUND]    = {   0,   0,   0 },
 +};
 +
  static uint8_t (*get_palette(struct tsm_vte *vte))[3]
  {
  	if (!vte->palette_name)
-@@ -384,6 +406,8 @@ static uint8_t (*get_palette(struct tsm_vte *vte))[3]
+@@ -362,6 +384,8 @@ static uint8_t (*get_palette(struct tsm_
  		return color_palette_base16_dark;
  	if (!strcmp(vte->palette_name, "base16-light"))
  		return color_palette_base16_light;
@@ -51,7 +51,4 @@
  
  	return color_palette;
  }
--- 
-2.18.0
-

    

Source-Sync

tags

participants (1)