Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b0aeb5aa0f10c024fdfbfd9dfc8e8e9ec4c3416
commit 0b0aeb5aa0f10c024fdfbfd9dfc8e8e9ec4c3416
Author: Elentir <elen...@mailoo.org>
Date: Mon Feb 15 20:48:07 2010 +0100
xorg-server-minimal-1.7.4-3-i686
* use -suffix to fix file conflicts
* remove useless files
* thx crazy ;)
diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index 98fb731..74c3ca0 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
pkgver=1.7.4
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org X Server for Fwife Install CD"
groups=('x11-extra')
archs=('i686' 'x86_64' )
@@ -19,7 +19,10 @@ Finclude xorg
## fix up2date by grepv'ing the beta and other weird version number
up2date="lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v
'901' | Flasttar"
F_cd_path=$_F_xorg_name-$pkgver
-sha1sums=('26de24d7ced735bd717a21c5110d22d662221a58')
+options=("nodocs")
+source=($source hack-since-suffix-support-is-half-br0ken.patch)
+sha1sums=('26de24d7ced735bd717a21c5110d22d662221a58' \
+ 'aee256e862e7cae581f155df159843212416e81b')
Fconfopts="$Fconfopts --enable-install-setuid \
--disable-kdrive --disable-xvfb\
--disable-glx --disable-xvmc \
@@ -30,16 +33,22 @@ Fconfopts="$Fconfopts --enable-install-setuid \
--disable-screensaver --disable-xres \
--disable-composite --with-xkb-output=/var/lib/xkb \
--with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
- --disable-dbe"
+ --disable-dbe --program-suffix='-fwife'
--with-module-dir=/usr/lib/xorg-fwife/modules"
-build() {
- Fbuild
- # move files to avoid conflicts and the installer can move them back to
/
- Fmkdir fwifecdbin/
- Fmv usr fwifecdbin/
- Fmv var fwifecdbin/
- Fmkdir usr/lib/
- Fmv fwifecdbin usr/lib/
-}
+export CFLAGS="`echo $CFLAGS |sed 's|-O2|-Os|g'`"
+build()
+{
+ Fcd
+ Fpatchall
+ Fautoreconf
+ Fmake
+ Fmakeinstall
+ Frm usr/include
+ Frm usr/share/{aclocal,man}
+ Frm usr/lib/xorg/protocol.txt
+ Frm var/lib/xkb/README.compiled
+ Frm usr/lib/pkgconfig
+ Frm usr/lib/xorg-fwife/modules/multimedia
+}
# optimization OK
diff --git
a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
new file mode 100644
index 0000000..1d84c6d
--- /dev/null
+++
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
@@ -0,0 +1,25 @@
+--- xorg-server-1.7.4/hw/xfree86/Makefile.am 2009-11-30 06:42:31.000000000
+0100
++++ xorg-server-1.7.4-p/hw/xfree86/Makefile.am 2010-02-10 17:39:45.000000000
+0100
+@@ -102,10 +102,10 @@
+
+
+ install-exec-local: install-binPROGRAMS
+- (cd $(DESTDIR)$(bindir) && rm -f X && ln -s Xorg X)
++ (cd $(DESTDIR)$(bindir) && rm -f X && ln -s Xorg-fwife X-fwife)
+ if INSTALL_SETUID
+- chown root $(DESTDIR)$(bindir)/Xorg
+- chmod u+s $(DESTDIR)$(bindir)/Xorg
++ chown root $(DESTDIR)$(bindir)/Xorg-fwife
++ chmod u+s $(DESTDIR)$(bindir)/Xorg-fwife
+ endif
+
+ CPP_FILES_FLAGS = \
+@@ -114,7 +114,7 @@
+ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
+
+ relink:
+- rm -f Xorg && $(MAKE) Xorg
++ rm -f Xorg-fwife && $(MAKE) Xorg
+
+ xorg.conf.example.pre: xorgconf.cpp
+ cp $(srcdir)/xorgconf.cpp $@
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
