Accepting request 812055 from home:elimat:branches:X11:windowmanagers

- update to 2.12
  * remove stray \n from error messages
  * capitalize unlock indicator contents
  * set WM_CLASS property
  * reference modifier as “Super”, not “Win”
  * add --raw option to read image as raw bytes
- run spec-cleaner
  * Remove Gropus
- add patch 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
  to fix builds with gcc10

OBS-URL: https://build.opensuse.org/request/show/812055
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/i3lock?expand=0&rev=36

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

@@ -0,0 +1,39 @@
+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.11.1.tar.bz2

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

i3lock-2.12.tar.bz2

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

i3lock.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Jun  6 11:57:02 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- update to 2.12
+  * remove stray \n from error messages
+  * capitalize unlock indicator contents
+  * set WM_CLASS property
+  * reference modifier as “Super”, not “Win”
+  * add --raw option to read image as raw bytes
+- run spec-cleaner
+  * Remove Gropus
+- add patch 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
+  to fix builds with gcc10
+
 -------------------------------------------------------------------
 Mon Feb  3 13:56:55 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

i3lock.spec

@@ -20,16 +20,17 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 Name:           i3lock
-Version:        2.11.1
+Version:        2.12
 Release:        0
 Summary:        Screen Locker for the i3 Window Manager
 License:        BSD-3-Clause
-Group:          System/GUI/Other
 URL:            https://i3wm.org/i3lock/
 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
@@ -50,7 +51,6 @@ screen by entering your password.
 
 %package xlock-compat
 Summary:        Xlock-compatibility script which calls i3lock
-Group:          System/GUI/Other
 Requires:       ImageMagick
 Requires:       xdpyinfo
 Conflicts:      xlockmore
@@ -61,12 +61,12 @@ This is handy for hard-coded screen-saver invocations e.g. in XFCE4, so you can
 i3lock instead of xlock with them.
 
 %prep
-%setup -q
+%autosetup -p 1
 
 %build
 %configure
 export CFLAGS="%{optflags}"
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install