diff options
Diffstat (limited to 'xfce-base/xfce4-session')
| -rw-r--r-- | xfce-base/xfce4-session/Manifest | 3 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch | 43 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild | 4 |
3 files changed, 49 insertions, 1 deletions
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index 69c7f56965a8..b49eab0210b4 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -1,11 +1,12 @@ AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48 AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f03f7ee891fe286d4cb2781393d1a836e89c5ab6b2f7e0bfdba3582549d054cc6beaefb805d83d12ff1fafc8581ce12d2e284314ac14ef6b3fd9cd1c724f1 SHA512 da3b4fcc3cd059db267807fc46db6b484a2cf9d27e457850adc71e465300eb3d776ae8f10c204f0d419dbfbb135fce60ee5a89a75aad8d3644c7ba749f0a2c83 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea +AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f EBUILD xfce4-session-4.12.1-r2.ebuild 1893 BLAKE2B 767bec90fd2e60d63c6d83c35104178505bdca2c4e79b342271cf73f6c299c32fbd3ad8d32ed61952a38757eed97f58e7916a197f6a21a4551ee69b459d726d0 SHA512 0e8a76a1d685b980aaaf7d837926dd22d6e8281f764744c5e9cb85fb06128876e8adf74bd127bf612a6dbd939c02e6e99240981d56cd80769b31ce84d6f84160 EBUILD xfce4-session-4.13.0-r1.ebuild 1820 BLAKE2B cf9018c5a77b4faf3d5b05725080d248d1d5f731fe3f469927511283ba0e0d345468f1e2296ee0d7b85eeb4f3465bec856cd0fda57abcf980c5706759d769b73 SHA512 de30ec68465bc12f9be4b6b54f44511d42c136e446a79e49fbea0eb7b8bb7fd0d75477d6aa5607d15cbfa397c68c24bb5fd40f953babe096aa94e147176dcad2 -EBUILD xfce4-session-4.13.1.ebuild 1776 BLAKE2B 954e327842b856fc5953a0cb0bf5715556b5cb0f7c758aabb58c0801879e989c153c1676a4cb2b8cc7403e681c340c9b126574f4f0dd885967e66adbab6475ca SHA512 2b73dab2044f0c9f3dbe3819bc4ec9a016e7c94edea87fb77cd6a654c62e4cfb2bd827af490bc356d54f1debf2977b02fd807d8de30a861e1b3edf2f96975b56 +EBUILD xfce4-session-4.13.1.ebuild 1912 BLAKE2B de6a89c260be73b8e01a98ab8737d8a53bbca0442c1d22d23d947fe914ec24f2635b6d1ce765fd6e8f8636f4de96e31707235fe0b285bc2fcc9efa39d686ba44 SHA512 5cf4fb7960a5ae8bcbf929d9e9a2599fa96d6441e240762929cc5e6392ebd2aae67aadc5d3a3777e74a6c312e5a8f1c44dd2e4d42728af072986a06a0239bb93 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203 diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch new file mode 100644 index 000000000000..cc5bb9d653ee --- /dev/null +++ b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch @@ -0,0 +1,43 @@ +From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001 +From: Brandon Bergren <xfce@bdragon.rtk0.net> +Date: Sun, 26 Aug 2018 10:28:05 -0400 +Subject: [PATCH] fix build failure when dbus is not in the system include path + (Bug #14386) + +The d-bus direct depenencies were taken out in 91860af3a38080, +but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h +and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left +in accidentally. +--- + xfce4-session/xfsm-error.c | 2 -- + xfce4-session/xfsm-global.h | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c +index 2b7f6c04..f0766f5f 100644 +--- a/xfce4-session/xfsm-error.c ++++ b/xfce4-session/xfsm-error.c +@@ -20,8 +20,6 @@ + #include <config.h> + #endif + +-#include <dbus/dbus-glib.h> +- + #include <xfce4-session/xfsm-error.h> + + #define XFSM_DBUS_NAME "org.xfce.SessionManager" +diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h +index d4587123..610d5bf7 100644 +--- a/xfce4-session/xfsm-global.h ++++ b/xfce4-session/xfsm-global.h +@@ -27,7 +27,6 @@ + #include <X11/SM/SMlib.h> + + #include <xfce4-session/xfsm-splash-screen.h> +-#include <dbus/dbus.h> + + typedef struct _FailsafeClient FailsafeClient; + struct _FailsafeClient +-- +2.19.0 + diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild index 7819b1d88835..d0df74cf881d 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild @@ -44,6 +44,10 @@ PATCHES=( # TODO: this patch needs updating for the new version, and finding # upstream bug. # "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch + + # fix building with no dbus dependency + # https://bugs.gentoo.org/667440 + "${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch ) src_configure() { |