You are not logged in.

Pages: 1

#1 2009-12-16 17:06:15

kismet010
Member
Registered: 2009-09-02
Posts: 137

[SOLVED] DWM patch error

Hi. I want to apply the Bottom Stack patch to my dwm. I did for 5.6 but i don't know how lol

This is my PKGBUILD

# $Id: PKGBUILD 3133 2009-09-28 09:01:18Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
# Contributor: Grigorios Bouzakis <grbzks@gmail.com>

pkgname=dwm
pkgver=5.7.2
pkgrel=1
pkgdesc="A dynamic window manager for X"
url="http://dwm.suckless.org"
arch=('i686' 'x86_64')
license=('MIT')
options=(zipman)
depends=('libx11')
install=dwm.install
source=(http://code.suckless.org/dl/dwm/dwm-$pkgver.tar.gz \
    config.h bstack.c)
md5sums=()

build() {
  cd $srcdir/$pkgname-$pkgver
  cp $srcdir/config.h config.h

  patch -p0 -i /home/kismet/.dwm/patch/bstack.c

  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 || return 1
  make PREFIX=/usr DESTDIR=$pkgdir install || return 1

  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE && \
  install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README
}

I don't how exactly put the patch.. this is the error i get

~/.dwm makepkg -efi
==> Creando el paquete: dwm 5.7.2-1 i686 (mié dic 16 18:02:39 CET 2009)
==> Comprobando Dependencias en tiempo de Ejecución... 
==> Comprobando Dependencias en tiempo de Compilación... 
==> PRECAUCIÓN: Saltando obtención de fuentes        -- usando el arbol src/ existente
==> PRECAUCIÓN: saltando pruebas de integridad -- usando el arbol src/ existente
==> PRECAUCIÓN: Saltando extracción de las fuentes       -- usando src/tree existente
==> Eliminando directorio pkg/ existente...
==> Entrando a un ambiente fakeroot...
==> Comenzando build()...
patch: **** Only garbage was found in the patch input.
dwm build options:
CFLAGS   = -std=c99 -pedantic -Wall -Os -I. -I/usr/include -I/usr/include/X11 -DVERSION="5.7.2" -DXINERAMA
LDFLAGS  = -s -L/usr/lib -lc -L/usr/lib/X11 -lX11 -L/usr/lib/X11 -lXinerama
CC       = cc
CC dwm.c
En el fichero incluído de dwm.c:274:
config.h:37:20: error: bstack.c: No existe el fichero o el directorio
In file included from dwm.c:274:
config.h:44: error: 'bstack' no se declaró aquí (no en una función)
make: *** [dwm.o] Error 1
==> ERROR: Falló la compilación.
    Abortando...
~/.dwm

What's happen?

Last edited by kismet010 (2010-02-08 05:51:28)

Offline

#2 2009-12-16 17:38:52

jasonwryan
Anarchist
From: .nz
Registered: 2009-05-09
Posts: 30,424
Website

Re: [SOLVED] DWM patch error

How did you try and apply the patch? Did you place it in the correct directory and make the changes to your config.h as described here? http://dwm.suckless.org/patches/bottom_stack

Arch + dwm   •   Mercurial repos  •   Surfraw

Registered Linux User #482438

Offline

#3 2009-12-16 17:48:01

kismet010
Member
Registered: 2009-09-02
Posts: 137

Re: [SOLVED] DWM patch error

what's the correct directory? i try all of them.. ~/.dwm ~/.dwm/src ~/.dwm/src/dwm-5... and finally put into ~/.dwm/patch

in pkgbuild, 'patch -p0 -i /home/kismet/.dwm/patch/bstack.c' works fine in dwm5.6

...
yes, in config.h, i've got an '#include bstack.c' line

Offline

#4 2009-12-16 18:06:39

kismet010
Member
Registered: 2009-09-02
Posts: 137

Re: [SOLVED] DWM patch error

ok, this is the correct directory:  patch -p0 -i ~/.dwm/src/dwm-5.7.2/bstack.c big_smile

thank u for the clue!!

Offline

#5 2009-12-16 18:20:22

jasonwryan
Anarchist
From: .nz
Registered: 2009-05-09
Posts: 30,424
Website

Re: [SOLVED] DWM patch error

Glad you sorted it. It might be simpler to just drop it in to the directory and add the line to config.h - you don't need to issue the patch command or alter the PKGBUILD.

Arch + dwm   •   Mercurial repos  •   Surfraw

Registered Linux User #482438

Offline

#6 2009-12-16 18:29:59

kismet010
Member
Registered: 2009-09-02
Posts: 137

Re: [SOLVED] DWM patch error

well, new error.. hmm


applying another patch:

patch -i ~/.dwm/src/dwm-5.7.2/bstack.c
patch -i ~/.dwm/src/dwm-5.7.2/dwm-5.7.2-pertag.diff


get this:

~/.dwm makepkg -efi
==> Creando el paquete: dwm 5.7.2-1 i686 (mié dic 16 19:28:13 CET 2009)
==> Comprobando Dependencias en tiempo de Ejecución... 
==> Comprobando Dependencias en tiempo de Compilación... 
==> PRECAUCIÓN: Saltando obtención de fuentes        -- usando el arbol src/ existente
==> PRECAUCIÓN: saltando pruebas de integridad -- usando el arbol src/ existente
==> PRECAUCIÓN: Saltando extracción de las fuentes       -- usando src/tree existente
==> Eliminando directorio pkg/ existente...
==> Entrando a un ambiente fakeroot...
==> Comenzando build()...
patch: **** Only garbage was found in the patch input.
patching file dwm.c
Reversed (or previously applied) patch detected!  Assume -R? [n]  
Apply anyway? [n] y
Hunk #1 FAILED at 120.
Hunk #2 succeeded at 303 with fuzz 2 (offset 30 lines).
Hunk #3 FAILED at 1475.
Hunk #4 FAILED at 1493.
Hunk #5 FAILED at 1534.
Hunk #6 FAILED at 1645.
Hunk #7 FAILED at 1665.
Hunk #8 FAILED at 1937.
7 out of 8 hunks FAILED -- saving rejects to file dwm.c.rej
dwm build options:
CFLAGS   = -std=c99 -pedantic -Wall -Os -I. -I/usr/include -I/usr/include/X11 -DVERSION="5.7.2" -DXINERAMA
LDFLAGS  = -s -L/usr/lib -lc -L/usr/lib/X11 -lX11 -L/usr/lib/X11 -lXinerama
CC       = cc
CC dwm.c
In file included from config.h:37,
                 from dwm.c:254:
bstack.c: En la función 'bstack':
bstack.c:7: error: puntero deferenciado a tipo de dato incompleto
bstack.c:11: error: puntero deferenciado a tipo de dato incompleto
bstack.c:12: error: puntero deferenciado a tipo de dato incompleto
bstack.c:12: error: puntero deferenciado a tipo de dato incompleto
bstack.c:13: error: puntero deferenciado a tipo de dato incompleto
bstack.c:13: error: puntero deferenciado a tipo de dato incompleto
bstack.c:13: error: puntero deferenciado a tipo de dato incompleto
bstack.c:13: error: puntero deferenciado a tipo de dato incompleto
bstack.c:17: error: puntero deferenciado a tipo de dato incompleto
bstack.c:18: error: puntero deferenciado a tipo de dato incompleto
bstack.c:18: error: puntero deferenciado a tipo de dato incompleto
bstack.c:19: error: puntero deferenciado a tipo de dato incompleto
bstack.c:20: error: puntero deferenciado a tipo de dato incompleto
bstack.c:20: error: puntero deferenciado a tipo de dato incompleto
bstack.c:20: error: puntero deferenciado a tipo de dato incompleto
bstack.c:20: error: puntero deferenciado a tipo de dato incompleto
bstack.c:22: error: puntero deferenciado a tipo de dato incompleto
bstack.c:25: error: puntero deferenciado a tipo de dato incompleto
bstack.c:25: error: puntero deferenciado a tipo de dato incompleto
bstack.c:26: error: puntero deferenciado a tipo de dato incompleto
dwm.c: En el nivel principal:
dwm.c:281: error: redefinición de 'struct Monitor'
dwm.c:306: error: redefinición de 'struct Monitor'
make: *** [dwm.o] Error 1
==> ERROR: Falló la compilación.
    Abortando...
~/.dwm

Edit: same error (without hunks) althought not patching for bstack.c

Last edited by kismet010 (2009-12-16 18:36:13)

Offline

#7 2009-12-16 18:42:00

jasonwryan
Anarchist
From: .nz
Registered: 2009-05-09
Posts: 30,424
Website

Re: [SOLVED] DWM patch error

Bottomstack won't work with pertag. There is a workaround here: http://lists.suckless.org/dev/0911/2317.html

Arch + dwm   •   Mercurial repos  •   Surfraw

Registered Linux User #482438

Offline

#8 2009-12-16 18:45:03

kismet010
Member
Registered: 2009-09-02
Posts: 137

Re: [SOLVED] DWM patch error

ok, thanks a lot for the info smile

Offline

Pages: 1

Board footer

Powered by FluxBB