Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f2079ac590f08c871ac35cf9c33a371f1494874

commit 8f2079ac590f08c871ac35cf9c33a371f1494874
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Jul 22 11:13:23 2009 +0200

fluxbox-1.1.1-2-i686
*fixed build with automake 1.11

diff --git a/source/x11-extra/fluxbox/FrugalBuild 
b/source/x11-extra/fluxbox/FrugalBuild
index 2aa61e3..fe397fd 100644
--- a/source/x11-extra/fluxbox/FrugalBuild
+++ b/source/x11-extra/fluxbox/FrugalBuild
@@ -10,20 +10,24 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.fluxbox.org";
depends=('libxft>=2.1.13-2' 'libxpm>=3.5.7-2' 'imlib2>=1.4.2-4' 'libstdc++')
-rodepends=('xorg-server' 'feh')
+rodepends=('xorg-server>=1.6.1' 'feh')
groups=('x11-extra')
archs=('i686' 'x86_64')
-source=($source $pkgname.desktop xinitrc.$pkgname)
+source=($source $pkgname.desktop xinitrc.$pkgname automake111.diff)

build() {
Fcd
+       Fpatchall
Fautoconfize
-       Fbuild --enable-nls
+       Fconf
+       Fmake --enable-nls
+       Fmakeinstall
Fexe /etc/X11/xinit/xinitrc.$pkgname
Ffile /etc/X11/sessions/$pkgname.desktop
}
sha1sums=('6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f' \
'10a60edec5f8bcf0c4e1209074b3a5c7bf19388a' \
-          'c8c291ed229a37b0cd4d15a7aa2c3c3a1fee6e17')
+          'c8c291ed229a37b0cd4d15a7aa2c3c3a1fee6e17' \
+          '66c6bec29f6ed40789ae42234b48343d98793618')

# optimization OK
diff --git a/source/x11-extra/fluxbox/automake111.diff 
b/source/x11-extra/fluxbox/automake111.diff
new file mode 100644
index 0000000..58cc832
--- /dev/null
+++ b/source/x11-extra/fluxbox/automake111.diff
@@ -0,0 +1,18 @@
+Fixed build with with automake 1.11 when it fails with
+/bin/install: will not overwrite just-created 
`/usr/src/tmp/fluxbox-buildroot/usr/share/man/man1/fbrun.1' with `fbrun.1'
+---
+ doc/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d440140..9da86e3 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = ru
+ CLEANFILES = fluxbox.1 fluxstyle.1
+ MAINTAINERCLEANFILES = Makefile.in
+ man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
+-      startfluxbox.1 fluxstyle.1 fbrun.1 fluxbox-keys.5 fluxbox-remote.1
++      startfluxbox.1 fluxstyle.1 fluxbox-keys.5 fluxbox-remote.1
+ EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-remote.1 
startfluxbox.1 fbsetbg.1 \
+       fluxstyle.1.in CODESTYLE
+ distclean-local:
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to