Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=d60a729eed473bc937d964dbe8ae0d0b8abf841b

commit d60a729eed473bc937d964dbe8ae0d0b8abf841b
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Sep 14 15:08:29 2009 +0200

xorg-server-1.6.99.901-1-i686
*version bump : 1.7 rc1
*this version should fix dmx but not :)
*delete duplicate Fuse $USE_SERVERDMX

diff --git a/source/x11/xorg-server/Fix_Keysyms.diff 
b/source/x11/xorg-server/Fix_Keysyms.diff
deleted file mode 100644
index e3ab452..0000000
--- a/source/x11/xorg-server/Fix_Keysyms.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-server/src/xorg-server-1.6.99.900/hw/kdrive/src/kdrive.h~     
2009-09-05 01:01:05.000000000 +0200
-+++ xorg-server-1.6.99.900/hw/kdrive/src/kdrive.h      2009-09-05 
01:01:05.000000000 +0200
-@@ -305,6 +305,7 @@
-
-     int                 minScanCode;
-     int                 maxScanCode;
-+    KeySymsRec                keySyms;
-
-     int                 leds;
-     int                 bellPitch;
diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 0a67087..07252aa 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -7,8 +7,8 @@ USE_HAL=${USE_HAL:-"y"}
USE_SERVERDMX=${USE_SERVERDMX:-"n"}

pkgname=xorg-server
-pkgver=1.6.99.900
-pkgrel=2
+pkgver=1.6.99.901
+pkgrel=1
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -38,11 +38,10 @@ replaces=('xorg-compat' 'xorg-server-ati' 
'xorg-server-chips' \
backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
source=(${sour...@]} \
-       desktop Fix_Keysyms.diff)
+       desktop)

-sha1sums=('cf74a4759882e4baf33780e7cfd9466722f71918' \
-          '1456207203932404752e2519c5b7fe830a913cf4' \
-          '0ec4eae5991271f469bada3f102ff05b187fc174')
+sha1sums=('2f9a1eaa728f36f70ea225050f0cb7dbf6a52f3c' \
+          '1456207203932404752e2519c5b7fe830a913cf4')

if Fuse $USE_DEVEL; then
pkgver=1.6.3.901.151.g120286a
@@ -117,8 +116,6 @@ if Fuse $USE_KDRIVE; then
--enable-xsdl \
--enable-xvfb \
--enable-kdrive"
-
-
else
Fconfopts="${fconfop...@]}
--disable-xephyr \
@@ -142,22 +139,6 @@ else
--disable-multibuffer"
fi

-
-if Fuse $USE_SERVERDMX; then
-       subpkgs=("${subpk...@]}" "$pkgname-dmx")
-       subdescs=("${subdes...@]}" 'Distributed Multi-Head X server.')
-       subdepends=("${subdepen...@]}" 'libdmx libxcb libsm libxaw libxrender 
libxfixes libxfont>=1.3.1-2 libxi pixman libxres')
-       subgroups=("${subgrou...@]}" 'x11-extra')
-       subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
-       Fconfopts="${fconfop...@]}
-                --enable-dmx \
-               --enable-multibuffer"
-else
-       Fconfopts="${fconfop...@]}
-       --disable-dmx \
-       --disable-multibuffer"
-fi
-
build() {
if Fuse $USE_DEVEL; then
Funpack_scm
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to