diff options
| author |   Elvis Pranskevichus <elvis@magic.io> | 2016-05-24 16:30:12 -0400 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-05-25 08:03:15 +0000 |
| commit | 571fb5ac57eb4180e61c5f5a8792f893d0b5ce9d (patch) | |
| tree | f4d07ae89a5de7df9e2eeb63f97951a892fd43ce /dev-util/electron/files | |
| parent | dev-python/python-ctags: bump to 1.2.3, add py3 support, tests (diff) | |
| download | gentoo-571fb5ac57eb4180e61c5f5a8792f893d0b5ce9d.tar.gz gentoo-571fb5ac57eb4180e61c5f5a8792f893d0b5ce9d.tar.bz2 gentoo-571fb5ac57eb4180e61c5f5a8792f893d0b5ce9d.zip | |
dev-util/electron: Fix erroneous dependency on gconf with USE="-gnome"
Gentoo-Bug: https://bugs.gentoo.org/583130
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1530
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-util/electron/files')
| -rw-r--r-- | dev-util/electron/files/brightray-gentoo-build-fixes-r1.patch (renamed from dev-util/electron/files/brightray-gentoo-build-fixes.patch) | 52 |
1 files changed, 46 insertions, 6 deletions
diff --git a/dev-util/electron/files/brightray-gentoo-build-fixes.patch b/dev-util/electron/files/brightray-gentoo-build-fixes-r1.patch index a67808457752..3e67d247ace1 100644 --- a/dev-util/electron/files/brightray-gentoo-build-fixes.patch +++ b/dev-util/electron/files/brightray-gentoo-build-fixes-r1.patch @@ -1,28 +1,38 @@ -From c9e2e0237170884bc1069a64f2635bb1ffc1b948 Mon Sep 17 00:00:00 2001 +From e2aabe2618ee91c3f6e817c72370573f45c8b20e Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus <elvis@magic.io> Date: Mon, 8 Feb 2016 15:14:58 -0500 Subject: [PATCH] brightray build fixes --- - brightray.gyp | 5 +++-- + brightray.gyp | 32 +++++++++++++++++++++++++++++--- brightray.gypi | 21 ++++++++------------- - 2 files changed, 11 insertions(+), 15 deletions(-) + 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/brightray.gyp b/brightray.gyp -index d7120ea..6150318 100644 +index d7120ea..b23c1eb 100644 --- a/brightray.gyp +++ b/brightray.gyp -@@ -9,6 +9,9 @@ +@@ -1,7 +1,7 @@ + { + 'variables': { + # The libraries brightray will be compiled to. +- 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss' ++ 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss' + }, + 'includes': [ + 'filenames.gypi', +@@ -9,6 +9,10 @@ 'targets': [ { 'target_name': 'brightray', + 'dependencies': [ ++ 'gconf', + '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all' + ], 'type': 'static_library', 'include_dirs': [ '.', -@@ -100,8 +103,6 @@ +@@ -100,8 +104,6 @@ }, { 'link_settings': { 'libraries': [ @@ -31,6 +41,36 @@ index d7120ea..6150318 100644 # Following libraries are required by libchromiumcontent: '-lasound', '-lcap', +@@ -274,5 +276,29 @@ + }], # OS=="win" + ], + }, ++ { ++ 'target_name': 'gconf', ++ 'type': 'none', ++ 'conditions': [ ++ ['use_gconf==1 and _toolset=="target"', { ++ 'direct_dependent_settings': { ++ 'cflags': [ ++ '<!@(<(pkg-config) --cflags gconf-2.0)', ++ ], ++ 'defines': [ ++ 'USE_GCONF', ++ ], ++ }, ++ 'link_settings': { ++ 'ldflags': [ ++ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', ++ ], ++ 'libraries': [ ++ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', ++ ], ++ }, ++ }], ++ ], ++ }, + ], + } diff --git a/brightray.gypi b/brightray.gypi index 4513fa9..95bdfa1 100644 --- a/brightray.gypi |