diff options
Diffstat (limited to 'source/l')
| -rwxr-xr-x | source/l/gtk+3/gtk+3.SlackBuild | 2 | ||||
| -rw-r--r-- | source/l/qt5/patches/qt5.pulseaudio.diff | 12 | ||||
| -rwxr-xr-x | source/l/qt5/qt5.SlackBuild | 5 |
3 files changed, 2 insertions, 17 deletions
diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild index 140b24a51..fd7300307 100755 --- a/source/l/gtk+3/gtk+3.SlackBuild +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gtk+3 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/qt5/patches/qt5.pulseaudio.diff b/source/l/qt5/patches/qt5.pulseaudio.diff deleted file mode 100644 index 8d8f616d5..000000000 --- a/source/l/qt5/patches/qt5.pulseaudio.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp.orig 2014-12-05 17:26:44.000000000 +0100 -+++ qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp 2014-12-12 10:27:20.393735405 +0100 -@@ -29,7 +29,7 @@ - ['use_cras==1', { - 'use_pulseaudio%': 0, - }, { -- 'use_pulseaudio%': 1, -+ 'use_pulseaudio%': 0, - }], - ], - }, { - diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index 4ec23c9c9..0821b2ae5 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -143,10 +143,7 @@ cd - 1>/dev/null # If PulseAudio is not found, use the _alsa $TAG and disable it in the build: if ! pkg-config --exists libpulse 2>/dev/null ; then - # Forcibly disable pulseaudio in qtwebengine: - zcat $CWD/patches/qt5.pulseaudio.diff.gz | patch -p1 --verbose || exit 1 - # Disable pulseaudio in Qt5: - PULSEAUDIO_OPTION="-no-pulseaudio" + PULSEAUDIO_OPTION="-no-pulseaudio -no-webengine-pulseaudio" TAG="_alsa" else unset PULSEAUDIO_OPTION |