commit kmscon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmscon for openSUSE:Factory checked in at 2022-08-30 14:49:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmscon (Old) and /work/SRC/openSUSE:Factory/.kmscon.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmscon" Tue Aug 30 14:49:42 2022 rev:2 rq:1000051 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmscon/kmscon.changes 2019-03-19 09:58:24.272102670 +0100 +++ /work/SRC/openSUSE:Factory/.kmscon.new.2083/kmscon.changes 2022-08-30 14:50:15.900240605 +0200 @@ -1,0 +2,10 @@ +Mon Aug 29 07:48:45 UTC 2022 - Jan Engelhardt <jengelh@inai.de> + +- Update to release 9.0.0 + * uxkb: add Compose (dead-key) support + * Add --xkb-compose-file option + * Custom palette support +- Delete kmscon-x-linking.patch (obsolete) +- Add 0001-Use-correct-systemd-system-unit-directory.patch + +------------------------------------------------------------------- Old: ---- _service kmscon-8.1~1536176839.tar.xz kmscon-x-linking.patch New: ---- 0001-Use-correct-systemd-system-unit-directory.patch kmscon-9.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmscon.spec ++++++ --- /var/tmp/diff_new_pack.aLcxVv/_old 2022-08-30 14:50:16.368241800 +0200 +++ /var/tmp/diff_new_pack.aLcxVv/_new 2022-08-30 14:50:16.372241810 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmscon # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2012 Adam Mizerski <adam@mizerski.pl> # # All modifications and additions to the file contributed by third parties @@ -13,26 +13,24 @@ # 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: kmscon -Version: 8.1~1536176839 +Version: 9.0.0 Release: 0 Summary: Linux KMS/DRM based virtual Console Emulator License: MIT Group: System/Console URL: https://github.com/Aetf/kmscon/ -Source: kmscon-%{version}.tar.xz +Source: https://github.com/Aetf/kmscon/releases/download/v%version/kmscon-%version.t... Patch1: kmscon-no-date-time.patch -Patch2: kmscon-x-linking.patch -BuildRequires: autoconf >= 2.68 -BuildRequires: automake >= 1.11 +Patch2: 0001-Use-correct-systemd-system-unit-directory.patch BuildRequires: docbook-xsl-stylesheets -BuildRequires: libtool >= 2.2 -BuildRequires: libtsm-devel >= 4.0.0 -BuildRequires: pkgconfig +BuildRequires: libtsm-devel >= 4.0.2 +BuildRequires: meson +BuildRequires: pkg-config BuildRequires: xsltproc BuildRequires: xz BuildRequires: pkgconfig(egl) @@ -44,7 +42,8 @@ BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(pixman-1) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 # O/P added for 13.1 Obsoletes: %{name}-service < %{version}-%{release} Provides: %{name}-service = %{version}-%{release} @@ -58,16 +57,13 @@ %autosetup -p1 %build -autoreconf -fvi -# fbdev is broken by design, drm2d is the most compatible -%configure --enable-debug --disable-static --with-fonts=pango --with-video=drm2d \ - --with-renderers=bbulk --with-sessions=terminal -make %{?_smp_mflags} +# Work around https://github.com/Aetf/kmscon/issues/63 +export CFLAGS="%{optflags} $(pkg-config xkbcommon --cflags) $(pkg-config libtsm --cflags) -Wno-error" +%meson +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print -install -m 644 -D -t %{buildroot}%{_unitdir} docs/*.service +%meson_install %pre %service_add_pre %{name}.service @@ -82,15 +78,12 @@ %service_del_postun %{name}.service %files -%doc README %license COPYING %{_bindir}/%{name} -%dir %{_libdir}/kmscon -%{_libdir}/kmscon/mod-bbulk.so -%{_libdir}/kmscon/mod-pango.so +%{_libdir}/kmscon/ %dir %{_libexecdir}/kmscon %{_libexecdir}/kmscon/kmscon %{_mandir}/man1/kmscon.1%{?ext_man} -%{_unitdir}/kmscon*.service +%{_unitdir}/*.service %changelog ++++++ 0001-Use-correct-systemd-system-unit-directory.patch ++++++ From 048f8c3b9b4fbfcad75ac049c5ba24e1ead3a19b Mon Sep 17 00:00:00 2001 From: Victor Westerhuis <victor@westerhu.is> Date: Sun, 19 Jun 2022 17:33:56 +0200 Subject: [PATCH] Use correct systemd system unit directory Keep the default the same, so there is no change in behavior. See: https://www.freedesktop.org/software/systemd/man/systemd.html#System%20unit%... --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 4544587..8dfe10d 100644 --- a/meson.build +++ b/meson.build @@ -37,7 +37,9 @@ sysconfdir = get_option('sysconfdir') / meson.project_name() libexecdir = get_option('libexecdir') / meson.project_name() mandir = get_option('mandir') moduledir = get_option('libdir') / meson.project_name() -systemddir = get_option('libdir') / 'systemd' + +systemd_deps = dependency('systemd', required: false) +systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: get_option('libdir') / 'systemd/system') # # Required dependencies @@ -150,7 +152,7 @@ summary({ 'sysconfdir': sysconfdir, 'moduledir': moduledir, 'mandir': mandir, - 'systemddir': systemddir, + 'systemdsystemunitdir': systemdsystemunitdir, }, section: 'Directories') summary({ 'extra_debug': get_option('extra_debug'), @@ -183,11 +185,11 @@ foreach filename, kwargs : { 'install_mode': 'rwxr-xr-x', }, 'docs/kmscon.service.in': { - 'install_dir': systemddir / 'system', + 'install_dir': systemdsystemunitdir, 'install_mode': 'rw-r--r--', }, 'docs/kmsconvt@.service.in': { - 'install_dir': systemddir / 'system', + 'install_dir': systemdsystemunitdir, 'install_mode': 'rw-r--r--', }, } -- 2.37.2 ++++++ kmscon-8.1~1536176839.tar.xz -> kmscon-9.0.0.tar.xz ++++++ ++++ 7243 lines of diff (skipped)
participants (1)
-
Source-Sync