Convert patch from Debian to Arch

Csosa · 2011-06-09 20:36:55

http://sources.gentoo.org/cgi-bin/viewv … threv=HEAD

This patch solves the problem between pulseaudio and xcb-util. I think it refers to debian-specific directories, and that's why it fails for me:

$ sudo patch -p1 < ~/Downloads/pulseaudio-xcb-util-0.3.8-debian.patch 
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/debian/control b/debian/control
|index dc793f9..f3a7b72 100644
|--- a/debian/control
|+++ b/debian/control
--------------------------
File to patch:

Can someone rewrite this into an Arch-friendly patch?

Related links:
http://aur.archlinux.org/packages.php?ID=13916 <~~ Awesome-git AUR page
http://bugs.gentoo.org/show_bug.cgi?id=364965 <~~ Gentoo page where this bug and its patches are discussed
http://pulseaudio.org/ticket/927 <~~ Relevant PulseAudio bug report

Last edited by Csosa (2011-06-09 22:35:49)

ConnorBehan · 2011-06-09 22:14:29

The fix would be to remove entire blocks that refer to debian directories... but are you sure you posted the right patch? It looks like it only patches configure.ac and x11prop.c

Csosa · 2011-06-09 22:16:01

ConnorBehan wrote:

The fix would be to remove entire blocks that refer to debian directories... but are you sure you posted the right patch? It looks like it only patches configure.ac and x11prop.c

Right. This is the (newest version of the) only patch I've found. Do those files have Arch equivalents? This patch is mentioned in the Awesome-git AUR page as a solution.

Last edited by Csosa (2011-06-09 22:21:23)

ConnorBehan · 2011-06-09 23:56:35

The old version (which I can't find in any of the links you've posted) is failing because your system can't find the debian directory. But you're saying the new version is failing because it can't find configure.ac and x11prop.c? Those should be easy to find then. They are in the pulseaudio source tarball. They are not distro-specific files.

rickeyski · 2011-06-13 19:31:44

Why are you trying to use the debian patch when you can use the gentoo patches in the pkgbuild?? The gentoo patch you linked to in your first is correct and doesn't have any reference to debian/control. I only had to patch x11prop.c to rebuild

Last edited by rickeyski (2011-06-13 19:43:40)

Csosa · 2011-06-21 16:48:19

rickeyski wrote:

Why are you trying to use the debian patch when you can use the gentoo patches in the pkgbuild?? The gentoo patch you linked to in your first is correct and doesn't have any reference to debian/control. I only had to patch x11prop.c to rebuild

Alright, how do I apply the patch to x11prop.c?

ConnorBehan · 2011-06-21 22:22:51

You need to download the pulseaudio source. Get it from http://0pointer.de/lennart/projects/pul … .22.tar.gz and then extract it and cd to the directory where you have extracted it in a terminal.

Then copy the patch to the same directory and give it a name like x11prop.patch. Then you run

patch -Np1 -i x11prop.patch
./configure
make
sudo make install

and you will have a patched version of pulseaudio installed.

To find out how this can be integrated with pacman, read the wiki pages on the Arch Build System.

Last edited by ConnorBehan (2011-06-22 15:51:35)

Csosa · 2011-06-22 05:26:22

Thanks.

patch -Np1 -i x11prop.patch
patching file configure.ac
Hunk #1 succeeded at 516 (offset -31 lines).
patching file src/pulsecore/x11prop.c
Hunk #2 FAILED at 49.
Hunk #3 FAILED at 57.
Hunk #4 FAILED at 86.
Hunk #5 FAILED at 105.
4 out of 5 hunks FAILED -- saving rejects to file src/pulsecore/x11prop.c.rej

...hmm

ConnorBehan · 2011-06-22 18:37:46

I just tried and you're right, the patch is not compatible with pulseaudio-0.9.22. It was meant for the git version so try it with "pulseaudio-git" from the AUR.

Last edited by ConnorBehan (2011-06-22 18:39:06)

djeikyb · 2011-06-23 20:41:15

I installed pulseaudio-git 20110616-1 a couple days ago. Didn't need to apply the patch, and I don't see evidence of it in the PKGBUILD. Seems to be working just fine with my latest xcb-utils (required for latest awesomewm).

Arch Linux

#1 2011-06-09 20:36:55

Convert patch from Debian to Arch

#2 2011-06-09 22:14:29

Re: Convert patch from Debian to Arch

#3 2011-06-09 22:16:01

Re: Convert patch from Debian to Arch

#4 2011-06-09 23:56:35

Re: Convert patch from Debian to Arch

#5 2011-06-13 19:31:44

Re: Convert patch from Debian to Arch

#6 2011-06-21 16:48:19

Re: Convert patch from Debian to Arch

#7 2011-06-21 22:22:51

Re: Convert patch from Debian to Arch

#8 2011-06-22 05:26:22

Re: Convert patch from Debian to Arch

#9 2011-06-22 18:37:46

Re: Convert patch from Debian to Arch

#10 2011-06-23 20:41:15

Re: Convert patch from Debian to Arch

Board footer