Accepting request 858900 from X11:windowmanagers

OBS-URL: https://build.opensuse.org/request/show/858900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/i3lock?expand=0&rev=19

0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch

@@ -1,39 +0,0 @@
-From 3daf34bb03841f8e201ceb14b7124945d4c18bb8 Mon Sep 17 00:00:00 2001
-From: Jeroen Roovers <jer@gentoo.org>
-Date: Sat, 25 Jan 2020 11:28:36 +0000
-Subject: [PATCH] unlock_indicator.c: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-  CCLD     i3lock
-ld: i3lock-unlock_indicator.o:i3lock/unlock_indicator.c:38:
-  multiple definition of `input_position'; i3lock-i3lock.o:i3lock/i3lock.c:69: first defined here
-ld: i3lock-unlock_indicator.o:(.bss+0x102): multiple definition of `__odr_asan.input_position'; i3lock-i3lock.o:(.bss+0x92b): first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Hans de Graaff
-Bug: https://bugs.gentoo.org/706286
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- unlock_indicator.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unlock_indicator.c b/unlock_indicator.c
-index 8ff8173..d6237ed 100644
---- a/unlock_indicator.c
-+++ b/unlock_indicator.c
-@@ -35,7 +35,7 @@ extern bool debug_mode;
- 
- /* The current position in the input buffer. Useful to determine if any
-  * characters of the password have already been entered or not. */
--int input_position;
-+extern int input_position;
- 
- /* The lock window. */
- extern xcb_window_t win;

i3lock-2.12.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0b2a1a96ce80649958b27b8d54a6069b3aec9e7ffe07d378f9c51763b56bc09
-size 147521

i3lock-2.13.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:637fe898acb324337d3ebc4fcdb2e390b082147fdc8a0cda6c19e7f395965f0b
+size 149332

i3lock.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Dec 27 22:03:03 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- update to 2.13
+  * Throw error when trying to start on Wayland
+  * Use explicit_bzero() where available, not just on OpenBSD
+  * avoid pixmap allocations in the redraw path
+  * make --debug output go to stderr
+  * unlock_indicator.c: fix build failure against gcc-10
+  * fix: call pam_end in cleanup in main, not in event loop
+  * set _NET_WM_BYPASS_COMPOSITOR hint to avoid flickering
+- drop patch: 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch fixed upstream
+
 -------------------------------------------------------------------
 Mon Sep  7 13:25:22 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

i3lock.spec

@@ -20,7 +20,7 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 Name:           i3lock
-Version:        2.12
+Version:        2.13
 Release:        0
 Summary:        Screen Locker for the i3 Window Manager
 License:        BSD-3-Clause
@@ -29,8 +29,6 @@ Source:         https://i3wm.org/i3lock/%{name}-%{version}.tar.bz2
 # borrowed from gnome-icon-theme
 Source2:        i3lock-icon.png
 Source3:        xlock.sh
-# PATCH-FIX-UPSTREAM 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch gh#i3/i3lock#259
-Patch0:         0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  make