openbox 3.3-r2 with patch

ingvildr · 2006-04-28 17:08:21

i was wondering if someone could help me apply this patch to this PKGBUILD from AUR i've been trying for a while and i cant seem to get it to work

Mr Green · 2006-04-28 17:22:49

Try using openbox cvs, I think (postlogic may pull me up on this one!!!) its got hidemenuheader patch applied .....

If you still have problems I can point you to postlogics pkgbuild for cvs which includes patch .....

HTH

ingvildr · 2006-04-28 17:48:44

this is what i have so far

pkgname=openbox-devel
pkgver=3.3_rc2
_pkgver=3.3-rc2
pkgrel=3
pkgdesc="A window manager for the X11 windowing system"
depends=('x-server' 'startup-notification' 'libxml2' 'pango>=1.8.2')
url="http://openbox.org"
provides=('openbox')
replaces=('openbox')
conflicts=('openbox')
install=openbox.install
source=(http://www.icculus.org/openbox/releases/openbox-$_pkgver.tar.gz)

build() {
  cd $startdir/src/openbox-$_pkgver
  patch -p4 < $startdir/ob_plus.patch
  ./configure --prefix=/usr --with-x --sysconfdir=/etc --enable-pango
  make || return 1
  make DESTDIR=$startdir/pkg install

  #libtool slay
  find $startdir/pkg -name '*.la' -exec rm {} ;
}
md5sums=('1ff100d27cc1f47dadebb884a696dac3')

and i cant see why this is not working, i have applied the patch because it prompts me for the files but i would like to find out what i have done wrong.

Mr Green · 2006-04-28 19:35:35

Errrr

patch -Np0 -i $startdir/<patch>

tomk · 2006-04-28 19:49:07

-p0 is better than -p4 alright, but still not completely OK:

patching file CHANGELOG
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file CHANGELOG.rej
patching file openbox/config.c
Hunk #2 succeeded at 260 (offset -1 lines).
Hunk #3 succeeded at 564 (offset -2 lines).
patching file openbox/config.h
Hunk #1 succeeded at 86 (offset -2 lines).
patching file openbox/dock.c
patching file openbox/menu.c
patching file openbox/menuframe.c
Hunk #2 succeeded at 416 (offset 5 lines).
patching file openbox/openbox.c
patching file render/gradient.c
patching file render/image.c
Hunk #1 succeeded at 162 (offset -13 lines).
patching file render/render.h
patching file render/theme.c
patching file render/theme.h

One reject and five offsets suggests to me that this particular patch is not intended for the 3.3-rc2 tarball.

More generally, here are a few improvements for your PKGBUILD:

- pkgver : I would make it 3.3rc2. This is not set down anywhere, but IMO it's cleaner.
- _pkgver : lose it. Custom variables are only permitted if the package cannot be built otherwise. You can hardcode 3.3-rc2.
- source= : the source array should include all files necessary for the build, except for the .install file, so the patch should be listed here too. The path to the patch file then becomes $startdir/src/ob_plus.patch, or simply ../ob_plus.patch.
- patch : add || return 1 to the patch command line, so that makepkg aborts if the patch fails.
- md5sums= : should have entries for all files in the source array i.e. tarball and patch.

Mr Green · 2006-04-28 20:51:11

Still have feeling that its needs to be built against cvs :? ....... thats what I did...

there is a patch for it ,,, I will keep looking in the mean time

babyigor37 · 2006-04-28 21:24:27

The patch will work against 3.3_r2c. I deleted the first part of the patch that altered the changelog, and everything worked nicely.

Mr Green · 2006-04-29 07:40:33

https://bugzilla.icculus.org/attachment.cgi?id=870

Maybe try this one.....

whargoul · 2006-05-12 17:37:51

Did anyone find a solution to this?

ingvildr · 2006-05-12 17:58:13

yes it was just the patching of the changelog that gave an error, i have a working pkgbuild if your interested.

whargoul · 2006-05-12 18:02:21

ingvildr wrote:

yes it was just the patching of the changelog that gave an error, i have a working pkgbuild if your interested.

I'm very interested.

ingvildr · 2006-05-12 20:10:48

PKGBUILD

pkgname=openbox-devel
pkgver=3.3rc2
pkgrel=2
pkgdesc="A window manager for the X11 windowing system"
depends=('x-server' 'startup-notification' 'libxml2' 'pango>=1.8.2')
url="http://openbox.org"
provides=('openbox')
replaces=('openbox')
conflicts=('openbox')
install=openbox.install
source=(http://www.icculus.org/openbox/releases/openbox-3.3-rc2.tar.gz patchy.patch)

build() {
  cd $startdir/src/openbox-3.3-rc2
  patch -Np0 < ../patchy.patch
  ./configure --prefix=/usr --with-x --sysconfdir=/etc --enable-pango
  make || return 1
  make DESTDIR=$startdir/pkg install

  #libtool slay
  find $startdir/pkg -name '*.la' -exec rm {} ;
}
md5sums=('1ff100d27cc1f47dadebb884a696dac3' 'f04d4da8d7810876d84788d3c677924a')

and here is the patch http://david.chalkskeletons.com/files/patchy.patch and here is the .install http://aur.archlinux.org/packages/openb … ox.install

whargoul · 2006-05-12 21:06:35

Cool, thank you.

Arch Linux

#1 2006-04-28 17:08:21

openbox 3.3-r2 with patch

#2 2006-04-28 17:22:49

Re: openbox 3.3-r2 with patch

#3 2006-04-28 17:48:44

Re: openbox 3.3-r2 with patch

#4 2006-04-28 19:35:35

Re: openbox 3.3-r2 with patch

#5 2006-04-28 19:49:07

Re: openbox 3.3-r2 with patch

#6 2006-04-28 20:51:11

Re: openbox 3.3-r2 with patch

#7 2006-04-28 21:24:27

Re: openbox 3.3-r2 with patch

#8 2006-04-29 07:40:33

Re: openbox 3.3-r2 with patch

#9 2006-05-12 17:37:51

Re: openbox 3.3-r2 with patch

#10 2006-05-12 17:58:13

Re: openbox 3.3-r2 with patch

#11 2006-05-12 18:02:21

Re: openbox 3.3-r2 with patch

#12 2006-05-12 20:10:48

Re: openbox 3.3-r2 with patch

#13 2006-05-12 21:06:35

Re: openbox 3.3-r2 with patch

Board footer