Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=827d0089c5cc68f0307f4253959b27572c9e4e1a
commit 827d0089c5cc68f0307f4253959b27572c9e4e1a Author: crazy <[EMAIL PROTECTED]> Date: Sat Dec 8 12:20:01 2007 +0100 ede-1.2-1-i686 * Version bump * more fixes for startede * synced artwork * CXXFLAGS fixed * eworkpanel still crashes sometimes :/ diff --git a/source/x11-extra/ede/FrugalBuild b/source/x11-extra/ede/FrugalBuild index 8027706..d786591 100644 --- a/source/x11-extra/ede/FrugalBuild +++ b/source/x11-extra/ede/FrugalBuild @@ -3,22 +3,32 @@ # Contributor: BMH1980 <[EMAIL PROTECTED]> pkgname=ede -pkgver=1.1 -pkgrel=2 +pkgver=1.2 +pkgrel=1 pkgdesc="Equinox Desktop Environment (shortly EDE) is small desktop environment" _F_sourceforge_broken_up2date=1 -_F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://equinox-project.org/"; -depends=('efltk>=2.0.6-2') -makedepends=('imagemagick') +depends=('efltk>=2.0.7' 'libxext' 'libgcc' 'libxml2') rodepends=('xorg-server' 'xsetroot' 'xscreensaver' 'xrdb' 'xmessage' 'firefox' 'xmms') groups=('x11-extra') archs=('i686' '!x86_64') license="GPL2" -source=($source http://ede.sourceforge.net/themes/EdeAirlock/EdeAirlock.tar.bz2 \ - http://frugalware.org/~nadfoka/0.6/background.jpg \ - $pkgname.desktop xinitrc.$pkgname startede.patch fw-defaults.patch) +source=($source http://equinox-project.org/themes/EdeAirlock/EdeAirlock.tar.bz2 \ + http://ftp.frugalware.org/pub/other/sources/ede/frugalware.jpg \ + $pkgname.desktop \ + xinitrc.$pkgname \ + startede.patch \ + fw-defaults.patch \ + cxxflags.patch) +sha1sums=('3ed41a5382c6374ba2c9d8b6fff88e26205c5a0f' \ + 'caead6461b78f7d671d6f226dbd38162fc2e6949' \ + '4e485b070b28ff2116618aece0331b94f6c790e2' \ + 'd5e9f0923aa3e18277166c7a346bc49abd244b17' \ + '21809e574d9b9ec838707dc31ecf879f9793ff6b' \ + '79f0559efdfccdaeb269737d9808cd21836df4bb' \ + 'bc7cb26aee7fee94fb0a5263e8e10bd0c0492e1f' \ + '4ad02f4836bb92ee0761e70d5bae882e8e002764') # TODO: rework Menus, XX.png's and new desktop files, fw-theme build() @@ -26,23 +36,16 @@ build() Fcd $pkgname Fpatchall Fmkdir usr/bin usr/share/pixmaps usr/share/$pkgname/{wallpapers,themes} - Fconf --disable-debug + Fconf --disable-debug --disable-silent make || Fdie make LOCALEDIR="$Fdestdir/usr/share/locale" prefix="$Fdestdir/usr" install || Fdie - cd .. - /usr/bin/convert background.jpg -resize 1024x786 frugalware.jpg || Fdie - cd $pkgname + Ffile /etc/X11/sessions/$pkgname.desktop Fexe /etc/X11/xinit/xinitrc.$pkgname Fmv usr/share/$pkgname/doc/$pkgname.png usr/share/pixmaps Fcpr EdeAirlock usr/share/$pkgname/themes/EdeAirlock - Fcpr background.jpg usr/share/$pkgname/wallpapers/1600x1200-frugalware.jpg Fcpr frugalware.jpg usr/share/$pkgname/wallpapers/frugalware.jpg } -sha1sums=('e00356ad746c63aa0e1e98f9f5aeeff92eea7ae5'\ - 'caead6461b78f7d671d6f226dbd38162fc2e6949'\ - '071229d076034c681ec4d18bf72c227d78cc467d'\ - 'd5e9f0923aa3e18277166c7a346bc49abd244b17'\ - '21809e574d9b9ec838707dc31ecf879f9793ff6b'\ - 'c8c0ae02b65031fddbe8fd6eca29ff31b754220e'\ - 'bc7cb26aee7fee94fb0a5263e8e10bd0c0492e1f') + + +# optimization OK diff --git a/source/x11-extra/ede/cxxflags.patch b/source/x11-extra/ede/cxxflags.patch new file mode 100644 index 0000000..ca1eb71 --- /dev/null +++ b/source/x11-extra/ede/cxxflags.patch @@ -0,0 +1,12 @@ +diff -Naur ede/makeinclude.in ede-p/makeinclude.in +--- ede/makeinclude.in 2007-11-16 14:18:40.000000000 +0100 ++++ ede-p/makeinclude.in 2007-12-08 11:50:35.000000000 +0100 +@@ -47,7 +47,7 @@ + done + + # compiler flags +-CXXFLAGS = -DSHAPE @CXXFLAGS@ ++CXXFLAGS += -DSHAPE @CXXFLAGS@ + + # libraries + LIBS = @LIBS@ diff --git a/source/x11-extra/ede/startede.patch b/source/x11-extra/ede/startede.patch index d2df03f..f9890b9 100644 --- a/source/x11-extra/ede/startede.patch +++ b/source/x11-extra/ede/startede.patch @@ -1,6 +1,6 @@ diff -Naur ede/datas/startede.in ede-p/datas/startede.in ---- ede/datas/startede.in 2006-09-02 22:52:45.000000000 +0200 -+++ ede-p/datas/startede.in 2006-09-03 16:39:20.988236416 +0200 +--- ede/datas/startede.in 2007-11-16 14:18:28.000000000 +0100 ++++ ede-p/datas/startede.in 2007-12-08 11:31:09.000000000 +0100 @@ -6,7 +6,7 @@ XSETROOT=`which xsetroot 2> /dev/null` @@ -24,3 +24,14 @@ diff -Naur ede/datas/startede.in ede-p/datas/startede.in fi # If we have xsetroot than script shoult run it +@@ -36,7 +33,9 @@ + xscreensaver -nosplash & + fi + ++## broken without that :/ - crazy - ++export LIBXCB_ALLOW_SLOPPY_LOCK=1 ++ + exec edewm & + exec eiconman & +-etip & + exec eworkpanel _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
