Comment 66 for bug 963895

Revision history for this message
In , Chemobejk (chemobejk) wrote :

I tried:

  $ git branch --no-track pulseaudio-fixes-backport-4.8 origin/KDE/4.8
  $ git checkout pulseaudio-fixes-backport-4.8
  $ git cherry-pick -x 3314a12de7f4d07ab6b1199de35829ce31f0f733
[ $ git cherry-pick -x 9b4872a60555c6352078e7f11809006999d151d6 ]

the first one already got non-trivial merge conflicts:

# both modified: backends/mixer_pulse.cpp
# both added: core/ControlPool.cpp
# both added: core/ControlPool.h
# both modified: core/mixdevice.cpp
# both modified: dbus/dbuscontrolwrapper.cpp
# both modified: dbus/dbuscontrolwrapper.h

which were beyond my knowledge to fix.