Magellan Linux

Diff of /smage/trunk/extras/slim/slim-1.3.2-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1163 by niro, Thu Jan 27 23:08:44 2011 UTC revision 1165 by niro, Thu Jan 27 23:36:39 2011 UTC
# Line 31  sminclude mbuild mcore-split Line 31  sminclude mbuild mcore-split
31  SRC_URI=(  SRC_URI=(
32   http://download.berlios.de/${PNAME}/${SRCFILE}   http://download.berlios.de/${PNAME}/${SRCFILE}
33   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
34     mirror://${PNAME}/${PNAME}-${PVER}-restart-xserver-if-killed.patch
35     mirror://${PNAME}/${PNAME}-${PVER}-fix-keyboard-in-tty-from-which-slim-is-lauched.patch
36     mirror://${PNAME}/${PNAME}-${PVER}-fix-SIGTERM-freeze.patch
37  )  )
38    
39  UP2DATE="updatecmd_berlios ${PNAME}"  UP2DATE="updatecmd_berlios ${PNAME}"
# Line 40  src_prepare() Line 43  src_prepare()
43   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
44   cd ${SRCDIR}   cd ${SRCDIR}
45    
46     # restart the xserver
47     mpatch ${PNAME}-${PVER}-restart-xserver-if-killed.patch || die
48    
49     # fix keyboard issues
50     mpatch ${PNAME}-${PVER}-fix-keyboard-in-tty-from-which-slim-is-lauched.patch || die
51    
52     # fix a sigterm segfault
53     mpatch ${PNAME}-${PVER}-fix-SIGTERM-freeze.patch || die
54    
55   # fix cflags and ldflags   # fix cflags and ldflags
56   sed -i \   sed -i \
57   -e "s:^\(CFLAGS=\).*:\1-I. $(pkg-config --cflags freetype2 libpng x11):" \   -e "s:^\(CFLAGS=\).*:\1-I. $(pkg-config --cflags freetype2 libpng x11):" \
58   -e "s:^\(LDFLAGS=\).*:\1$(pkg-config --libs xft freetype2 libpng xmu) -ljpeg -lz -lm -lcrypt -lrt:" \   -e "s:^\(LDFLAGS=\).*:\1$(pkg-config --libs xft freetype2 libpng xmu) -ljpeg -lz -lm -lcrypt -lrt:" \
59   -e "s:^\(MANDIR=\).*:\1/usr/share/man:" \   -e "s:^\(MANDIR=\).*:\1/usr/share/man:" \
60   Makefile || die   Makefile || die
61    
62     # rename sim.lock to sim.pid and enable daemon mode by default
63     sed -i -e "s:/var/run/slim.lock:/var/run/slim.pid:" \
64     -e "s:# daemon.*:daemon\tyes:" \
65     slim.conf || die
66  }  }
67    
68  src_compile()  src_compile()

Legend:
Removed from v.1163  
changed lines
  Added in v.1165