Date: Monday, March 30, 2020 @ 05:37:32 Author: eworm Revision: 378702
archrelease: copy trunk to extra-x86_64 Added: xfce4-screensaver/repos/extra-x86_64/0001-Send-empty-DBus-responses.patch (from rev 378701, xfce4-screensaver/trunk/0001-Send-empty-DBus-responses.patch) xfce4-screensaver/repos/extra-x86_64/PKGBUILD (from rev 378701, xfce4-screensaver/trunk/PKGBUILD) Deleted: xfce4-screensaver/repos/extra-x86_64/0001-Send-empty-DBus-responses.patch xfce4-screensaver/repos/extra-x86_64/PKGBUILD --------------------------------------+ 0001-Send-empty-DBus-responses.patch | 140 ++++++++++++++++----------------- PKGBUILD | 76 ++++++++--------- 2 files changed, 104 insertions(+), 112 deletions(-) Deleted: 0001-Send-empty-DBus-responses.patch =================================================================== --- 0001-Send-empty-DBus-responses.patch 2020-03-30 05:37:24 UTC (rev 378701) +++ 0001-Send-empty-DBus-responses.patch 2020-03-30 05:37:32 UTC (rev 378702) @@ -1,70 +0,0 @@ -From cc33cea3df2ab361cdbddecfa901fbc048ce278b Mon Sep 17 00:00:00 2001 -From: Sean Davis <smd.seanda...@gmail.com> -Date: Sat, 28 Mar 2020 08:23:00 -0400 -Subject: Send empty DBus responses (bug #16522) - ---- - src/gs-listener-dbus.c | 27 +++++++++++++++++++++++---- - 1 file changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c -index 3463ef9..6307324 100644 ---- a/src/gs-listener-dbus.c -+++ b/src/gs-listener-dbus.c -@@ -832,6 +832,25 @@ listener_remove_ck_ref_entry (GSListener *listener, - } - #endif - -+static DBusHandlerResult -+listener_dbus_confirm (DBusConnection *connection, -+ DBusMessage *message) { -+ DBusMessage *reply; -+ -+ reply = dbus_message_new_method_return (message); -+ if (reply == NULL) { -+ g_error ("No memory"); -+ } -+ -+ if (!dbus_connection_send (connection, reply, NULL)) { -+ g_error ("No memory"); -+ } -+ -+ dbus_message_unref (reply); -+ -+ return DBUS_HANDLER_RESULT_HANDLED; -+} -+ - static DBusHandlerResult - listener_dbus_add_ref_entry (GSListener *listener, - int entry_type, -@@ -1306,15 +1325,15 @@ listener_dbus_handle_session_message (DBusConnection *connection, - - if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Lock")) { - g_signal_emit (listener, signals[LOCK], 0); -- return DBUS_HANDLER_RESULT_HANDLED; -+ return listener_dbus_confirm (connection, message); - } - if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Quit")) { - g_signal_emit (listener, signals[QUIT], 0); -- return DBUS_HANDLER_RESULT_HANDLED; -+ return listener_dbus_confirm (connection, message); - } - if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Cycle")) { - g_signal_emit (listener, signals[CYCLE], 0); -- return DBUS_HANDLER_RESULT_HANDLED; -+ return listener_dbus_confirm (connection, message); - } - if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Inhibit")) { - return listener_dbus_add_ref_entry (listener, REF_ENTRY_TYPE_INHIBIT, connection, message); -@@ -1345,7 +1364,7 @@ listener_dbus_handle_session_message (DBusConnection *connection, - } - if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "SimulateUserActivity")) { - g_signal_emit (listener, signals[SIMULATE_USER_ACTIVITY], 0); -- return DBUS_HANDLER_RESULT_HANDLED; -+ return listener_dbus_confirm (connection, message); - } - if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) { - return do_introspect (connection, message, local_interface); --- -cgit v1.2.3 - Copied: xfce4-screensaver/repos/extra-x86_64/0001-Send-empty-DBus-responses.patch (from rev 378701, xfce4-screensaver/trunk/0001-Send-empty-DBus-responses.patch) =================================================================== --- 0001-Send-empty-DBus-responses.patch (rev 0) +++ 0001-Send-empty-DBus-responses.patch 2020-03-30 05:37:32 UTC (rev 378702) @@ -0,0 +1,70 @@ +From cc33cea3df2ab361cdbddecfa901fbc048ce278b Mon Sep 17 00:00:00 2001 +From: Sean Davis <smd.seanda...@gmail.com> +Date: Sat, 28 Mar 2020 08:23:00 -0400 +Subject: Send empty DBus responses (bug #16522) + +--- + src/gs-listener-dbus.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 3463ef9..6307324 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -832,6 +832,25 @@ listener_remove_ck_ref_entry (GSListener *listener, + } + #endif + ++static DBusHandlerResult ++listener_dbus_confirm (DBusConnection *connection, ++ DBusMessage *message) { ++ DBusMessage *reply; ++ ++ reply = dbus_message_new_method_return (message); ++ if (reply == NULL) { ++ g_error ("No memory"); ++ } ++ ++ if (!dbus_connection_send (connection, reply, NULL)) { ++ g_error ("No memory"); ++ } ++ ++ dbus_message_unref (reply); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ + static DBusHandlerResult + listener_dbus_add_ref_entry (GSListener *listener, + int entry_type, +@@ -1306,15 +1325,15 @@ listener_dbus_handle_session_message (DBusConnection *connection, + + if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Lock")) { + g_signal_emit (listener, signals[LOCK], 0); +- return DBUS_HANDLER_RESULT_HANDLED; ++ return listener_dbus_confirm (connection, message); + } + if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Quit")) { + g_signal_emit (listener, signals[QUIT], 0); +- return DBUS_HANDLER_RESULT_HANDLED; ++ return listener_dbus_confirm (connection, message); + } + if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Cycle")) { + g_signal_emit (listener, signals[CYCLE], 0); +- return DBUS_HANDLER_RESULT_HANDLED; ++ return listener_dbus_confirm (connection, message); + } + if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Inhibit")) { + return listener_dbus_add_ref_entry (listener, REF_ENTRY_TYPE_INHIBIT, connection, message); +@@ -1345,7 +1364,7 @@ listener_dbus_handle_session_message (DBusConnection *connection, + } + if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "SimulateUserActivity")) { + g_signal_emit (listener, signals[SIMULATE_USER_ACTIVITY], 0); +- return DBUS_HANDLER_RESULT_HANDLED; ++ return listener_dbus_confirm (connection, message); + } + if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) { + return do_introspect (connection, message, local_interface); +-- +cgit v1.2.3 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-30 05:37:24 UTC (rev 378701) +++ PKGBUILD 2020-03-30 05:37:32 UTC (rev 378702) @@ -1,42 +0,0 @@ -# Maintainer: Christian Hesse <m...@eworm.de> - -pkgname=xfce4-screensaver -pkgver=0.1.9 -pkgrel=3 -pkgdesc='Xfce Screensaver' -arch=('x86_64') -url='https://docs.xfce.org/apps/screensaver/start' -license=('GPL2') -groups=('xfce4-goodies') -depends=('libxss' 'libxklavier' 'libwnck3' 'garcon' 'dbus-glib' 'python' 'python-gobject') -makedepends=('intltool') -backup=('etc/pam.d/xfce4-screensaver') -source=("https://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" - '0001-Send-empty-DBus-responses.patch') -sha256sums=('5743ff271f3df3cdeb7f9e8ba63548f6cf0c9e37a16ebf1ccfccf827bd47e486' - 'fe4c1c13431f62ca0cd22fa21ff97648c8edaf023d55027337b2a096e852c680') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 < ../0001-Send-empty-DBus-responses.patch -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} Copied: xfce4-screensaver/repos/extra-x86_64/PKGBUILD (from rev 378701, xfce4-screensaver/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-30 05:37:32 UTC (rev 378702) @@ -0,0 +1,34 @@ +# Maintainer: Christian Hesse <m...@eworm.de> + +pkgname=xfce4-screensaver +pkgver=0.1.10 +pkgrel=1 +pkgdesc='Xfce Screensaver' +arch=('x86_64') +url='https://docs.xfce.org/apps/screensaver/start' +license=('GPL2') +groups=('xfce4-goodies') +depends=('libxss' 'libxklavier' 'libwnck3' 'garcon' 'dbus-glib' 'python' 'python-gobject') +makedepends=('intltool') +backup=('etc/pam.d/xfce4-screensaver') +source=("https://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('586f1c78dd6745a20e9ce9f12d0117189d597ba7ad0c8ffcfcd25c9bb05f1d57') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +}