Magellan Linux

Diff of /smage/trunk/core/fluxbox/fluxbox-1.3.1-r7.smage2

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

revision 3586 by niro, Thu Sep 8 19:12:23 2011 UTC revision 3587 by niro, Mon Jul 9 18:45:45 2012 UTC
# Line 9  PCATEGORIE="x11-wm" Line 9  PCATEGORIE="x11-wm"
9  DESCRIPTION="fluxbox is yet another windowmanager for X based on blackbox."  DESCRIPTION="fluxbox is yet another windowmanager for X based on blackbox."
10  HOMEPAGE="http://www.fluxbox.org/"  HOMEPAGE="http://www.fluxbox.org/"
11    
12  DEPEND=">= x11-libs/libXpm-3.5  DEPEND=">= virtual/x11
13   >= x11-libs/libXrandr-1.3   >= media-libs/freetype-2
  >= x11-libs/libXinerama-1.1  
  >= media-libs/freetype-2.4  
14   >= media-libs/imlib2-1.4   >= media-libs/imlib2-1.4
15   >= x11-libs/libXft-2.2   >= x11-libs/libXft-2.2
16   >= x11-terms/eterm-0.9.6"   >= x11-terms/eterm-0.9.5"
17    
18  SDEPEND=">= sys-dev/automake-4  SDEPEND=">= sys-dev/automake-4
19   >= sys-dev/autoconf-5"   >= sys-dev/autoconf-5"
# Line 23  SDEPEND=">= sys-dev/automake-4 Line 21  SDEPEND=">= sys-dev/automake-4
21  SRCFILE="${PNAME}-${PVER/_/}.tar.bz2"  SRCFILE="${PNAME}-${PVER/_/}.tar.bz2"
22  SRCDIR="${BUILDDIR}/${PNAME}-${PVER/_/}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER/_/}"
23    
24    REMOVE_DEPRECATED_MAGE_TARGETS=1
25  ALX_ONLY_KEEP="usr/bin/fluxbox  ALX_ONLY_KEEP="usr/bin/fluxbox
26   usr/bin/startfluxbox   usr/bin/startfluxbox
27   usr/bin/fbsetroot   usr/bin/fbsetroot
# Line 40  sminclude mtools alx-split Line 39  sminclude mtools alx-split
39  SRC_URI=(  SRC_URI=(
40   sourceforge://${PNAME}/${SRCFILE}   sourceforge://${PNAME}/${SRCFILE}
41   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
  mirror://${PNAME}/${PNAME}-${PVER}-gcc46.patch  
42   mirror://${PNAME}/${PNAME}-${PVER}-alx.patch   mirror://${PNAME}/${PNAME}-${PVER}-alx.patch
43     mirror://${PNAME}/${PNAME}-${PVER}-no-xmodmap.patch
44  )  )
45    
46  UP2DATE="updatecmd_sourceforge ${PNAME}"  UP2DATE="updatecmd_sourceforge ${PNAME}"
# Line 51  src_prepare() Line 50  src_prepare()
50   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
51   cd ${SRCDIR}   cd ${SRCDIR}
52    
  # fix compilation against gcc-4.6  
  mpatch ${PNAME}-${PVER}-gcc46.patch || die  
   
53   # fix fbsetbg, that it runs with alx, which has no ldd installed   # fix fbsetbg, that it runs with alx, which has no ldd installed
54   mpatch ${PNAME}-${PVER}-alx.patch || die   mpatch ${PNAME}-${PVER}-alx.patch || die
55    
56     # no xmodmap is provided by alx
57     mpatch ${PNAME}-${PVER}-no-xmodmap.patch || die
58    
59   # enable antialias by default   # enable antialias by default
60   echo "session.screen0.antialias: true" >> data/init.in || die   echo "session.screen0.antialias: true" >> data/init.in || die
61    
# Line 67  src_prepare() Line 66  src_prepare()
66   sed -i 's,\([^f]\)bsetroot,\1fbsetroot,' ${style} || die ${style}   sed -i 's,\([^f]\)bsetroot,\1fbsetroot,' ${style} || die ${style}
67   done   done
68    
69   autoreconf --verbose --install --force || die   mautoreconf || die
70  }  }
71    
72  src_compile()  src_compile()
# Line 129  Type=Application" > ${BINDIR}/usr/share/ Line 128  Type=Application" > ${BINDIR}/usr/share/
128   sed -i 's:^\(session.styleFile\:\).*:\1\t/usr/share/fluxbox/styles/carp:' \   sed -i 's:^\(session.styleFile\:\).*:\1\t/usr/share/fluxbox/styles/carp:' \
129   ${BINDIR}/usr/share/fluxbox/init || die   ${BINDIR}/usr/share/fluxbox/init || die
130  }  }
131    
132    postinstall_fluxbox()
133    {
134     # remove startup script with possibly enabled xmodmap from home directories
135     if [[ -f ${MROOT}/home ]]
136     then
137     find ${MROOT}/home -type f -name startup -exec rm '{}' ';'
138     fi
139    }

Legend:
Removed from v.3586  
changed lines
  Added in v.3587