[paketler-commits] r37455 - in devel/desktop/freedesktop/xorg/xorg-server: . comar
paketler-commits at pardus.org.tr
paketler-commits at pardus.org.tr
28 Ara 2007 Cum 16:42:35 EET
Author: fatih
Date: Fri Dec 28 16:42:34 2007
New Revision: 37455
Modified:
devel/desktop/freedesktop/xorg/xorg-server/actions.py
devel/desktop/freedesktop/xorg/xorg-server/comar/package.py
devel/desktop/freedesktop/xorg/xorg-server/pspec.xml
Log:
Use /var/lib/xkb for compiled maps + some fixes
Modified: devel/desktop/freedesktop/xorg/xorg-server/actions.py
=================================================================
--- devel/desktop/freedesktop/xorg/xorg-server/actions.py (original)
+++ devel/desktop/freedesktop/xorg/xorg-server/actions.py Fri Dec 28 16:42:34 2007
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# Copyright 2006,2007 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
@@ -39,6 +39,7 @@
--with-os-vendor=\"TÜBİTAK, UEKAE\" \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
+ --with-xkb-output=/var/lib/xkb \
--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/dejavu,/usr/share/fonts/100dpi,/usr/share/fonts/75dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1" % (get.workDIR(), mesa))
def build():
@@ -54,7 +55,7 @@
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.cd("../%s/" % mesa)
- autotools.rawInstall("INSTALL_DIR=%s/usr DRI_DRIVER_INSTALL_DIR=%s/usr/lib/xorg/modules/dri INCLUDE_DIR=%s/usr/include" %
+ autotools.rawInstall("INSTALL_DIR=%s/usr DRI_DRIVER_INSTALL_DIR=%s/usr/lib/xorg/modules/dri INCLUDE_DIR=%s/usr/include" %
(get.installDIR(), get.installDIR(), get.installDIR()))
# Create glxinfo/gears
@@ -69,14 +70,10 @@
pisitools.remove("/usr/include/GL/GLw*P.h")
# Create needed symlinks
- pisitools.dosym("libGLU.so.1.3.070100", "/usr/lib/libGLU.so.1.3")
+ pisitools.dosym("libGLU.so.1.3.070002", "/usr/lib/libGLU.so.1.3")
pisitools.dosym("libGLw.so.1.0.0", "/usr/lib/libGLw.so.1.0")
# Moving libGL and friends for dynamic switching
- pisitools.dodir("/usr/lib/opengl/lib")
- pisitools.dodir("/usr/lib/opengl/extensions")
- pisitools.dodir("/usr/lib/opengl/include")
-
for file in shelltools.ls("%s/usr/lib/libGL.so*" % get.installDIR()):
pisitools.domove(file.replace(get.installDIR(), ""), "/usr/lib/opengl/xorg-x11/lib/")
@@ -92,8 +89,3 @@
# Default cursor theme
pisitools.dodir("/usr/share/cursors/xorg-x11/default")
shelltools.echo("%s/usr/share/cursors/xorg-x11/default/index.theme" % get.installDIR(), "[Icon Theme]\nInherits=Jimmac")
-
- # Workaround for liveCD
- pisitools.removeDir("/usr/share/X11/xkb/compiled/")
- pisitools.dosym("/tmp", "/usr/share/X11/xkb/compiled")
- pisitools.dosym("/usr/share/X11/xkb", "/etc/X11/xkb")
Modified: devel/desktop/freedesktop/xorg/xorg-server/comar/package.py
=================================================================
--- devel/desktop/freedesktop/xorg/xorg-server/comar/package.py (original)
+++ devel/desktop/freedesktop/xorg/xorg-server/comar/package.py Fri Dec 28 16:42:34 2007
@@ -3,8 +3,4 @@
import os
def postInstall():
- if not os.path.exists("/usr/share/X11/xkb/compiled"):
- os.symlink("/tmp", "/usr/share/X11/xkb/compiled")
-
os.system("/sbin/update-opengl `/sbin/update-opengl --get-implementation`")
-
Modified: devel/desktop/freedesktop/xorg/xorg-server/pspec.xml
=================================================================
--- devel/desktop/freedesktop/xorg/xorg-server/pspec.xml (original)
+++ devel/desktop/freedesktop/xorg/xorg-server/pspec.xml Fri Dec 28 16:42:34 2007
@@ -5,19 +5,19 @@
<Name>xorg-server</Name>
<Homepage>http://x.org/</Homepage>
<Packager>
- <Name>S.Çağlar Onur</Name>
- <Email>caglar at pardus.org.tr</Email>
+ <Name>Fatih Aşıcı</Name>
+ <Email>fatih at pardus.org.tr</Email>
</Packager>
<License>xorg-server</License>
<IsA>app:console</IsA>
<IsA>app:gui</IsA>
<Summary>X.Org X Server</Summary>
- <Archive sha1sum="537d4f5b56902f51b0cb3a87cb3ac25a94fc79b5" type="targz">ftp://ftp.pardus.org.tr/pub/sources/xorg-server-7.3.tar.gz</Archive>
+ <Archive sha1sum="c9fc7968d354572aa0837925f64e36716d0d52f0" type="targz">http://cekirdek.pardus.org.tr/~fatih/distfiles/xorg-server-7.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>libdrm</Dependency>
<Dependency releaseFrom="5">xorg-proto</Dependency>
- <Dependency>xorg-data</Dependency>
- <Dependency>xorg-app</Dependency>
+ <Dependency versionFrom="7.3">xorg-data</Dependency>
+ <Dependency versionFrom="7.3">xorg-app</Dependency>
<Dependency>xorg-util</Dependency>
<Dependency>xorg-font</Dependency>
<Dependency>pixman</Dependency>
@@ -60,8 +60,8 @@
<RuntimeDependencies>
<Dependency>libdrm</Dependency>
<Dependency releaseFrom="5">xorg-proto</Dependency>
- <Dependency>xorg-data</Dependency>
- <Dependency>xorg-app</Dependency>
+ <Dependency versionFrom="7.3">xorg-data</Dependency>
+ <Dependency versionFrom="7.3">xorg-app</Dependency>
<Dependency>xorg-font</Dependency>
<Dependency>xorg-input</Dependency>
<Dependency>xorg-video</Dependency>
@@ -84,6 +84,7 @@
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/cursors</Path>
<Path fileType="data">/usr/share/aclocal</Path>
+ <Path fileType="data">/var/lib/xkb</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/libGL.la">lib/libGL.la</AdditionalFile>
@@ -96,6 +97,13 @@
</Package>
<History>
+ <Update release="29">
+ <Date>2007-12-28</Date>
+ <Version>7.3</Version>
+ <Comment>Use /var/lib/xkb for compiled maps + some package fixes</Comment>
+ <Name>Fatih Aşıcı</Name>
+ <Email>fatih at pardus.org.tr</Email>
+ </Update>
<Update release="28">
<Date>2007-12-14</Date>
<Version>7.3</Version>
Paketler-commits mesaj listesiyle ilgili
daha fazla bilgi