Magellan Linux

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

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

revision 1157 by niro, Thu Jan 27 22:13:39 2011 UTC revision 1176 by niro, Fri Jan 28 17:52:35 2011 UTC
# Line 26  SRCFILE="${PNAME}-${PVER}.tar.gz" Line 26  SRCFILE="${PNAME}-${PVER}.tar.gz"
26  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
27    
28  MCORE_ONLY_KEEP="etc/slim.conf usr/bin/slim usr/share/slim/themes/default"  MCORE_ONLY_KEEP="etc/slim.conf usr/bin/slim usr/share/slim/themes/default"
29  sminclude mbuild mcore-split  sminclude mtools mcore-split
30    
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()
# Line 54  src_compile() Line 71  src_compile()
71   mmake || die   mmake || die
72  }  }
73    
74  src_install()  mcore_generic_src_install()
75  {  {
76   cd ${SRCDIR}   cd ${SRCDIR}
77   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
78    
79     # install a custom slim.conf
80     echo -e ${COLGREEN}"    injecting custom slim-configs"${COLDEFAULT}
81     mcinjectfile slim.conf /etc || die
82     minstalldir /etc/rc.d/init.d || die
83     mcinjectexec slim.rc /etc/rc.d/init.d/slim || die
84     mcinjectfile panel.png /usr/share/slim/themes/default/panel.png
85     mcinjectfile mcore2.png /usr/share/slim/themes/default/background.png
86     if [ -f ${BINDIR}/usr/share/slim/themes/default/background.jpg ]
87     then
88     rm ${BINDIR}/usr/share/slim/themes/default/background.png || die
89     fi
90  }  }

Legend:
Removed from v.1157  
changed lines
  Added in v.1176