pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/xfce4-session
Module Name: pkgsrc
Committed By: bsiegert
Date: Mon Jan 6 19:27:41 UTC 2025
Modified Files:
pkgsrc/x11/xfce4-session: Makefile PLIST distinfo
pkgsrc/x11/xfce4-session/patches: patch-scripts_Makefile.in
patch-xfce4-session_xfsm-shutdown-fallback.c
patch-xfsm-shutdown-helper_main.c
Log Message:
xfce4-session: update to 4.20.0
Part of the XFCE 4.20 update.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xfce4-session/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/xfce4-session/distinfo
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in \
pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/xfce4-session/Makefile
diff -u pkgsrc/x11/xfce4-session/Makefile:1.120 pkgsrc/x11/xfce4-session/Makefile:1.121
--- pkgsrc/x11/xfce4-session/Makefile:1.120 Fri Dec 27 08:21:07 2024
+++ pkgsrc/x11/xfce4-session/Makefile Mon Jan 6 19:27:40 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.120 2024/12/27 08:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2025/01/06 19:27:40 bsiegert Exp $
-PKGREVISION= 6
.include "../../meta-pkgs/xfce4/Makefile.common"
-DISTNAME= xfce4-session-4.18.4
+DISTNAME= xfce4-session-4.20.0
CATEGORIES= x11
MASTER_SITES+= https://archive.xfce.org/src/xfce/xfce4-session/${PKGVERSION_NOREV:R}/
@@ -22,13 +21,11 @@ USE_TOOLS+= iceauth:run
EGDIR= ${XFCE4_EGBASE}
PKG_SYSCONFSUBDIR= xdg
-MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/autostart
-MAKE_DIRS+= ${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf
+MAKE_DIRS+= ${PKG_SYSCONFDIR}
+MAKE_DIRS+= ${EGDIR} ${EGDIR}/xfconf
MAKE_DIRS+= ${EGDIR}/xfconf/xfce-perchannel-xml
-CONF_FILES= ${EGDIR}/autostart/xscreensaver.desktop \
- ${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop \
- ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \
+CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \
${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml \
${EGDIR}/Xft.xrdb \
${PKG_SYSCONFDIR}/xfce4/Xft.xrdb \
@@ -41,10 +38,11 @@ CONF_FILES= ${EGDIR}/autostart/xscreensa
.include "options.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
.include "../../devel/libwnck3/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.libxfce4ui+= libxfce4ui>=4.18.2
.include "../../x11/libxfce4ui/buildlink3.mk"
+.include "../../x11/libxfce4windowing/buildlink3.mk"
.include "../../x11/xscreensaver/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xfce4-session/PLIST
diff -u pkgsrc/x11/xfce4-session/PLIST:1.28 pkgsrc/x11/xfce4-session/PLIST:1.29
--- pkgsrc/x11/xfce4-session/PLIST:1.28 Fri Jun 28 19:37:01 2024
+++ pkgsrc/x11/xfce4-session/PLIST Mon Jan 6 19:27:40 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2024/06/28 19:37:01 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.29 2025/01/06 19:27:40 bsiegert Exp $
bin/startxfce4
bin/xfce4-session
bin/xfce4-session-logout
@@ -10,7 +10,6 @@ man/man1/xfce4-session.1
share/applications/xfce-session-settings.desktop
share/applications/xfce4-session-logout.desktop
share/examples/xfce4/Xft.xrdb
-share/examples/xfce4/autostart/xscreensaver.desktop
share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
share/examples/xfce4/xinitrc
share/icons/hicolor/128x128/apps/org.xfce.session.png
Index: pkgsrc/x11/xfce4-session/distinfo
diff -u pkgsrc/x11/xfce4-session/distinfo:1.40 pkgsrc/x11/xfce4-session/distinfo:1.41
--- pkgsrc/x11/xfce4-session/distinfo:1.40 Fri Jun 28 19:37:01 2024
+++ pkgsrc/x11/xfce4-session/distinfo Mon Jan 6 19:27:40 2025
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.40 2024/06/28 19:37:01 gutteridge Exp $
+$NetBSD: distinfo,v 1.41 2025/01/06 19:27:40 bsiegert Exp $
-BLAKE2s (xfce4-session-4.18.4.tar.bz2) = dc04702c4446253be4ea18e332beab8cc9137050d0676237d131d87559ca29c2
-SHA512 (xfce4-session-4.18.4.tar.bz2) = dec5006cf69cd44d39c0923d512bfd07123c923627b33a9f232134468cf8a160e329afcf0e61619e7f9a91a453845cbc55a355b6ca9c02e15f55eb7876c8bfc1
-Size (xfce4-session-4.18.4.tar.bz2) = 922274 bytes
+BLAKE2s (xfce4-session-4.20.0.tar.bz2) = c65d407dd0ba272ebf46f30f6c0cb31644d317d92d68cc12ca3f5dff30b58d0f
+SHA512 (xfce4-session-4.20.0.tar.bz2) = 2e3b1280830fe3b26d39e87fcc26fd2be6df5f1328b64529c46cc51fe80abcc07b2996fd07af331ee2a502f025f40576cfb49a7ddaa9cc82b1f3cf17484f1dd6
+Size (xfce4-session-4.20.0.tar.bz2) = 1185603 bytes
SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5
SHA1 (patch-config.h.in) = d88c22147d46387494d5be929dce810a6c6d8778
SHA1 (patch-configure) = 94ec4aa0e528ec835929def8d9d401b123982efa
SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 965398a21b5b37a064fb00abf7c4dcb3a4208708
-SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
+SHA1 (patch-scripts_Makefile.in) = 3d52c2e302831101a48e3bf39c2cf49e88288529
SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
-SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = bd3133e9f1dc4a2069203d75058710fe66623c0e
-SHA1 (patch-xfsm-shutdown-helper_main.c) = db2dc4a7ce729b72092fa2777fd178cb3b7be258
+SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = 69649cb99423961f2b02f608c8c7253c4caae226
+SHA1 (patch-xfsm-shutdown-helper_main.c) = b5b4bd71d6998a677031b43243005845e7b52f67
Index: pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in
diff -u pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.3 pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.4
--- pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.3 Thu Jun 22 09:40:24 2017
+++ pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in Mon Jan 6 19:27:40 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-scripts_Makefile.in,v 1.3 2017/06/22 09:40:24 youri Exp $
+$NetBSD: patch-scripts_Makefile.in,v 1.4 2025/01/06 19:27:40 bsiegert Exp $
Adjust config path.
---- scripts/Makefile.in.orig 2015-03-16 07:29:45.000000000 +0000
+--- scripts/Makefile.in.orig 2024-12-15 09:26:08.000000000 +0000
+++ scripts/Makefile.in
-@@ -363,12 +363,12 @@ edit = $(SED) \
+@@ -387,7 +387,7 @@ edit = $(SED) \
-e "s,@_docdir_\@,$$(dirname $(docdir)),g" \
-e "s,@_sysconfdir_\@,$(sysconfdir),g"
@@ -13,9 +13,3 @@ Adjust config path.
conffiles_DATA = \
xinitrc \
Xft.xrdb
-
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/examples/xfce4/autostart
- autostart_in_files = xscreensaver.desktop.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
- EXTRA_DIST = \
Index: pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
diff -u pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c:1.3 pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c:1.4
--- pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c:1.3 Sun Feb 6 17:42:47 2022
+++ pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c Mon Jan 6 19:27:40 2025
@@ -1,22 +1,22 @@
-$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.3 2022/02/06 17:42:47 gutteridge Exp $
+$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.4 2025/01/06 19:27:40 bsiegert Exp $
Fix compilation on OSes other than Linux and the *BSDs.
---- xfce4-session/xfsm-shutdown-fallback.c.orig 2020-11-06 23:08:55.000000000 +0000
+--- xfce4-session/xfsm-shutdown-fallback.c.orig 2024-11-04 16:33:53.000000000 +0000
+++ xfce4-session/xfsm-shutdown-fallback.c
-@@ -373,7 +373,9 @@ xfsm_shutdown_fallback_try_action (XfsmS
- GError **error)
+@@ -343,7 +343,9 @@ xfsm_shutdown_fallback_try_action (XfsmS
+ GError **error)
{
const gchar *xfsm_helper_action;
-- const gchar *cmd __attribute__((unused));
+- const gchar *cmd __attribute__ ((unused));
+#ifdef __BACKEND_TYPE_BSD__
+ const gchar *cmd;
+#endif
gboolean ret = FALSE;
- gint exit_status = 0;
#ifdef HAVE_POLKIT
-@@ -384,29 +386,39 @@ xfsm_shutdown_fallback_try_action (XfsmS
- {
+ gchar *command = NULL;
+@@ -353,23 +355,33 @@ xfsm_shutdown_fallback_try_action (XfsmS
+ {
case XFSM_SHUTDOWN_SHUTDOWN:
xfsm_helper_action = "shutdown";
+#ifdef __BACKEND_TYPE_BSD__
@@ -34,28 +34,22 @@ Fix compilation on OSes other than Linux
+#ifdef __BACKEND_TYPE_BSD__
cmd = UP_BACKEND_SUSPEND_COMMAND;
+#endif
- /* On suspend we try to lock the screen */
- if (!lock_screen (error))
- return FALSE;
break;
case XFSM_SHUTDOWN_HIBERNATE:
xfsm_helper_action = "hibernate";
+#ifdef __BACKEND_TYPE_BSD__
cmd = UP_BACKEND_HIBERNATE_COMMAND;
+#endif
- /* On hibernate we try to lock the screen */
- if (!lock_screen (error))
- return FALSE;
break;
case XFSM_SHUTDOWN_HYBRID_SLEEP:
xfsm_helper_action = "hybrid-sleep";
+#ifdef __BACKEND_TYPE_BSD__
cmd = UP_BACKEND_HIBERNATE_COMMAND;
+#endif
- /* On hybrid sleep we try to lock the screen */
- if (!lock_screen (error))
- return FALSE;
-@@ -434,7 +446,7 @@ xfsm_shutdown_fallback_try_action (XfsmS
+ break;
+ default:
+ g_set_error (error, 1, 0, "Unknown shutdown type %d", type);
+@@ -394,7 +406,7 @@ xfsm_shutdown_fallback_try_action (XfsmS
#endif
if (!ret)
{
Index: pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
diff -u pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.4 pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.5
--- pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.4 Thu May 23 02:56:07 2019
+++ pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c Mon Jan 6 19:27:40 2025
@@ -1,33 +1,33 @@
-$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.4 2019/05/23 02:56:07 gutteridge Exp $
+$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.5 2025/01/06 19:27:40 bsiegert Exp $
Be careful to only SUSPEND or HIBERNATE when defined.
---- xfsm-shutdown-helper/main.c.orig 2019-05-05 22:00:21.000000000 +0000
+--- xfsm-shutdown-helper/main.c.orig 2024-10-11 05:36:33.000000000 +0000
+++ xfsm-shutdown-helper/main.c
@@ -183,22 +183,26 @@ main (int argc, char **argv)
}
- else if(suspend)
+ else if (suspend)
{
+#if defined(UP_BACKEND_SUSPEND_COMMAND)
if (run (UP_BACKEND_SUSPEND_COMMAND))
- {
- return EXIT_CODE_SUCCESS;
- }
- else
+ {
+ return EXIT_CODE_SUCCESS;
+ }
+ else
+#endif
- {
- return EXIT_CODE_FAILED;
- }
+ {
+ return EXIT_CODE_FAILED;
+ }
}
- else if(hibernate)
+ else if (hibernate)
{
+#if defined (UP_BACKEND_HIBERNATE_COMMAND)
if (run (UP_BACKEND_HIBERNATE_COMMAND))
- {
- return EXIT_CODE_SUCCESS;
- }
- else
+ {
+ return EXIT_CODE_SUCCESS;
+ }
+ else
+#endif
- {
- return EXIT_CODE_FAILED;
- }
+ {
+ return EXIT_CODE_FAILED;
+ }
Home |
Main Index |
Thread Index |
Old Index