Hello community, here is the log from the commit of package sway for openSUSE:Factory checked in at 2020-06-09 00:05:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sway (Old) and /work/SRC/openSUSE:Factory/.sway.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sway" Tue Jun 9 00:05:23 2020 rev:21 rq:812492 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/sway/sway.changes 2020-05-07 14:55:49.414437356 +0200 +++ /work/SRC/openSUSE:Factory/.sway.new.3606/sway.changes 2020-06-09 00:07:11.317828019 +0200 @@ -1,0 +2,12 @@ +Fri Jun 5 14:43:57 UTC 2020 - Denis Kondratenko <denis.kondrate...@suse.com> + +- Add -fno-common patch in order to address boo#1160244 + * 0001-Fix-compiling-with-fno-common.patch + * https://github.com/swaywm/sway/pull/4943 + +------------------------------------------------------------------- +Fri May 29 14:05:57 UTC 2020 - Denis Kondratenko <denis.kondrate...@suse.com> + +- Add separate branding package + +------------------------------------------------------------------- New: ---- 0001-Fix-compiling-with-fno-common.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sway.spec ++++++ --- /var/tmp/diff_new_pack.DSokGu/_old 2020-06-09 00:07:12.361831723 +0200 +++ /var/tmp/diff_new_pack.DSokGu/_new 2020-06-09 00:07:12.365831738 +0200 @@ -26,6 +26,7 @@ Source0: https://github.com/swaywm/sway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: sway.keyring Patch0: sway-1.0-include.patch +Patch1: 0001-Fix-compiling-with-fno-common.patch BuildRequires: gcc-c++ #BuildRequires: libxslt-tools BuildRequires: libevdev-devel @@ -50,6 +51,7 @@ BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) +Requires: %{name}-branding >= %{version} Requires: ImageMagick Requires: ffmpeg %if 0%{?suse_version} @@ -61,9 +63,24 @@ "SirCmpwn's Wayland window manager" is a work in progress i3-compatible window manager for Wayland. +%package branding-upstream +Summary: Upstream branding of %{name} +Group: System/GUI/Other +Requires: %{name} = %{version} +Supplements: packageand(%{name}:branding-upstream) +Conflicts: otherproviders(%{name}-branding) +Provides: %{name}-branding = %{version} +BuildArch: noarch +#BRAND: /etc/sway/config contains upstream config and brand + +%description branding-upstream +This package provides the upstream look and feel for sway. + + %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" @@ -81,9 +98,7 @@ %license LICENSE %doc README.md CONTRIBUTING.md %{_bindir}/%{name}* -%dir %{_sysconfdir}/sway %dir %{_sysconfdir}/sway/security.d -%config(noreplace) %{_sysconfdir}/sway/config %config(noreplace) %{_sysconfdir}/sway/security.d/00-defaults %{_mandir}/man?/%{name}* %{_datadir}/wayland-sessions/ @@ -93,4 +108,8 @@ %{_datadir}/fish %{_datadir}/zsh +%files branding-upstream +%dir %{_sysconfdir}/sway +%config(noreplace) %{_sysconfdir}/sway/config + %changelog ++++++ 0001-Fix-compiling-with-fno-common.patch ++++++ >From 29a5ce5f65d04b046271fbe53850836c77bbee80 Mon Sep 17 00:00:00 2001 From: thermitegod <thermitethe...@gmail.com> Date: Thu, 23 Jan 2020 18:12:00 -0700 Subject: [PATCH] Fix compiling with -fno-common --- include/sway/server.h | 4 ++-- sway/main.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/sway/server.h b/include/sway/server.h index 5b34852c..2e8e4633 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -78,7 +78,7 @@ struct sway_server { list_t *dirty_nodes; }; -struct sway_server server; +extern struct sway_server server; struct sway_debug { bool noatomic; // Ignore atomic layout updates @@ -92,7 +92,7 @@ struct sway_debug { } damage; }; -struct sway_debug debug; +extern struct sway_debug debug; /* Prepares an unprivileged server_init by performing all privileged operations in advance */ bool server_privileged_prepare(struct sway_server *server); diff --git a/sway/main.c b/sway/main.c index 2cc69dfb..e0af4a79 100644 --- a/sway/main.c +++ b/sway/main.c @@ -27,6 +27,7 @@ static bool terminate_request = false; static int exit_value = 0; struct sway_server server = {0}; +struct sway_debug debug = {0}; void sway_terminate(int exit_code) { if (!server.wl_display) { -- 2.26.2
