[Buildroot] [PATCH 1/2] package/pulseaudio: remove kde files

[Buildroot] [PATCH 1/2] package/pulseaudio: remove kde files

[Romain Naour]

Upstream removed the src/daemon/pulseaudio-kde.desktop.in since the
version 6.0 [1].

[1] https://github.com/pulseaudio/pulseaudio/commit/f46799579f438125b695dced4edf8bca05cbe90a

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 package/pulseaudio/pulseaudio.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 0c409a7..54a9a61 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -121,8 +121,6 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 define PULSEAUDIO_FIXUP_DESKTOP_FILES
 	cp $(@D)/src/daemon/pulseaudio.desktop.in \
 		$(@D)/src/daemon/pulseaudio.desktop
-	cp $(@D)/src/daemon/pulseaudio-kde.desktop.in \
-		$(@D)/src/daemon/pulseaudio-kde.desktop
 endef
 PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES
 endif
-- 
2.9.4

[Buildroot] [PATCH 2/2] package/pulseaudio: update the condition on NLS

[Romain Naour]

Since the BR2_SYSTEM_ENABLE_NLS has been introduced [1], the
NLS support can be disabled when BR2_ENABLE_LOCALE is enabled.

So change BR2_ENABLE_LOCALE by BR2_SYSTEM_ENABLE_NLS and while
at it use a positive logic.

Fixes:
[nios2]  http://autobuild.buildroot.net/results/b69/b69c347e2866a97cc2c5d4844d567c4448592d72
[xtensa] http://autobuild.buildroot.net/results/b63/b63fd204fe36200ed5de70fff23cb59cf2bc778c

[1] dc057d2865afafbf76c2bc2685d2dfe852ba7c54

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 package/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 54a9a61..d6088b2 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -117,7 +117,7 @@ PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
 
 # .desktop file generation needs nls support, so fake it for !locale builds
 # https://bugs.freedesktop.org/show_bug.cgi?id=54658
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
 define PULSEAUDIO_FIXUP_DESKTOP_FILES
 	cp $(@D)/src/daemon/pulseaudio.desktop.in \
 		$(@D)/src/daemon/pulseaudio.desktop
-- 
2.9.4

[Buildroot] [PATCH 1/2] package/pulseaudio: remove kde files

[Thomas Petazzoni]

Hello,

On Wed,  5 Jul 2017 13:22:03 +0200, Romain Naour wrote:
> Upstream removed the src/daemon/pulseaudio-kde.desktop.in since the
> version 6.0 [1].
> 
> [1] https://github.com/pulseaudio/pulseaudio/commit/f46799579f438125b695dced4edf8bca05cbe90a
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
>  package/pulseaudio/pulseaudio.mk | 2 --
>  1 file changed, 2 deletions(-)

Both applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/pulseaudio: remove kde files

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:

 > Upstream removed the src/daemon/pulseaudio-kde.desktop.in since the
 > version 6.0 [1].

 > [1] https://github.com/pulseaudio/pulseaudio/commit/f46799579f438125b695dced4edf8bca05cbe90a

 > Signed-off-by: Romain Naour <romain.naour@smile.fr>

Committed to 2017.02.x and 2017.05.x, thanks.

-- 
Bye, Peter Korsgaard