summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLandry Breuil <landry@rhaalovely.net>2015-03-16 11:43:52 +0100
committerLandry Breuil <landry@rhaalovely.net>2015-03-16 11:43:52 +0100
commit0d2583edc3e1f9b2be00f0a3de034d08a8600839 (patch)
tree8ee55701a0816a20b3fd5dc249f5b083b26bb68e
parentbaf4f240dd55b4497125e873f7c2c70716471db7 (diff)
xfce4-session 4.12.1
-rw-r--r--xfce4-session/Makefile8
-rw-r--r--xfce4-session/distinfo4
-rw-r--r--xfce4-session/patches/patch-xfce4-session_xfsm-manager_c55
3 files changed, 7 insertions, 60 deletions
diff --git a/xfce4-session/Makefile b/xfce4-session/Makefile
index 8cbb3f8..51c909d 100644
--- a/xfce4-session/Makefile
+++ b/xfce4-session/Makefile
@@ -3,7 +3,7 @@
COMMENT= Xfce4 session manager
XFCE_PROJECT= xfce4-session
-XFCE_VERSION= 4.12.0
+XFCE_VERSION= 4.12.1
SHARED_LIBS += xfsm-4.6 1.0 # .0.0
@@ -22,8 +22,10 @@ CONFIGURE_ARGS= --disable-linker-opts \
#CONFIGURE_ARGS+= --enable-session-screenshots
#XXX session-screenshots broken?
# http://bugzilla.xfce.org/show_bug.cgi?id=6885
-LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.9.0\
+LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.12.1 \
x11/xfce4/xfconf>=4.9.0 \
+ sysutils/upower \
+ sysutils/polkit \
devel/libwnck
WANTLIB += ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage
@@ -34,7 +36,7 @@ WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs startup-notification-1 wnck-1 xcb xcb-util
WANTLIB += xcb-render xcb-shm xfce4ui-1 xfce4util xfconf-0 z
-WANTLIB += harfbuzz graphite2
+WANTLIB += harfbuzz graphite2 upower-glib polkit-gobject-1
FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session \
conffilesdir=${PREFIX}/share/examples/xfce4-session \
diff --git a/xfce4-session/distinfo b/xfce4-session/distinfo
index 75b653c..3697f5f 100644
--- a/xfce4-session/distinfo
+++ b/xfce4-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-session-4.12.0.tar.bz2) = aMhUU7CX062lc9y35yrNBuD8NFMZlhIsENIAlkBbewY=
-SIZE (xfce4/xfce4-session-4.12.0.tar.bz2) = 1247710
+SHA256 (xfce4/xfce4-session-4.12.1.tar.bz2) = l9fyotCvfzYjto0fBAkeApE7KPlVXauLDSbIoSmdCP0=
+SIZE (xfce4/xfce4-session-4.12.1.tar.bz2) = 1289284
diff --git a/xfce4-session/patches/patch-xfce4-session_xfsm-manager_c b/xfce4-session/patches/patch-xfce4-session_xfsm-manager_c
deleted file mode 100644
index 2f4dff3..0000000
--- a/xfce4-session/patches/patch-xfce4-session_xfsm-manager_c
+++ /dev/null
@@ -1,55 +0,0 @@
-$OpenBSD$
-https://bugzilla.xfce.org/attachment.cgi?id=6043
---- xfce4-session/xfsm-manager.c.orig Sat Feb 28 17:28:00 2015
-+++ xfce4-session/xfsm-manager.c Sat Mar 7 14:16:08 2015
-@@ -1652,8 +1652,6 @@ xfsm_manager_store_session (XfsmManager *manager)
- GdkDisplay *display;
- WnckScreen *screen;
- XfceRc *rc;
-- GFile *session_file;
-- GFileInfo *info;
- GList *lp;
- gchar prefix[64];
- gchar *backup;
-@@ -1673,32 +1671,6 @@ xfsm_manager_store_session (XfsmManager *manager)
- return;
- }
-
-- session_file = g_file_new_for_path (manager->session_file);
--
-- /* query the file, we need to make sure we can write to it */
-- info = g_file_query_info (session_file,
-- G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
-- G_FILE_QUERY_INFO_NONE,
-- NULL,
-- NULL);
--
-- /* if we're unable to query the file attributes or write to the file,
-- * log the failure and return */
-- if (!info || !g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
-- {
-- fprintf (stderr,
-- "xfce4-session: Unable to save changes to the session file %s"
-- "Please check your installation.\n", manager->session_file);
--
-- if (info)
-- g_object_unref (info);
--
-- xfce_rc_close (rc);
-- g_object_unref (session_file);
--
-- return;
-- }
--
- /* backup the old session file first */
- if (g_file_test (manager->session_file, G_FILE_TEST_IS_REGULAR))
- {
-@@ -1771,8 +1743,6 @@ xfsm_manager_store_session (XfsmManager *manager)
- xfce_rc_write_int_entry (rc, "LastAccess", time (NULL));
-
- xfce_rc_close (rc);
--
-- g_object_unref (session_file);
-
- g_free (manager->checkpoint_session_name);
- manager->checkpoint_session_name = NULL;