summaryrefslogtreecommitdiff
path: root/xfce-base
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-22 11:30:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-22 11:30:24 +0100
commitd56d144655e3785864da43c9acb6c228ef9360ae (patch)
treeb769b599a558483f82e9a057c41f1edd29626dd1 /xfce-base
parentfab849d1daed0ba7f2ac497d07985c3dbb692543 (diff)
gentoo resync : 22.06.2019
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/Manifest.gzbin2374 -> 2377 bytes
-rw-r--r--xfce-base/xfce4-session/Manifest1
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch43
-rw-r--r--xfce-base/xfconf/Manifest4
-rw-r--r--xfce-base/xfconf/xfconf-4.12.1-r1.ebuild30
-rw-r--r--xfce-base/xfconf/xfconf-4.13.7.ebuild30
6 files changed, 38 insertions, 70 deletions
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index d9a37ad6eca1..fbe96bec40fb 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
Binary files differ
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 1402a85a2cd2..180cf606eaa3 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,5 @@
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.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.2.tar.bz2 829041 BLAKE2B 3b5c8a5722b7a38a95e12ec2145e2c155928e0ee5d7d8e9f47c86ec4e03f34b983bcd3dcbc1a3d6c2d84f991ed8e9f59b7db76716862c91290280db507a8b84e SHA512 cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57
EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B 7c7b06cdd917d710fd5b00cd8344a7f9234c60e6d5797d55f2116468466c2d9b41050dfcde85720768d3c6571ed00c87477a929ba2922bd329c5d630e46e40c9 SHA512 a1ae9a240697d3ab38a28cf9a835b7516009f92a6a6961a07f1477e6e8709da7d2ce0c2ebdab2999b1fbf47a6cddd18d7152946e157669181ab04b48c0cfcf7a
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
deleted file mode 100644
index cc5bb9d653ee..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 2e4ccdc3f938..67fea5a45c00 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,5 @@
DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
DIST xfconf-4.13.7.tar.bz2 618676 BLAKE2B 8f7dd97530d4781e2d46d8139800f54991d932db5de0050e66d711bafef1daa0355383fd139789037a92b462042563a9aa2269295785b2f8217a0e9ff6a00c80 SHA512 113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d
-EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B b37314d0bc755c1144da7e9173e6998e2efcac9501362035ed0989fc8a148f2d55ba3dd7a182fac68994284b8bc98e386c202f9d67282b76d2506e2a9070b96a SHA512 e841c7e830bb3e016c29a968e756f4497f7942740eb2bc7c3f3e298de35189faa0af7d7968260a5dc1fea738fc645f2cd490ce40eb7adb6c28e4fba974717962
-EBUILD xfconf-4.13.7.ebuild 1644 BLAKE2B 8829022a08c21700ec90b0f350f8892fab125859c47ec4922b52cd9104a745203382d3d2ae5e153315f17be17be6ecc04771307cb5a9dce691b3993f47c0e52b SHA512 d28e2c4989873b338166fa2a9837553b1ceb366d20befea84414b7b8b894c2801d14d7be22b7b547595f32d3621d6cda4dca0a697eb83c720fb10412e77bc343
+EBUILD xfconf-4.12.1-r1.ebuild 1970 BLAKE2B 5e6d818e036db093d5de9b2aea3adaaa88fa92e98b0547c1b7be193e7fa0d9b7ad20b603933c57a59feece033e92f6f8999cf068c3e381176591aa083176eed4 SHA512 df30f7ddfdda23dfdac4798bb7fe2949eed020afe93f85faf558adb386d688d8d001693e0cba49d4708c3aac8b66a2a65505de2599e82049f6ab3f146fb82fea
+EBUILD xfconf-4.13.7.ebuild 1792 BLAKE2B 37d24e96543323f9c7eaf6b2c92270d0922690c386339f12f70b13760c7b45dc90818070edc505252b185493af245fb0e36084de6343f01bef53c4c08d8ad575 SHA512 d503fe53ebb7daf10a986bc925c082f01c30cb1141d13d055a7d602ef0f81edf37c53bec39894fced36ce25b4168598300b4290da3954f037b8c3a0c782ee1b4
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
index 0f7f61db433d..369075b38785 100644
--- a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit virtualx xdg-utils
+inherit xdg-utils
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
@@ -57,20 +57,26 @@ src_compile() {
emake OTHERLDFLAGS="${LDFLAGS}"
}
-my_test() {
- local out=$(./xfconfd/xfconfd --daemon) || return 1
- eval "${out}"
+src_test() {
+ local service_dir=${HOME}/.local/share/dbus-1/services
+ mkdir -p "${service_dir}" || die
+ cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
+ [D-BUS Service]
+ Name=org.xfce.Xfconf
+ Exec=${S}/xfconfd/xfconfd
+ EOF
- local ret=0
- # https://bugzilla.xfce.org/show_bug.cgi?id=13840
- nonfatal emake -j1 check || ret=1
+ (
+ # start isolated dbus session bus
+ dbus_data=$(dbus-launch --sh-syntax) || exit
+ eval "${dbus_data}"
- kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
- return "${ret}"
-}
+ nonfatal emake check
+ ret=${?}
-src_test() {
- virtx my_test
+ kill "${DBUS_SESSION_BUS_PID}"
+ exit "${ret}"
+ ) || die
}
src_install() {
diff --git a/xfce-base/xfconf/xfconf-4.13.7.ebuild b/xfce-base/xfconf/xfconf-4.13.7.ebuild
index a7c2bde44131..8e6b32d8356c 100644
--- a/xfce-base/xfconf/xfconf-4.13.7.ebuild
+++ b/xfce-base/xfconf/xfconf-4.13.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit virtualx xdg-utils
+inherit xdg-utils
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
@@ -48,20 +48,26 @@ src_compile() {
emake OTHERLDFLAGS="${LDFLAGS}"
}
-my_test() {
- local out=$(./xfconfd/xfconfd --daemon) || return 1
- eval "${out}"
+src_test() {
+ local service_dir=${HOME}/.local/share/dbus-1/services
+ mkdir -p "${service_dir}" || die
+ cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
+ [D-BUS Service]
+ Name=org.xfce.Xfconf
+ Exec=${S}/xfconfd/xfconfd
+ EOF
- local ret=0
- # https://bugzilla.xfce.org/show_bug.cgi?id=13840
- nonfatal emake -j1 check || ret=1
+ (
+ # start isolated dbus session bus
+ dbus_data=$(dbus-launch --sh-syntax) || exit
+ eval "${dbus_data}"
- kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
- return "${ret}"
-}
+ nonfatal emake check
+ ret=${?}
-src_test() {
- virtx my_test
+ kill "${DBUS_SESSION_BUS_PID}"
+ exit "${ret}"
+ ) || die
}
src_install() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 13:35:09 +0000