[Frugalware-darcs] frugalware-current: xorg-server-1.1.99.901-1-x86_64

Christian Hamar alias krix krics at linuxforum.hu
Wed Oct 18 19:23:40 CEST 2006


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061018172520-d209c-1fbeee0ade55de340f9f082fb59e20838be65a96.gz;

[xorg-server-1.1.99.901-1-x86_64
Christian Hamar alias krix <krics at linuxforum.hu>**20061018172520
   * Version bump
   * Removed deprecated patch (in upstream)
   * Added a new patch for xprint initd fixes
   * Disabled xorgcfg build
 
] {
hunk ./source/x11/xorg-server/F-xorg-x11-server-1.1.1-pclose-confusion.patch 1
---- xorg-server-1.1.1/xkb/ddxList.c.pclose	2006-07-05 14:38:48.000000000 -0400
-+++ xorg-server-1.1.1/xkb/ddxList.c	2006-09-18 14:10:34.000000000 -0400
-@@ -268,7 +268,7 @@
- #ifndef WIN32
-     if (haveDir)
- 	fclose(in);
--    else if ((rval=pclose(in))!=0) {
-+    else if ((rval=Pclose(in))!=0) {
- 	if (xkbDebugFlags)
- 	    ErrorF("xkbcomp returned exit code %d\n",rval);
-     }
rmfile ./source/x11/xorg-server/F-xorg-x11-server-1.1.1-pclose-confusion.patch
hunk ./source/x11/xorg-server/FrugalBuild 1
-# Last Modified: Sat, 07 Oct 2006 13:39:03 +0200
+# Last Modified: Wed, 18 Oct 2006 19:10:15 +0200
hunk ./source/x11/xorg-server/FrugalBuild 6
-pkgver=1.1.1
-pkgrel=8
+pkgver=1.1.99.901
+pkgrel=1
hunk ./source/x11/xorg-server/FrugalBuild 9
-pkgdesc="X.Org X server"
+pkgdesc="Modular X.Org X Server"
hunk ./source/x11/xorg-server/FrugalBuild 13
-depends=('libxfont' 'libx11' 'xtrans' 'libxau' 'libxext' 'libxkbfile' 'libxdmcp' 'libxmu' \
-	'libxrender' 'libxi' 'freetype2' 'mesa>=6.5.1-3' 'font-cursor-misc' 'font-misc-misc' \
-	'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' 'libxpm' 'libxxf86misc' \
-	'libxxf86vm' 'libxkbui' 'liblbxutil' 'xorg-cf-files' 'libxtst' 'font-alias')
+depends=('libxfont>=1.2.3' 'libx11>=1.0.99.1' 'xtrans>=1.0.2' 'libxau' \
+	'libxext>=1.0.2' 'libxkbfile>=1.0.4' 'libxdmcp' 'libxmu' 'libxrender>=0.9.2' \
+	'libxi' 'freetype2' 'mesa>=6.5.1-3' 'font-cursor-misc' 'font-misc-misc' \
+	'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit>=1.0.3' 'libxaw' \
+	'libxpm>=3.5.6' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' \
+	'xorg-cf-files' 'libxtst' 'font-alias')
hunk ./source/x11/xorg-server/FrugalBuild 23
-	'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' 'xorg-sgml-doctools')
+	'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.2' 'fontcacheproto' 'xorg-sgml-doctools')
hunk ./source/x11/xorg-server/FrugalBuild 38
-	xorg-x11-server-1.1.1-mesa-6.5.1.patch \
hunk ./source/x11/xorg-server/FrugalBuild 40
-	F-xorg-x11-server-1.1.1-pclose-confusion.patch)
-sha1sums=('eb29dd4fea9f184321cbb5512f68b674ada4daf7' \
+	xprint-rc-files-fix.patch)
+sha1sums=('9201f9ec7250eb76dabbc2beb50158aa37ff9b9e' \
hunk ./source/x11/xorg-server/FrugalBuild 51
-	  'faae59130c5eb78baf6d17c2662148fdf90d2131' \
hunk ./source/x11/xorg-server/FrugalBuild 53
-	  'dcccc12d495d85e1c0d9dd36b8e571e480d843d8')
+	  '0eb64d46172b6f2f4462c02dad7964c6d7656076')
hunk ./source/x11/xorg-server/FrugalBuild 72
-	# For mesa 6.5.1 (maybe will in new upstream)
-	Fpatch xorg-x11-server-1.1.1-mesa-6.5.1.patch
hunk ./source/x11/xorg-server/FrugalBuild 75
-	Fpatch F-xorg-x11-server-1.1.1-pclose-confusion.patch
+
+	# Hack for init scripts and wrong install stuff for xprint
+	Fpatch xprint-rc-files-fix.patch
hunk ./source/x11/xorg-server/FrugalBuild 98
+		--disable-xorgcfg \
hunk ./source/x11/xorg-server/FrugalBuild 105
+	# I dont think that simple user need this Xsession file on by-default :S
+	Fmkdir /etc/X11/Xsession.d.xprint
+	Fmv /etc/X11/Xsession.d/92* /etc/X11/Xsession.d.xprint/
+
addfile ./source/x11/xorg-server/xprint-rc-files-fix.patch
hunk ./source/x11/xorg-server/xprint-rc-files-fix.patch 1
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/init.d/xprint.cpp xorg-server-1.1.99.901/hw/xprint/etc/init.d/xprint.cpp
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/init.d/xprint.cpp	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/init.d/xprint.cpp	2006-10-18 18:50:28.000000000 +0200
+@@ -42,21 +42,21 @@
+ XCOMM
+ XCOMM Usage:
+ XCOMM - Start Xprint server(s) manually:
+-XCOMM   % /etc/init.d/xprint start
++XCOMM   % /etc/rc.d/rc.xprint start
+ XCOMM
+ XCOMM - Stop Xprint server(s) manually:
+-XCOMM   % /etc/init.d/xprint stop
++XCOMM   % /etc/rc.d/rc.xprint stop
+ XCOMM
+ XCOMM - Populate $XPSERVERLIST env var (for example as part of a global
+ XCOMM   login script like /etc/profile or per-user login scripts like
+ XCOMM   $HOME/.profile (sh/ksh/bash))
+-XCOMM   % XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
++XCOMM   % XPSERVERLIST="`/etc/rc.d/rc.xprint get_xpserverlist`"
+ XCOMM   % export XPSERVERLIST
+ XCOMM
+ XCOMM Installation:
+-XCOMM   Copy this script to /etc/init.d/xprint and make sure that it is
++XCOMM   Copy this script to /etc/rc.d/rc.xprint and make sure that it is
+ XCOMM   executable. If your installation is LSB-compliant, then run
+-XCOMM   % /usr/lib/lsb/install_initd /etc/init.d/xprint
++XCOMM   % /usr/lib/lsb/install_initd /etc/rc.d/rc.xprint
+ XCOMM   to start the service on startup. Otherwise, manually create links
+ XCOMM   to the matching run levels.
+ XCOMM   Examples:
+@@ -683,7 +683,7 @@
+                   echo "Xprint server pid=${server_pid} done, exitcode=$?."
+                   
+                   # Remove the dead server from the registry
+-                  # (only if the registry still exists - if /etc/init.d/xprint stop" gets called the registry
++                  # (only if the registry still exists - if /etc/rc.d/rc.xprint stop" gets called the registry
+                   # will be removed - and we should not re-create it afterwards...)
+                   lock_server_registry
+                   if [ -f "${XP_SERVERS}" ] ; then
+@@ -748,7 +748,7 @@
+     else 
+         # Continue in the background if there is no spooler running yet (that
+         # we don't hold off the boot process nor run in a possible race-condition
+-        # when /etc/init.d/lpd was not called yet but the runlevel script waits
++        # when /etc/rc.d/rc.lpd was not called yet but the runlevel script waits
+         # for us to finish first ...
+         if is_spooler_running ; then
+             msg "Starting Xprint servers: Xprt."
+@@ -1098,7 +1098,7 @@
+         # done with setting the config for per-user Xprt instances
+         return 0;
+     else
+-        # Use /etc/init.d/xprint's builtin config
++        # Use /etc/rc.d/rc.xprint's builtin config
+         # Each entry should start with |setup_config_defaults| to pull the
+         # platform defaults and finish with |num_xpstart=$(($num_xpstart + 1))|
+         # to end the entry
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/profile.d/xprint.csh xorg-server-1.1.99.901/hw/xprint/etc/profile.d/xprint.csh
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/profile.d/xprint.csh	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/profile.d/xprint.csh	2006-10-18 18:48:49.000000000 +0200
+@@ -9,8 +9,8 @@
+ # Obtain list of Xprint servers
+ #
+ 
+-if ( -f /etc/init.d/xprint ) then
+-  setenv XPSERVERLIST "`/bin/sh /etc/init.d/xprint get_xpserverlist`"
++if ( -f /etc/rc.d/rc.xprint ) then
++  setenv XPSERVERLIST "`/bin/sh /etc/rc.d/xprint get_xpserverlist`"
+ endif
+ 
+ # /etc/profile.d/xprint.csh ends here.
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/profile.d/xprint.sh xorg-server-1.1.99.901/hw/xprint/etc/profile.d/xprint.sh
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/profile.d/xprint.sh	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/profile.d/xprint.sh	2006-10-18 18:49:09.000000000 +0200
+@@ -8,8 +8,8 @@
+ # Obtain list of Xprint servers
+ #
+ 
+-if [ -f "/etc/init.d/xprint" ] ; then
+-  XPSERVERLIST="`/bin/sh /etc/init.d/xprint get_xpserverlist`"
++if [ -f "/etc/rc.d/rc.xprint" ] ; then
++  XPSERVERLIST="`/bin/sh /etc/rc.d/rc.xprint get_xpserverlist`"
+   export XPSERVERLIST
+ fi
+ 
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/92xprint-xpserverlist xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/92xprint-xpserverlist	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/92xprint-xpserverlist	2006-10-18 18:50:47.000000000 +0200
+@@ -22,8 +22,8 @@
+ # Obtain list of Xprint servers
+ #
+ 
+-if [ -x "/etc/init.d/xprint" ] ; then
+-  XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
++if [ -x "/etc/rc.d/rc.xprint" ] ; then
++  XPSERVERLIST="`/etc/rc.d/rc.xprint get_xpserverlist`"
+   export XPSERVERLIST
+ fi
+ 
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/Makefile.am xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/Makefile.am
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/Makefile.am	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/Makefile.am	2006-10-18 18:50:56.000000000 +0200
+@@ -1,2 +1,2 @@
+-xpcdir = $(sysconfdir)/X11/Xsession.d
++xpcdir = $(sysconfdir)/Xsession.d
+ dist_xpc_DATA = 92xprint-xpserverlist
+diff -Naur xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/Makefile.in xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/Makefile.in
+--- xorg-server-1.1.99.901.orig/hw/xprint/etc/Xsession.d/Makefile.in	2006-10-18 18:48:22.000000000 +0200
++++ xorg-server-1.1.99.901/hw/xprint/etc/Xsession.d/Makefile.in	2006-10-18 18:51:30.000000000 +0200
+@@ -518,7 +518,7 @@
+ target_alias = @target_alias@
+ xglmoduledir = @xglmoduledir@
+ xpconfigdir = @xpconfigdir@
+-xpcdir = $(sysconfdir)/X11/Xsession.d
++xpcdir = $(sysconfdir)/Xsession.d
+ dist_xpc_DATA = 92xprint-xpserverlist
+ all: all-am
+ 
}


More information about the Frugalware-darcs mailing list