<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> Tanu Kaskinen pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio">PulseAudio / pulseaudio</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/470c210cdc865be52cc2bd42cdb14d5d162f6d50">470c210c</a> <div> by Rickie Schroeder at 2019-10-31T13:42:41Z </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">start-pulseaudio-x11: fix KDE version check Current check wasn't working in case when $DESKTOP_SESSION wasn't set which happens when session is started without display manager like sddm. Parsing "plasmashell -v" output should be more reliable and less hacky. This also changes legacy backticks `...` to modern $(...) as recommended by shellcheck: https://github.com/koalaman/shellcheck/wiki/SC2006 Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/751 </pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#0ee8d1cf8962ad0b923ced86b471994e2fea259c"> src/daemon/start-pulseaudio-x11.in </a> </li> </ul> <h4>Changes:</h4> <li id="0ee8d1cf8962ad0b923ced86b471994e2fea259c"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/470c210cdc865be52cc2bd42cdb14d5d162f6d50#0ee8d1cf8962ad0b923ced86b471994e2fea259c">src/daemon/start-pulseaudio-x11.in</a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="22" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="22" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -22,9 +22,11 @@ if [ x"$DISPLAY" != x ] ; then</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="22" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 22 </td> <td class="diff-line-num new_line" data-linenumber="22" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 22 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="23" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 23 </td> <td class="diff-line-num new_line" data-linenumber="23" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 23 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="24" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 24 </td> <td class="diff-line-num new_line" data-linenumber="24" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 24 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="25" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="25" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 25 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ # KDE plasma versions older than 5.17.0 use module-device-manager's routing API. </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="25" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="26" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 26 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ # Check for current plasma version and load module if it's necessary. </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="25" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 25 </td> <td class="diff-line-num new_line" data-linenumber="27" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 27 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if [ x"$KDE_FULL_SESSION" = x"true" ]; then </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="diff-line-num old old_line" data-linenumber="26" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 26 </td> <td class="diff-line-num new_line old" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- plasmaversion=`grep "X-KDE-PluginInfo-Version" $DESKTOP_SESSION.desktop | cut -d "=" -f2 | cut -d "." -f1,2 | tr -d "."` </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="diff-line-num old old_line" data-linenumber="27" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 27 </td> <td class="diff-line-num new_line old" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- if [ "$plasmaversion" -lt "517" ]; then </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 28 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ plasmaversion="$(plasmashell -v 2>/dev/null | sed -n 's/^plasmashell $[0-9][0-9]*$\.$[0-9][0-9]*$\.$[0-9][0-9]*$/\1*1000000+\2*1000+\3/p' | head -1)" </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="29" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 29 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if [ -n "$plasmaversion" ] && [ "$((plasmaversion))" -lt "5017000" ]; then </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="28" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 28 </td> <td class="diff-line-num new_line" data-linenumber="30" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 30 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="29" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 29 </td> <td class="diff-line-num new_line" data-linenumber="31" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 31 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> fi </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="30" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 30 </td> <td class="diff-line-num new_line" data-linenumber="32" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 32 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> fi </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/470c210cdc865be52cc2bd42cdb14d5d162f6d50">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/470c210cdc865be52cc2bd42cdb14d5d162f6d50"}}</script> </div> </body> </html>