aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/xfce4-session/Makefile14
-rw-r--r--x11-wm/xfce4-session/distinfo4
-rw-r--r--x11-wm/xfce4-session/files/patch-xfce4-session-logout__main.c38
-rw-r--r--x11-wm/xfce4-session/files/patch-xfce4-session__xfsm-manager.c132
-rw-r--r--x11-wm/xfce4-session/pkg-plist1
5 files changed, 8 insertions, 181 deletions
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 643437e44f61..649810fe2083 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= xfce4-session
-PORTVERSION= 4.10.0
-PORTREVISION= 4
+PORTVERSION= 4.10.1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
@@ -27,17 +27,17 @@ USE_GMAKE= yes
USE_GNOME= gtk20 glib20 intltool intlhack
USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_XFCE= configenv libmenu libutil panel xfconf
+USE_XFCE= configenv libmenu libutil xfconf
USE_XORG= x11 sm ice
CONFIGURE_ARGS+=--enable-legacy-sm \
- --disable-libgnome-keyring \
+ --disable-systemd \
--with-xsession-prefix=${PREFIX}
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-OPTIONS_DEFINE= NLS GNUPG
+OPTIONS_DEFINE= NLS
MAN1= xfce4-session.1 xfce4-session-logout.1
@@ -54,10 +54,6 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-.if ${PORT_OPTIONS:MGNUPG}
-RUN_DEPENDS+= gpg-agent:${PORTSDIR}/security/gnupg
-.endif
-
post-install:
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index c5813be7a1fa..f8466cf8fccb 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-session-4.10.0.tar.bz2) = bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce
-SIZE (xfce4/xfce4-session-4.10.0.tar.bz2) = 1257385
+SHA256 (xfce4/xfce4-session-4.10.1.tar.bz2) = 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83
+SIZE (xfce4/xfce4-session-4.10.1.tar.bz2) = 1273015
diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session-logout__main.c b/x11-wm/xfce4-session/files/patch-xfce4-session-logout__main.c
deleted file mode 100644
index 6808c344632e..000000000000
--- a/x11-wm/xfce4-session/files/patch-xfce4-session-logout__main.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./xfce4-session-logout/main.c.orig 2012-04-28 20:43:27.000000000 +0000
-+++ ./xfce4-session-logout/main.c 2013-02-18 19:18:45.000000000 +0000
-@@ -48,7 +48,7 @@
- gboolean opt_reboot = FALSE;
- gboolean opt_suspend = FALSE;
- gboolean opt_hibernate = FALSE;
--gboolean allow_save = FALSE;
-+gboolean opt_fast = FALSE;
- gboolean opt_version = FALSE;
-
- enum
-@@ -83,7 +83,7 @@
- N_("Hibernate without displaying the logout dialog"),
- NULL
- },
-- { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &allow_save,
-+ { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_fast,
- N_("Log out quickly; don't save the session"),
- NULL
- },
-@@ -123,6 +123,7 @@
- gboolean show_dialog;
- gboolean result = FALSE;
- guint shutdown_type;
-+ gboolean allow_save;
-
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-@@ -149,6 +150,9 @@
- return EXIT_FAILURE;
- }
-
-+ /* save the session, unless fast is provided */
-+ allow_save = !opt_fast;
-+
- /* create messsage */
- proxy = dbus_g_proxy_new_for_name_owner (conn,
- "org.xfce.SessionManager",
diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session__xfsm-manager.c b/x11-wm/xfce4-session/files/patch-xfce4-session__xfsm-manager.c
deleted file mode 100644
index a47236aa4d35..000000000000
--- a/x11-wm/xfce4-session/files/patch-xfce4-session__xfsm-manager.c
+++ /dev/null
@@ -1,132 +0,0 @@
---- ./xfce4-session/xfsm-manager.c.orig 2012-04-28 20:43:27.000000000 +0000
-+++ ./xfce4-session/xfsm-manager.c 2013-02-18 19:14:56.000000000 +0000
-@@ -98,6 +98,7 @@
-
- XfsmShutdownType shutdown_type;
- XfsmShutdown *shutdown_helper;
-+ gboolean save_session;
-
- gboolean session_chooser;
- gchar *session_name;
-@@ -230,6 +231,7 @@
- manager->failsafe_mode = TRUE;
- manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
- manager->shutdown_helper = xfsm_shutdown_get ();
-+ manager->save_session = TRUE;
-
- manager->pending_properties = g_queue_new ();
- manager->starting_properties = g_queue_new ();
-@@ -989,7 +991,9 @@
- XfsmClient *cl = lp->data;
- if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
- {
-- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
-+ /* a client is already interacting, so new client has to wait */
-+ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
-+ xfsm_manager_cancel_client_save_timeout(manager, client);
- return;
- }
- }
-@@ -1138,44 +1142,47 @@
- }
- }
-
-- if (!shutdown || shutdown_save)
-+ /* don't save the session if shutting down without save */
-+ manager->save_session = !shutdown || shutdown_save;
-+
-+ if (save_type == SmSaveBoth && !manager->save_session)
- {
-- xfsm_manager_set_state (manager,
-- shutdown
-- ? XFSM_MANAGER_SHUTDOWN
-- : XFSM_MANAGER_CHECKPOINT);
-+ /* saving the session, so clients should
-+ * (prompt to) save the user data only */
-+ save_type = SmSaveGlobal;
-+ }
-
-- /* handle legacy applications first! */
-- xfsm_legacy_perform_session_save ();
-+ xfsm_manager_set_state (manager,
-+ shutdown
-+ ? XFSM_MANAGER_SHUTDOWN
-+ : XFSM_MANAGER_CHECKPOINT);
-
-- for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
-- lp;
-- lp = lp->next)
-- {
-- XfsmClient *client = lp->data;
-- XfsmProperties *properties = xfsm_client_get_properties (client);
-- const gchar *program;
-+ /* handle legacy applications first! */
-+ if (manager->save_session)
-+ xfsm_legacy_perform_session_save ();
-
-- /* xterm's session management is broken, so we won't
-- * send a SAVE YOURSELF to xterms */
-- program = xfsm_properties_get_string (properties, SmProgram);
-- if (program != NULL && strcasecmp (program, "xterm") == 0)
-- continue;
-+ for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
-+ lp;
-+ lp = lp->next)
-+ {
-+ XfsmClient *client = lp->data;
-+ XfsmProperties *properties = xfsm_client_get_properties (client);
-+ const gchar *program;
-
-- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-- {
-- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
-- interact_style, fast);
-- }
-+ /* xterm's session management is broken, so we won't
-+ * send a SAVE YOURSELF to xterms */
-+ program = xfsm_properties_get_string (properties, SmProgram);
-+ if (program != NULL && strcasecmp (program, "xterm") == 0)
-+ continue;
-
-- xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-- xfsm_manager_start_client_save_timeout (manager, client);
-+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+ {
-+ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
-+ interact_style, fast);
- }
-- }
-- else
-- {
-- /* shutdown session without saving */
-- xfsm_manager_perform_shutdown (manager);
-+
-+ xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-+ xfsm_manager_start_client_save_timeout (manager, client);
- }
- }
-
-@@ -1249,7 +1256,12 @@
- XfsmClient *client,
- gboolean success)
- {
-- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in
-+ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone
-+ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */
-+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING &&
-+ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL &&
-+ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT)
- {
- xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being "
- "in save mode. Prepare to be nuked!\n",
-@@ -1521,7 +1533,8 @@
- xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n");
-
- /* all clients done, store session data */
-- xfsm_manager_store_session (manager);
-+ if (manager->save_session)
-+ xfsm_manager_store_session (manager);
-
- if (manager->state == XFSM_MANAGER_CHECKPOINT)
- {
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 953de0ef2852..99be57412666 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -92,6 +92,7 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/si/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/te/LC_MESSAGES/xfce4-session.mo
generated by cgit (git 2.34.1) at 2024-12-04 02:56:19 +0800