aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Fish <gentoo@seaofdirac.net>2019-07-19 09:30:59 +0200
committerNicholas Fish <gentoo@seaofdirac.net>2019-07-19 09:30:59 +0200
commit120f4f8cd1fa36698d22409e2c6875ab26a6230b (patch)
treed1091b919ee6afd1c0197583cca8a89ac28efb7f /gnome-base
parentapp-admin/terraform: Add latest version (diff)
downloadennui-120f4f8cd1fa36698d22409e2c6875ab26a6230b.tar.gz
ennui-120f4f8cd1fa36698d22409e2c6875ab26a6230b.tar.bz2
ennui-120f4f8cd1fa36698d22409e2c6875ab26a6230b.zip
gnome-base/dconf: Neuter D-Bus from build
Signed-off-by: Nicholas Fish <gentoo@seaofdirac.net>
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/dconf/Manifest3
-rw-r--r--gnome-base/dconf/dconf-0.30.1.ebuild1
-rw-r--r--gnome-base/dconf/files/dconf-0.30.1-disable-dbus.patch40
3 files changed, 43 insertions, 1 deletions
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 394e751..2555d69 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,4 +1,5 @@
AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
+AUX dconf-0.30.1-disable-dbus.patch 1400 BLAKE2B 7523103193e0720fdc801340c1c64b275ce15b48876e04d9a621717528ef5b5fd169ddbb6d3ef16ddaf681ac1cb8145ffed7d6b75f7019d0a38d1dcbb71c5457 SHA512 6fb08fb1a5b77294a4f519adb68ce682b7ee635bd724ad68bb317eb3c28d895627a5568d55f13d8375d82095d3c7805bf173ddfa00caec4baf2eaa7f80f66336
DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
-EBUILD dconf-0.30.1.ebuild 1818 BLAKE2B ace3606730256cbb64c3d60e4f590aae9c7ffcbe2f8a72239ced6e3c2c677918605cc88e195fa04fa878f28be774b0be2123b3e083650b43751977c24a212265 SHA512 9f18fb98092e15cf962f5143b3f78fe8579c730e7abfccd58c5837c2a3a62477cea838ef205efaf50819a61914e13f84f75874306b03c36bc947ad9a6eb04098
+EBUILD dconf-0.30.1.ebuild 1857 BLAKE2B cf128c6cfc8168f1428b67e660f46b1925715af528eae35fd6e3a7db232f9b77edce8be5609472ff3614195cf65a85dfc9ed4ea3fd9520fe3580ccabfb4abed1 SHA512 d60f2357e0786f258240cf0b66d26f8b1680cb8eb54daa988ff72d06fa81842e2dcc551fa9ace931f4597601ab3171f0375b759f007a6d47663d88b3c7e0712d
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
index d000f8b..290233f 100644
--- a/gnome-base/dconf/dconf-0.30.1.ebuild
+++ b/gnome-base/dconf/dconf-0.30.1.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PV}-bash-completion-dir.patch
+ "${FILESDIR}"/${P}-disable-dbus.patch
)
src_prepare() {
diff --git a/gnome-base/dconf/files/dconf-0.30.1-disable-dbus.patch b/gnome-base/dconf/files/dconf-0.30.1-disable-dbus.patch
new file mode 100644
index 0000000..d08b52b
--- /dev/null
+++ b/gnome-base/dconf/files/dconf-0.30.1-disable-dbus.patch
@@ -0,0 +1,40 @@
+diff --git a/meson.build b/meson.build
+index f5bbbcf..7fa8a38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,7 +46,8 @@ gio_unix_dep = dependency('gio-unix-2.0', version: gio_req_version)
+ glib_dep = dependency('glib-2.0', version: '>= 2.44.0')
+
+ gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir])
+-dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir])
++# Disable DBUS from build
++#dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir])
+
+ enable_bash_completion = get_option('bash_completion')
+ if enable_bash_completion
+diff --git a/service/meson.build b/service/meson.build
+index d92b982..e5b0621 100644
+--- a/service/meson.build
++++ b/service/meson.build
+@@ -3,13 +3,14 @@ service_conf.set('libexecdir', dconf_libexecdir)
+
+ service = dconf_namespace + '.service'
+
+-configure_file(
+- input: service + '.in',
+- output: service,
+- configuration: service_conf,
+- install: true,
+- install_dir: dbus_session_service_dir,
+-)
++# Disable DBUS from build
++#configure_file(
++# input: service + '.in',
++# output: service,
++# configuration: service_conf,
++# install: true,
++# install_dir: dbus_session_service_dir,
++#)
+
+ lib_sources = [
+ 'dconf-blame.c',