commit: 571fb5ac57eb4180e61c5f5a8792f893d0b5ce9d Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io> AuthorDate: Tue May 24 20:30:12 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed May 25 08:03:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571fb5ac
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 <AT> gentoo.org> ...n-0.36.12.ebuild => electron-0.36.12-r1.ebuild} | 4 +- ...patch => brightray-gentoo-build-fixes-r1.patch} | 52 +++++++++++++++++++--- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dev-util/electron/electron-0.36.12.ebuild b/dev-util/electron/electron-0.36.12-r1.ebuild similarity index 99% rename from dev-util/electron/electron-0.36.12.ebuild rename to dev-util/electron/electron-0.36.12-r1.ebuild index 6bb1381..01be177 100644 --- a/dev-util/electron/electron-0.36.12.ebuild +++ b/dev-util/electron/electron-0.36.12-r1.ebuild @@ -5,7 +5,7 @@ EAPI="5" PYTHON_COMPAT=( python2_7 ) -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_419 et fa fi fil fr gu he +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" @@ -279,7 +279,7 @@ src_prepare() { # brightray patches cd "${BRIGHTRAY_S}" || die - epatch "${FILESDIR}/brightray-gentoo-build-fixes.patch" + epatch "${FILESDIR}/brightray-gentoo-build-fixes-r1.patch" # libcc patches cd "${LIBCC_S}" || die diff --git a/dev-util/electron/files/brightray-gentoo-build-fixes.patch b/dev-util/electron/files/brightray-gentoo-build-fixes-r1.patch similarity index 64% rename from dev-util/electron/files/brightray-gentoo-build-fixes.patch rename to dev-util/electron/files/brightray-gentoo-build-fixes-r1.patch index a678084..3e67d24 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 <el...@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
