Accepting request 281713 from home:posophe:branches:X11:windowmanagers

Update

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

i3lock-2.5-use-unix2_chkpwd.diff

@@ -7,32 +7,32 @@ diff --git a/Makefile b/Makefile
 index 2633bef..27a471b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -13,7 +13,11 @@ CFLAGS += -Wall
+@@ -13,7 +13,11 @@
  CPPFLAGS += -D_GNU_SOURCE
- CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom xkbcommon xkbfile x11 x11-xcb)
- LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xkbcommon xkbfile x11 x11-xcb)
+ CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
 +ifeq ($(USE_UNIX2_CHKPWD),1)
 +CFLAGS += -DUSE_UNIX2_CHKPWD=1
 +else
  LIBS += -lpam
 +endif
  LIBS += -lev
+ LIBS += -lm
  
- FILES:=$(wildcard *.c)
 diff --git a/i3lock.c b/i3lock.c
 index 5a87999..70842c6 100644
 --- a/i3lock.c
 +++ b/i3lock.c
-@@ -16,7 +16,9 @@
+@@ -17,7 +17,9 @@
  #include <xcb/dpms.h>
  #include <err.h>
  #include <assert.h>
 +#ifndef USE_UNIX2_CHKPWD
  #include <security/pam_appl.h>
 +#endif
- #include <X11/Xlib-xcb.h>
  #include <getopt.h>
  #include <string.h>
+ #include <ev.h>
 @@ -28,6 +30,13 @@
  #include <cairo.h>
  #include <cairo/cairo-xcb.h>
@@ -57,7 +57,7 @@ index 5a87999..70842c6 100644
  int input_position = 0;
  /* Holds the password you enter (in UTF-8). */
  static char password[512];
-@@ -195,11 +206,68 @@ static void input_done(void) {
+@@ -226,6 +228,62 @@
      pam_state = STATE_PAM_VERIFY;
      redraw_screen();
  
@@ -120,12 +120,15 @@ index 5a87999..70842c6 100644
      if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
          DEBUG("successfully authenticated\n");
          clear_password_memory();
+@@ -234,7 +292,7 @@
+         turn_monitors_on();
          exit(0);
      }
+-
 +#endif
- 
      if (debug_mode)
          fprintf(stderr, "Authentication failure\n");
+ 
 @@ -398,6 +466,7 @@ void handle_screen_resize(void) {
      redraw_screen();
  }

i3lock-2.5.tar.bz2

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

i3lock-2.6.tar.bz2

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

i3lock.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jan 19 03:34:30 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.6
+  * NEW DEPENDENCY: use libxkbcommon-x11 instead of libX11
+    This helps us get rid of all code that directly uses libX11
+  * Use cairo_status_to_string for descriptive errors.
+  * Add `-e` option to not validate empty password.
+  * Bugfix: update the initial keyboard modifier state (Thanks lee, Ran)
+  * Re-raise i3lock when obscured in a separate process
+  * Turn on the screen on successful authentication
+  * Delay to turn off the screen after wrong passwd
+  * Discard half-entered passwd after some inactivity
+  * Ignore empty passwd after repeated Enter keypress
+  * Scale the unlock indicator (for retina displays)
+- Replace xorg-x11-devel with pkgconfig(xkbcommon-x11); follow
+  upstream changes
+- Add pkgconfig(cairo) and pkgconfig(xcb-atom) requirements; new
+  upstream dependencies
+- Remove redundant %clean section
+
 -------------------------------------------------------------------
 Thu Mar 20 15:36:04 UTC 2014 - seife+obs@b1-systems.com
 

i3lock.spec

@@ -1,8 +1,7 @@
-# vim: set sw=4 ts=4 et nu:
 #
 # spec file for package i3lock
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
@@ -22,7 +21,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           i3lock
-Version:        2.5
+Version:        2.6
 Release:        0
 Summary:        Screen Locker for the i3 Window Manager
 License:        BSD-3-Clause
@@ -48,7 +47,9 @@ BuildRequires:  libudev1
 BuildRequires:  make
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(xcb-atom)
+BuildRequires:  pkgconfig(xkbcommon-x11)
 Requires:       pam-modules
 BuildRequires:  pam-modules
 BuildRequires:  pkgconfig(xcb-image)
@@ -99,13 +100,10 @@ install -D -m0644 i3lock.1 "%{buildroot}%{_mandir}/man1/i3lock.1"
 install -D -m0644 %{SOURCE2} %{buildroot}/usr/share/i3lock-xlock-compat/i3lock-icon.png
 install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files xlock-compat
 %defattr(-,root,root)
 %{_bindir}/xlock
-/usr/share/i3lock-xlock-compat
+%{_datadir}/i3lock-xlock-compat
 
 %files
 %defattr(-,root,root)