Hello community,
here is the log from the commit of package mate-screensaver for
openSUSE:Factory checked in at 2019-07-31 14:35:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-screensaver (Old)
and /work/SRC/openSUSE:Factory/.mate-screensaver.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-screensaver"
Wed Jul 31 14:35:33 2019 rev:25 rq:719963 version:1.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-screensaver/mate-screensaver.changes
2019-06-19 20:57:55.309956109 +0200
+++
/work/SRC/openSUSE:Factory/.mate-screensaver.new.4126/mate-screensaver.changes
2019-07-31 14:35:37.441889879 +0200
@@ -1,0 +2,14 @@
+Thu Jul 18 11:59:21 UTC 2019 - Jonathan Brielmaier <jbrielma...@suse.de>
+
+- Update to version 1.23.0:
+ * Update translations
+- add patches:
+ * drop-libXxf89-dependency.patch: drop the dependency on libXxf89
+ as it got removed from TW, fixes boo#1139857
+- remove patches:
+ * mate-screensaver-gtk-3.20.patch: we don't support gtk3.20 and
+ glib3.28 anymore
+- remove xxf86misc and xxf86vm from BuildRequires
+- require gtk >= 3.22 and glib >= 3.50
+
+-------------------------------------------------------------------
Old:
----
mate-screensaver-1.22.1.tar.xz
mate-screensaver-gtk-3.20.patch
New:
----
drop-libXxf89-dependency.patch
mate-screensaver-1.23.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.Inng1b/_old 2019-07-31 14:35:38.037889575 +0200
+++ /var/tmp/diff_new_pack.Inng1b/_new 2019-07-31 14:35:38.037889575 +0200
@@ -16,9 +16,9 @@
#
-%define _version 1.22
+%define _version 1.23
Name: mate-screensaver
-Version: 1.22.1
+Version: 1.23.0
Release: 0
Summary: MATE Desktop screensaver
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -27,9 +27,10 @@
Source:
https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mate-screensaver-1.7.1-vendor_pam_integration.patch
nmarq...@mate-desktop.org -- PAM integration with SUSE.
Patch0: mate-screensaver-1.7.1-vendor_pam_integration.patch
-# PATCH-FEATURE-OPENSUSE mate-screensaver-gtk-3.20.patch -- Restore GLib 2.48
and GTK+ 3.20 support.
-Patch1: mate-screensaver-gtk-3.20.patch
-BuildRequires: mate-common >= %{_version}
+# PATCH-FIX-UPSTREAM drop-libXxf89-dependency.patch -- drop the dependency on
libXxf89. Fixes boo#1139857
+Patch1: drop-libXxf89-dependency.patch
+# set to _version when mate-common has an equal release
+BuildRequires: mate-common >= 1.22
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
@@ -39,8 +40,8 @@
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gl)
-BuildRequires: pkgconfig(glib-2.0) >= 2.48
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
+BuildRequires: pkgconfig(glib-2.0) >= 2.50
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.22
BuildRequires: pkgconfig(libmate-menu) >= %{_version}
BuildRequires: pkgconfig(libmatekbdui)
BuildRequires: pkgconfig(libnotify)
@@ -51,8 +52,6 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xscrnsaver)
-BuildRequires: pkgconfig(xxf86misc)
-BuildRequires: pkgconfig(xxf86vm)
Requires: mate-session-manager-gschemas >= %{_version}
Recommends: %{name}-lang
Recommends: xscreensaver-data
++++++ drop-libXxf89-dependency.patch ++++++
>From 018024ef67a0fedfc37c0c21b198ee032e97b99c Mon Sep 17 00:00:00 2001
From: raveit65 <m...@raveit.de>
Date: Wed, 10 Jul 2019 15:12:38 +0200
Subject: [PATCH] drop libXxf86 dependency
The X server hasn't implemented it in over 10 years.
and it was dropped from debian since a long time.
fixes https://github.com/mate-desktop/mate-screensaver/issues/199
---
configure.ac | 17 ------------
src/gs-grab-x11.c | 68 -----------------------------------------------
2 files changed, 85 deletions(-)
diff --git a/configure.ac b/configure.ac
index b215428..05984ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,23 +413,6 @@ elif test "$with_xf86gamma" != no; then
exit 1
fi
-dnl ---------------------------------------------------------------------------
-dnl - Check for XF86MiscSetGrabKeysState (but only bother if we are already
-dnl - using other XF86 stuff.)
-dnl ---------------------------------------------------------------------------
-
-
-have_xf86miscsetgrabkeysstate=no
-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
- [have_xf86miscsetgrabkeysstate=yes],
- [true], -lXext -lX11)
- if test "$have_xf86miscsetgrabkeysstate" = yes ; then
- SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, , [Define this if you have the
XF86MiscSetGrabKeysState function])
- fi
-fi
-
dnl ---------------------------------------------------------------------------
dnl - The --enable-locking option
dnl ---------------------------------------------------------------------------
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index 9fff12d..df95c5a 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -29,10 +29,6 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-#ifdef HAVE_XF86MISCSETGRABKEYSSTATE
-# include <X11/extensions/xf86misc.h>
-#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
-
#include "gs-window.h"
#include "gs-grab.h"
#include "gs-debug.h"
@@ -83,75 +79,11 @@ grab_string (int status)
}
}
-#ifdef HAVE_XF86MISCSETGRABKEYSSTATE
-/* This function enables and disables the Ctrl-Alt-KP_star and
- Ctrl-Alt-KP_slash hot-keys, which (in XFree86 4.2) break any
- grabs and/or kill the grabbing client. That would effectively
- unlock the screen, so we don't like that.
-
- The Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash hot-keys only exist
- if AllowDeactivateGrabs and/or AllowClosedownGrabs are turned on
- in XF86Config. I believe they are disabled by default.
-
- This does not affect any other keys (specifically Ctrl-Alt-BS or
- Ctrl-Alt-F1) but I wish it did. Maybe it will someday.
- */
-static void
-xorg_lock_smasher_set_active (GSGrab *grab,
- gboolean active)
-{
- int status, event, error;
- GdkDisplay *display;
-
- display = gdk_display_get_default ();
-
- if (!XF86MiscQueryExtension (GDK_DISPLAY_XDISPLAY (display), &event,
&error))
- {
- gs_debug ("No XFree86-Misc extension present");
- return;
- }
-
- if (active)
- {
- gs_debug ("Enabling the x.org grab smasher");
- }
- else
- {
- gs_debug ("Disabling the x.org grab smasher");
- }
-
- gdk_x11_display_error_trap_push (display);
-
- status = XF86MiscSetGrabKeysState (GDK_DISPLAY_XDISPLAY (display),
active);
-
- gdk_display_sync (display);
- error = gdk_x11_display_error_trap_pop (display);
-
- if (active && status == MiscExtGrabStateAlready)
- {
- /* shut up, consider this success */
- status = MiscExtGrabStateSuccess;
- }
-
- if (error == Success) {
- gs_debug ("XF86MiscSetGrabKeysState(%s) returned %s\n",
- active ? "on" : "off",
- (status == MiscExtGrabStateSuccess ?
"MiscExtGrabStateSuccess" :
- status == MiscExtGrabStateLocked ?
"MiscExtGrabStateLocked" :
- status == MiscExtGrabStateAlready ?
"MiscExtGrabStateAlready" :
- "unknown value"));
- } else {
- gs_debug ("XF86MiscSetGrabKeysState(%s) failed with error code
%d\n",
- active ? "on" : "off", error);
- }
-}
-#else
static void
xorg_lock_smasher_set_active (GSGrab *grab,
gboolean active)
{
}
-#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
static void
prepare_window_grab_cb (GdkSeat *seat,
++++++ mate-screensaver-1.22.1.tar.xz -> mate-screensaver-1.23.0.tar.xz ++++++
++++ 8477 lines of diff (skipped)
