Hello community, here is the log from the commit of package i3lock for openSUSE:Factory checked in at 2017-09-12 19:53:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i3lock (Old) and /work/SRC/openSUSE:Factory/.i3lock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "i3lock" Tue Sep 12 19:53:20 2017 rev:11 rq:521157 version:2.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes 2017-06-28 10:36:25.022268150 +0200 +++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2017-09-12 19:53:21.236295499 +0200 @@ -1,0 +2,8 @@ +Tue Sep 5 03:10:56 UTC 2017 - [email protected] + +- update to 2.9.1 +- Fix version number mechanism +- Revert the fix for composited notifications, as it causes more issues than + it solves: + +------------------------------------------------------------------- Old: ---- i3lock-2.9.tar.bz2 New: ---- i3lock-2.9.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i3lock.spec ++++++ --- /var/tmp/diff_new_pack.JTyBhm/_old 2017-09-12 19:53:22.888063252 +0200 +++ /var/tmp/diff_new_pack.JTyBhm/_new 2017-09-12 19:53:22.892062689 +0200 @@ -20,7 +20,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: i3lock -Version: 2.9 +Version: 2.9.1 Release: 0 Summary: Screen Locker for the i3 Window Manager License: BSD-3-Clause @@ -44,7 +44,6 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 BuildRequires: pkgconfig(xkbcommon-x11) Requires: pam-modules -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description i3lock is a simple screen locker like slock. After starting it, you will see a @@ -85,12 +84,10 @@ install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock %files xlock-compat -%defattr(-,root,root) %{_bindir}/xlock %{_datadir}/i3lock-xlock-compat %files -%defattr(-,root,root) %doc CHANGELOG LICENSE README.md %config(noreplace) %{_sysconfdir}/pam.d/%{name} %{_bindir}/i3lock ++++++ i3lock-2.9.tar.bz2 -> i3lock-2.9.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.9/CHANGELOG new/i3lock-2.9.1/CHANGELOG --- old/i3lock-2.9/CHANGELOG 2017-05-26 09:51:55.000000000 +0200 +++ new/i3lock-2.9.1/CHANGELOG 2017-06-21 18:18:26.000000000 +0200 @@ -1,3 +1,11 @@ +2017-06-21 i3lock 2.9.1 + + • Fix version number mechanism (for --version) + • Revert the fix for composited notifications, as it causes more issues than + it solves: + https://github.com/i3/i3lock/issues/130 + https://github.com/i3/i3lock/issues/128 + 2017-05-26 i3lock 2.9 • i3lock.1: use signal names without SIG prefix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.9/Makefile new/i3lock-2.9.1/Makefile --- old/i3lock-2.9/Makefile 2017-05-26 09:51:55.000000000 +0200 +++ new/i3lock-2.9.1/Makefile 2017-06-21 18:18:26.000000000 +0200 @@ -15,8 +15,9 @@ CFLAGS += -pipe CFLAGS += -Wall CPPFLAGS += -D_GNU_SOURCE -CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) -LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +LIBS += -lpam LIBS += -lev LIBS += -lm @@ -31,10 +32,10 @@ ifeq ($(wildcard .git),) # not in git repository VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1) - I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)' +I3LOCK_VERSION:="2.9.1 (2017-06-21)" else VERSION:=$(shell git describe --tags --abbrev=0) - I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" +I3LOCK_VERSION:="2.9.1 (2017-06-21)" endif CPPFLAGS += -DVERSION=\"${I3LOCK_VERSION}\" @@ -62,6 +63,6 @@ [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} - sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile + sed -e 's/^\s*I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION} rm -rf i3lock-${VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.9/README.md new/i3lock-2.9.1/README.md --- old/i3lock-2.9/README.md 2017-05-26 09:51:55.000000000 +0200 +++ new/i3lock-2.9.1/README.md 2017-06-21 18:18:26.000000000 +0200 @@ -25,7 +25,6 @@ - libxcb-util - libpam-dev - libcairo-dev -- libxcb-composite0 - libxcb-xinerama - libev - libx11-dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.9/xcb.c new/i3lock-2.9.1/xcb.c --- old/i3lock-2.9/xcb.c 2017-05-26 09:51:55.000000000 +0200 +++ new/i3lock-2.9.1/xcb.c 2017-06-21 18:18:26.000000000 +0200 @@ -11,7 +11,6 @@ #include <xcb/xcb_image.h> #include <xcb/xcb_atom.h> #include <xcb/xcb_aux.h> -#include <xcb/composite.h> #include <stdio.h> #include <stdlib.h> #include <stdbool.h> @@ -107,29 +106,6 @@ uint32_t mask = 0; uint32_t values[3]; xcb_window_t win = xcb_generate_id(conn); - xcb_window_t parent_win = scr->root; - - /* Check whether the composite extension is available */ - const xcb_query_extension_reply_t *extension_query = NULL; - xcb_generic_error_t *error = NULL; - xcb_composite_get_overlay_window_cookie_t cookie; - xcb_composite_get_overlay_window_reply_t *composite_reply = NULL; - - extension_query = xcb_get_extension_data(conn, &xcb_composite_id); - if (extension_query && extension_query->present) { - /* When composition is used, we need to use the composite overlay - * window instead of the normal root window to be able to cover - * composited windows */ - cookie = xcb_composite_get_overlay_window(conn, scr->root); - composite_reply = xcb_composite_get_overlay_window_reply(conn, cookie, &error); - - if (!error && composite_reply) { - parent_win = composite_reply->overlay_win; - } - - free(composite_reply); - free(error); - } if (pixmap == XCB_NONE) { mask |= XCB_CW_BACK_PIXEL; @@ -151,8 +127,8 @@ xcb_create_window(conn, XCB_COPY_FROM_PARENT, - win, /* the window id */ - parent_win, + win, /* the window id */ + scr->root, /* parent == root */ 0, 0, scr->width_in_pixels, scr->height_in_pixels, /* dimensions */
