Skip to contentSkip to conversation

package/pulseaudio: remove kde files

PATCH New Romain Naour 3 participants 4 messages Jul 5, 2017

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/2 package/pulseaudio: remove kde files

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 <[email protected]>
---
 package/pulseaudio/pulseaudio.mk | 2 --
 1 file changed, 2 deletions(-)
package/pulseaudio/pulseaudio.mk +0 -2
index 0c409a7..54a9a61 100644
@@ -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
Signature · 1 line
2.9.4
author
#1 lore raw

PATCH 2/2 package/pulseaudio: update the condition on NLS

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 <[email protected]>
---
 package/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pulseaudio/pulseaudio.mk +1 -1
index 54a9a61..d6088b2 100644
@@ -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
Signature · 1 line
2.9.4
#2 lore raw

PATCH 1/2 package/pulseaudio: remove kde files

In reply to Romain Naour

Hello,

Quoted 9 lines · 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 <[email protected]>
---
 package/pulseaudio/pulseaudio.mk | 2 --
 1 file changed, 2 deletions(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 package/pulseaudio: remove kde files

In reply to Romain Naour
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> 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 <[email protected]>

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

Signature · 1 line
Bye, Peter Korsgaard