# HG changeset patch # User Alan Coopersmith # Date 1312317029 25200 # Node ID 4ad971e180c3bceb92eedb63be577c1c2bdc77d5 # Parent 859fc7cfa429e97c83ca04ec78679ea2bf237cdc 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition] diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/iceauth/Makefile --- a/open-src/app/iceauth/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/iceauth/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,17 +33,17 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.0.4 +MODULE_VERSION=1.0.5 # Checksums for upstream tarball -TARBALL_MD5 = bb2e4d2611047f7c5a1a82ec956a9de4 -TARBALL_SHA1 = 9b446c0d1815dce48bdea32db7dea7e429f6a310 +TARBALL_MD5 = 08e3f6b523da8b0af179f22f339508b2 +TARBALL_SHA1 = d996c6ecaa93dcaccee4a11991eeacd40bddc13e # Patches to apply to source after unpacking, in order SOURCE_PATCHES = # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/iceauth.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/mkfontscale/Makefile --- a/open-src/app/mkfontscale/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/mkfontscale/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,11 +33,11 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.0.8 +MODULE_VERSION=1.0.9 # Checksums for upstream tarball -TARBALL_MD5 = 5210c9385c6cc4a00ce829d8dc9c819b -TARBALL_SHA1 = accfb12751bf3b7ae7b28c1b0b863d5be871398f +TARBALL_MD5 = 3d1dc487f3e859f4e5c46540cb49abd3 +TARBALL_SHA1 = 5a8ac438d6d6694dcf1314b74c4d9f029da4f486 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = @@ -47,7 +47,7 @@ MODULE_ARC_CASES = LSARC/2008/009 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/mkfontscale.man MODULE_STABILITY=Uncommitted # Additional configure script options diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/smproxy/Makefile --- a/open-src/app/smproxy/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/smproxy/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,20 +33,20 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.0.4 +MODULE_VERSION=1.0.5 # Checksums for upstream tarball -TARBALL_MD5 = 8ab518393bef44d3ea2bccb027021aab -TARBALL_SHA1 = ea9639b6d0669f157ac62b807cdba64f509b25ed +TARBALL_MD5 = edce41bd7562dcdfb813e05dbeede8ac +TARBALL_SHA1 = 59e19def9a351896cb3101cb580ae424e9e48a3e # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = pkgconfig.patch,-p1 +SOURCE_PATCHES = # Need to regenerate configure from configure.ac after applying pkgconfig.patch AUTORECONF = yes # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/smproxy.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/smproxy/pkgconfig.patch --- a/open-src/app/smproxy/pkgconfig.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -From ccc165063c128713e5eac52ace050e38ce72de02 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Fri, 28 Jan 2011 00:18:47 -0800 -Subject: [PATCH:smproxy] Explicitly depend on libICE since ICE functions are called directly - -Without this fix, once Bug 33390 removes "Requires: ice" from the sm.pc -file, smproxy fails to build with undefined symbol errors for -IceSetErrorHandler, IceConnectionNumber, and IceProcessMessages. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Julien Cristau ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0daa9f2..98687c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS - AC_CHECK_FUNCS([mkstemp]) - - # Checks for pkg-config packages --PKG_CHECK_MODULES(SMPROXY, sm xt xmuu) -+PKG_CHECK_MODULES(SMPROXY, [sm ice xt xmuu]) - - AC_CONFIG_FILES([ - Makefile --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/twm/Makefile --- a/open-src/app/twm/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/twm/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,11 +33,12 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.0.6 +MODULE_VERSION=1.0.7 # Checksums for upstream tarball -TARBALL_MD5 = 952d06a0c2ec34687b536c7b619fc671 -TARBALL_SHA1 = 5c28194c9c620b34df56fdee140d662425ba8a86 +TARBALL_MD5 = c1c124ff16255d6525a53a0d5cec8bf9 +TARBALL_SHA1 = ff535ef8e676f9ca876a6166858798c7fe70d446 +TARBALL_SHA256 = 0f5d53dec62540fa97c96b4e983695cc32114836d256b64885253ab58b5bcd44 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/x11perf/Makefile --- a/open-src/app/x11perf/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/x11perf/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,11 +29,12 @@ MODULE_NAME=x11perf # Version number (used in path names) -MODULE_VERSION=1.5.3 +MODULE_VERSION=1.5.4 # Checksums for upstream tarball -TARBALL_MD5 = c3ac3667a6f5c3cead9847fbf4b5f36e -TARBALL_SHA1 = 2fd00ba38c36c569751bbe3d60917df2a39e10ba +TARBALL_MD5 = 5c3c7431a38775caaea6051312a49bc9 +TARBALL_SHA1 = d820e95ee6698e7036d4823f5ac5669b79acea86 +TARBALL_SHA256 = 24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = @@ -47,7 +48,7 @@ MODULE_ARC_CASES = PSARC/2008/095 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/*.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xauth/Makefile --- a/open-src/app/xauth/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xauth/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,17 +33,17 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.0.5 +MODULE_VERSION=1.0.6 # Checksums for upstream tarball -TARBALL_MD5 = 46fc44e5e947d3720f3be5054044ff0e -TARBALL_SHA1 = 6d94b5822e8ce08630a8ff510230246d5ed45290 +TARBALL_MD5 = 105f5b00bb9293b3db36f7e500d4f950 +TARBALL_SHA1 = 10a68367ecc60a641b9aa89e6f24f7ca71f23874 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xauth.man MODULE_STABILITY=Committed # ARC cases that covered this module diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xinit/6714067.patch --- a/open-src/app/xinit/6714067.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xinit/6714067.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,7 +1,8 @@ -diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am ---- Makefile.am 2010-04-26 08:48:51.000000000 -0700 -+++ Makefile.am 2011-01-28 18:41:11.374909599 -0800 -@@ -52,6 +52,7 @@ PROGCPPDEFS = \ +diff --git a/Makefile.am b/Makefile.am +index 3867bea..8288450 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -49,6 +49,7 @@ PROGCPPDEFS = \ -DXINIT=@XINIT@ CPP_FILES_FLAGS = \ @@ -9,10 +10,11 @@ -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \ -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \ -D__libexecdir__="$(libexecdir)" \ -diff -urp -x '*~' -x '*.orig' Makefile.in Makefile.in ---- Makefile.in 2010-10-30 16:44:46.000000000 -0700 -+++ Makefile.in 2011-01-28 18:41:11.375365804 -0800 -@@ -374,6 +374,7 @@ PROGCPPDEFS = \ +diff --git a/Makefile.in b/Makefile.in +index e6d2356..e53e951 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -356,6 +356,7 @@ PROGCPPDEFS = \ -DXINIT=@XINIT@ CPP_FILES_FLAGS = \ @@ -20,10 +22,11 @@ -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \ -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \ -D__libexecdir__="$(libexecdir)" \ -diff -urp -x '*~' -x '*.orig' xinit.c xinit.c ---- xinit.c 2010-06-11 18:14:10.000000000 -0700 -+++ xinit.c 2011-01-28 18:41:11.375613442 -0800 -@@ -630,6 +630,26 @@ shutdown(void) +diff --git a/xinit.c b/xinit.c +index 42ff008..e8b7559 100644 +--- a/xinit.c ++++ b/xinit.c +@@ -629,6 +629,26 @@ shutdown(void) if (processTimeout(3, "server to die")) Fatalx("X server refuses to die"); diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xinit/7023672.patch --- a/open-src/app/xinit/7023672.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xinit/7023672.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,11 +1,13 @@ ---- xinitrc.cpp.orig Wed Mar 16 10:11:59 2011 -+++ xinitrc.cpp Wed Mar 16 10:13:12 2011 -@@ -39,6 +39,19 @@ +diff --git a/xinitrc.cpp b/xinitrc.cpp +index 049a8e4..e60ff12 100644 +--- a/xinitrc.cpp ++++ b/xinitrc.cpp +@@ -39,6 +39,19 @@ if [ -f "$usermodmap" ]; then XMODMAP "$usermodmap" fi +XCOMM -+XCOMM If OpenSolaris branded desktop is available, run it ++XCOMM If GNOME desktop is available, run it +XCOMM +if [ -x /etc/gdm/Xsession ] && [ -x /usr/bin/dtstart ] ; then + exec /etc/gdm/Xsession /usr/bin/dtstart jds diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xinit/Makefile --- a/open-src/app/xinit/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xinit/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,14 +29,15 @@ MODULE_NAME=xinit # Version number (used in path names) -MODULE_VERSION=1.3.0 +MODULE_VERSION=1.3.1 # Checksums for upstream tarball -TARBALL_MD5 = bc4e8b7d1919597cc37a0d24aa149dda -TARBALL_SHA1 = 6437292214bbca6efad8889c68e72a1ca584928b +TARBALL_MD5 = ee234056d8a3dbf37b61b4bcb35b88e4 +TARBALL_SHA1 = 6d3981c23ce49212a26912651d6d2473a5065766 +TARBALL_SHA256 = c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0 # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = 6714067.patch 7023672.patch +SOURCE_PATCHES = 6714067.patch,-p1 7023672.patch,-p1 # pkg(5) name we deliver the files in (override default) MODULE_PKGNAME=x11/session/$(MODULE_NAME) @@ -49,7 +50,7 @@ MODULE_ARC_CASES += PSARC/2011/033 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/*.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xkbcomp/Makefile --- a/open-src/app/xkbcomp/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xkbcomp/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -33,17 +33,17 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.2.0 +MODULE_VERSION=1.2.3 # Checksums for upstream tarball -TARBALL_MD5 = 0f55995cd8da9b2d88553e1a2e17cd0a -TARBALL_SHA1 = 67a10a1671fd1a0d6e09b4dfe93d0331af699f26 +TARBALL_MD5 = 35622a497894c1cff9182d42696c3e27 +TARBALL_SHA1 = c20d1b5b8e25634cc9a79c5e4c3397a5ffbee1e0 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xkbcomp.man MODULE_STABILITY=Volatile # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xman/6708109.patch --- a/open-src/app/xman/6708109.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xman/6708109.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,6 +1,35 @@ -diff -urp -x '*~' -x '*.orig' buttons.c buttons.c ---- buttons.c 2009-10-16 14:39:48.000000000 -0700 -+++ buttons.c 2011-01-28 20:32:24.195046596 -0800 +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +Includes Solaris changes for: +4213490 Add support for SGML format man pages +4226089 xman utility needs to display new SunOS directories +4365478 Internationalize xman + +diff --git a/buttons.c b/buttons.c +index 9233346..cd57352 100644 +--- a/buttons.c ++++ b/buttons.c @@ -36,6 +36,8 @@ from the X Consortium. * Created: October 27, 1987 */ @@ -18,7 +47,7 @@ static void StartManpage(ManpageGlobals * man_globals, Boolean help, Boolean page); static Widget * ConvertNamesToWidgets(Widget parent, char ** names); -@@ -57,6 +60,7 @@ static Widget * ConvertNamesToWidgets(Wi +@@ -57,6 +60,7 @@ static Widget * ConvertNamesToWidgets(Widget parent, char ** names); */ #define TOPARGS 5 @@ -88,7 +117,7 @@ /* Create Directory */ -@@ -330,7 +353,7 @@ StartManpage(ManpageGlobals * man_global +@@ -330,7 +353,7 @@ StartManpage(ManpageGlobals * man_globals, Boolean help, Boolean page) if (page || help) { if (help) @@ -97,7 +126,7 @@ if (man_globals->both_shown) { XtManageChild(dir); -@@ -519,7 +542,7 @@ CreateSectionMenu(ManpageGlobals * man_g +@@ -519,7 +542,7 @@ CreateSectionMenu(ManpageGlobals * man_globals, Widget parent) menu = XtCreatePopupShell(SECTION_MENU, simpleMenuWidgetClass, parent, NULL, (Cardinal) 0); @@ -105,8 +134,8 @@ + for (i = 0 ; i < ((sections <= MAX_MENU) ? sections:sections/2) ; i ++) { num_args = 0; XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++; - sprintf(entry_name, "section%d", i); -@@ -535,6 +558,37 @@ CreateSectionMenu(ManpageGlobals * man_g + snprintf(entry_name, sizeof(entry_name), "section%d", i); +@@ -535,6 +558,37 @@ CreateSectionMenu(ManpageGlobals * man_globals, Widget parent) } } @@ -128,7 +157,7 @@ + for (i = sections/2-1 ; i < sections ; i ++) { + num_args = 0; + XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++; -+ sprintf(entry_name, "section%d", i); ++ snprintf(entry_name, sizeof(entry_name), "section%d", i); + + entry = XtCreateManagedWidget(entry_name, smeBSBObjectClass, + menu, args, num_args); @@ -144,16 +173,16 @@ /* Function Name: CreateList * Description: this function prints a label in the directory list * Arguments: section - the manual section. -@@ -579,7 +633,7 @@ MakeDirectoryBox(ManpageGlobals *man_glo +@@ -579,7 +633,7 @@ MakeDirectoryBox(ManpageGlobals *man_globals, Widget parent, Widget *dir_disp, i return; name = manual[section].blabel; /* Set the section name */ -- sprintf(label_name,"Directory of: %s",name); +- snprintf(label_name, sizeof(label_name), "Directory of: %s", name); + snprintf(label_name, sizeof(label_name), gettext("Directory of: %s"),name); man_globals->section_name[section] = StrAlloc(label_name); num_args = 0; -@@ -677,7 +731,7 @@ FormUpWidgets(Widget parent, char ** ful +@@ -677,7 +731,7 @@ FormUpWidgets(Widget parent, char ** full_size, char ** half_size) if (long_widget == (Widget) NULL) { /* Make sure we found one. */ PopupWarning(GetGlobals(parent), @@ -162,19 +191,19 @@ XtFree((char *)full_widgets); XtFree((char *)half_widgets); return; -@@ -745,7 +799,8 @@ ConvertNamesToWidgets(Widget parent, cha - if (*temp_ids == NULL) { +@@ -746,7 +800,7 @@ ConvertNamesToWidgets(Widget parent, char ** names) char error_buf[BUFSIZ]; -- sprintf(error_buf, "Could not find widget named '%s'", *names); -+ snprintf(error_buf, sizeof(error_buf), -+ gettext("Could not find widget named '%s'"), *names); + snprintf(error_buf, sizeof(error_buf), +- "Could not find widget named '%s'", *names); ++ gettext("Could not find widget named '%s'"), *names); PrintError(error_buf); XtFree((char *)ids); return(NULL); -diff -urp -x '*~' -x '*.orig' defs.h defs.h ---- defs.h 2009-10-16 14:39:48.000000000 -0700 -+++ defs.h 2011-01-28 20:32:24.195247147 -0800 +diff --git a/defs.h b/defs.h +index ec4d068..9326268 100644 +--- a/defs.h ++++ b/defs.h @@ -51,6 +51,7 @@ from the X Consortium. #define OPTION_MENU "optionMenu" /* Name of the Option Menu. */ @@ -183,9 +212,10 @@ #define HELP_BUTTON "helpButton" /* Name of top help button */ #define QUIT_BUTTON "quitButton" /* Name of top quit button */ -diff -urp -x '*~' -x '*.orig' handler.c handler.c ---- handler.c 2009-11-06 17:58:29.000000000 -0800 -+++ handler.c 2011-01-28 20:32:24.173913473 -0800 +diff --git a/handler.c b/handler.c +index 4fe291f..32a3e7d 100644 +--- a/handler.c ++++ b/handler.c @@ -43,6 +43,8 @@ from the X Consortium. #include #include "globals.h" @@ -195,7 +225,7 @@ #ifdef INCLUDE_XPRINT_SUPPORT #include "printdialog.h" #include "print.h" -@@ -309,8 +311,10 @@ SaveFormattedPage(Widget w, XEvent * eve +@@ -309,8 +311,10 @@ SaveFormattedPage(Widget w, XEvent * event, String * params, Cardinal * num_para char cmdbuf[BUFSIZ], error_buf[BUFSIZ]; if (*num_params != 1) { @@ -208,32 +238,39 @@ return; } -@@ -347,12 +351,12 @@ SaveFormattedPage(Widget w, XEvent * eve +@@ -347,13 +351,13 @@ SaveFormattedPage(Widget w, XEvent * event, String * params, Cardinal * num_para /* make sure the formatted man page is fully accessible by the world */ if (chmod(man_globals->save_file, CHMOD_MODE) != 0) { - sprintf(error_buf, + snprintf(error_buf, sizeof(error_buf), - "Couldn't set permissions on formatted man page '%s'.\n", + gettext("Couldn't set permissions on formatted man page '%s'.\n"), man_globals->save_file); PopupWarning( man_globals, error_buf); } } else { -- sprintf(error_buf, "Error while executing the command '%s'.\n", -+ sprintf(error_buf, gettext("Error while executing the command '%s'.\n"), - cmdbuf); + snprintf(error_buf, sizeof(error_buf), +- "Error while executing the command '%s'.\n", cmdbuf); ++ gettext("Error while executing the command '%s'.\n"), cmdbuf); PopupWarning( man_globals, error_buf); } -@@ -362,7 +366,7 @@ SaveFormattedPage(Widget w, XEvent * eve + break; +@@ -361,8 +365,9 @@ SaveFormattedPage(Widget w, XEvent * event, String * params, Cardinal * num_para + case 'c': break; default: - sprintf(error_buf,"%s %s", "Xman - SaveFormattedPagee:", -- "Unknown argument must be either 'Save' or 'Cancel'."); +- PopupWarning(man_globals, "Xman - SaveFormattedPage: " +- "Unknown argument must be either 'Save' or 'Cancel'."); ++ snprintf(error_buf, sizeof(error_buf), "%s %s", "Xman - SaveFormattedPage:", + gettext("Unknown argument must be either 'Save' or 'Cancel'.")); - PopupWarning(man_globals, error_buf); ++ PopupWarning(man_globals, error_buf); return; } -@@ -397,8 +401,10 @@ GotoPage(Widget w, XEvent * event, Strin + +@@ -393,10 +398,13 @@ GotoPage(Widget w, XEvent * event, String * params, Cardinal * num_params) + ManpageGlobals * man_globals; + Arg arglist[1]; Boolean sensitive; ++ char error_buf[BUFSIZ]; if (*num_params != 1) { - XtAppWarning(XtWidgetToApplicationContext(w), @@ -245,18 +282,18 @@ return; } -@@ -431,8 +437,8 @@ GotoPage(Widget w, XEvent * event, Strin - man_globals->dir_shown = TRUE; +@@ -430,8 +438,8 @@ GotoPage(Widget w, XEvent * event, String * params, Cardinal * num_params) break; default: -- sprintf(error_buf,"%s %s", "Xman - GotoPage: Unknown argument must be", -- "either Manpage or Directory."); -+ sprintf(error_buf,"%s %s", gettext("Xman - GotoPage: Unknown argument must be"), -+ gettext("either Manpage or Directory.")); - XtAppWarning(XtWidgetToApplicationContext(w), error_buf); + XtAppWarning(XtWidgetToApplicationContext(w), +- "Xman - GotoPage: Unknown argument must be " +- "either Manpage or Directory."); ++ gettext("Xman - GotoPage: Unknown argument must be " ++ "either Manpage or Directory.")); return; } -@@ -550,13 +556,16 @@ void + } +@@ -548,13 +556,16 @@ void Search(Widget w, XEvent * event, String * params, Cardinal * num_params) { ManpageGlobals * man_globals = GetGlobals(w); @@ -275,7 +312,7 @@ return; } -@@ -574,8 +583,10 @@ Search(Widget w, XEvent * event, String +@@ -572,8 +583,10 @@ Search(Widget w, XEvent * event, String * params, Cardinal * num_params) file = NULL; break; default: @@ -288,7 +325,7 @@ file = NULL; break; } -@@ -600,8 +611,9 @@ Search(Widget w, XEvent * event, String +@@ -598,8 +611,9 @@ Search(Widget w, XEvent * event, String * params, Cardinal * num_params) } break; default: @@ -300,9 +337,10 @@ break; } else { -diff -urp -x '*~' -x '*.orig' help.c help.c ---- help.c 2009-10-16 14:39:48.000000000 -0700 -+++ help.c 2011-01-28 20:32:24.173431338 -0800 +diff --git a/help.c b/help.c +index c9d9aa9..8b30d25 100644 +--- a/help.c ++++ b/help.c @@ -36,6 +36,8 @@ from the X Consortium. * Created: January 19, 1988 */ @@ -321,7 +359,7 @@ XtManageChild( man_globals->manpagewidgets.manpage ); XtRealizeWidget( help_widget ); -@@ -99,7 +101,7 @@ OpenHelpfile(ManpageGlobals * man_global +@@ -99,7 +101,7 @@ OpenHelpfile(ManpageGlobals * man_globals) if( (help_file_ptr = fopen(resources.help_file, "r")) == NULL ) { PopupWarning(man_globals, @@ -330,9 +368,10 @@ return(FALSE); } -diff -urp -x '*~' -x '*.orig' main.c main.c ---- main.c 2009-10-16 14:39:48.000000000 -0700 -+++ main.c 2011-01-28 20:32:24.172597167 -0800 +diff --git a/main.c b/main.c +index 1b6f8e9..73f4fcc 100644 +--- a/main.c ++++ b/main.c @@ -37,6 +37,8 @@ from the X Consortium. * Created: October 22, 1987 */ @@ -431,12 +470,13 @@ + (void) printf(gettext("This argument is unknown to Xman: %s\n"), argv[i]); - (void) printf("\nKnown arguments are:\n"); -+ (void) printf(gettext("\nKnown arguments are:\n")); - +- - while ( *syntax != NULL ) { - printf("%-30s - %s\n", syntax[0], syntax[1]); - syntax += 2; - } ++ (void) printf(gettext("\nKnown arguments are:\n")); ++ + printf("-help - %s\n", + gettext("Print this message")); + printf("-helpfile %s - %s\n", gettext(" "), @@ -482,9 +522,10 @@ } /* Function Name: AdjustDefResources -diff -urp -x '*~' -x '*.orig' man.c man.c ---- man.c 2009-10-16 14:39:48.000000000 -0700 -+++ man.c 2011-01-28 20:32:24.173179002 -0800 +diff --git a/man.c b/man.c +index ad2b3f0..f3f1d99 100644 +--- a/man.c ++++ b/man.c @@ -31,7 +31,8 @@ from the X Consortium. */ /* $XFree86: xc/programs/xman/man.c,v 1.8 2003/04/09 20:31:31 herrb Exp $ */ @@ -526,7 +567,7 @@ /* * First step -@@ -426,7 +427,7 @@ ReadCurrentSection(Manual * local_manual +@@ -426,7 +427,7 @@ ReadCurrentSection(Manual * local_manual, char * path) if((dir = opendir(path)) == NULL) { #ifdef DEBUG @@ -535,7 +576,7 @@ PopupWarning(NULL, error_buf); #endif /* DEBUG */ return; -@@ -512,7 +513,7 @@ ReadCurrentSection(Manual * local_manual +@@ -512,7 +513,7 @@ ReadCurrentSection(Manual * local_manual, char * path) local_manual->entries_less_paths[nentries] = rindex(local_manual->entries[nentries], '/'); if ( local_manual->entries_less_paths[nentries] == NULL ) @@ -580,9 +621,10 @@ for (j = 0; j < manual[i].nentries; j++) printf("%s\n", manual[i].entries[j]); } -diff -urp -x '*~' -x '*.orig' misc.c misc.c ---- misc.c 2009-10-16 14:39:48.000000000 -0700 -+++ misc.c 2011-01-28 20:32:24.196139861 -0800 +diff --git a/misc.c b/misc.c +index 8818aa8..fe476ec 100644 +--- a/misc.c ++++ b/misc.c @@ -41,6 +41,8 @@ from the X Consortium. # include "config.h" #endif @@ -592,7 +634,7 @@ #include "globals.h" #include "vendor.h" #include /* sys/types.h and unistd.h included in here */ -@@ -98,7 +100,7 @@ PopupWarning(ManpageGlobals * man_global +@@ -98,7 +100,7 @@ PopupWarning(ManpageGlobals * man_globals, const char * string) char buffer[BUFSIZ]; Boolean hasPosition; @@ -601,7 +643,7 @@ hasPosition = FALSE; if (top) { -@@ -140,7 +142,7 @@ PopupWarning(ManpageGlobals * man_global +@@ -140,7 +142,7 @@ PopupWarning(ManpageGlobals * man_globals, const char * string) void PrintError(char * string) { @@ -610,7 +652,7 @@ exit(EXIT_FAILURE); } -@@ -202,7 +204,7 @@ FindManualFile(ManpageGlobals * man_glob +@@ -202,7 +204,7 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num) temp = CreateManpageName(entry, 0, 0); snprintf(man_globals->manpage_title, sizeof(man_globals->manpage_title), @@ -619,26 +661,25 @@ XtFree(temp); ParseEntry(entry, path, section, page); -@@ -328,14 +330,14 @@ Uncompress(ManpageGlobals * man_globals, +@@ -328,13 +330,13 @@ Uncompress(ManpageGlobals * man_globals, char * filename) return(NULL); else if ((file = fopen(tmp_file, "r")) == NULL) { -- sprintf(error_buf, "Something went wrong in retrieving the %s", -- "uncompressed manual page try cleaning up /tmp."); -+ sprintf(error_buf, gettext("Something went wrong in retrieving the %s"), -+ gettext("uncompressed manual page try cleaning up /tmp.")); - PopupWarning(man_globals, error_buf); +- PopupWarning(man_globals, "Something went wrong in retrieving the " +- "uncompressed manual page try cleaning up /tmp."); ++ PopupWarning(man_globals, gettext("Something went wrong in retrieving " ++ "the uncompressed manual page. Try cleaning up /tmp.")); } #else if (!UncompressNamed(man_globals, filename, tmp_file, &file)) { -- sprintf(error_buf, "Something went wrong in retrieving the %s", -- "uncompressed manual page try cleaning up /tmp."); -+ sprintf(error_buf, gettext("Something went wrong in retrieving the %s"), -+ gettext("uncompressed manual page try cleaning up /tmp.")); - PopupWarning(man_globals, error_buf); +- PopupWarning(man_globals, "Something went wrong in retrieving the " +- "uncompressed manual page try cleaning up /tmp."); ++ PopupWarning(man_globals, gettext("Something went wrong in retrieving " ++ "the uncompressed manual page. Try cleaning up /tmp.")); return(NULL); } -@@ -373,7 +375,7 @@ UncompressNamed(ManpageGlobals * man_glo + #endif +@@ -371,7 +373,7 @@ UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output, if (stat(filename, &junk) != 0) { /* Check for existance of the file. */ if (errno != ENOENT) { snprintf(error_buf, sizeof(error_buf), @@ -647,7 +688,7 @@ PopupWarning(man_globals, error_buf); } return(FALSE); -@@ -390,7 +392,7 @@ UncompressNamed(ManpageGlobals * man_glo +@@ -388,7 +390,7 @@ UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output, #else fd = mkstemp(tmp); if (fd < 0) { @@ -656,7 +697,7 @@ return FALSE; } *output_fd = fdopen(fd, "r"); -@@ -420,7 +422,7 @@ UncompressNamed(ManpageGlobals * man_glo +@@ -418,7 +420,7 @@ UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output, return(TRUE); snprintf(error_buf, sizeof(error_buf), @@ -665,7 +706,7 @@ PopupWarning(man_globals, error_buf); return(FALSE); } -@@ -516,7 +518,7 @@ Format(ManpageGlobals * man_globals, cha +@@ -514,7 +516,7 @@ Format(ManpageGlobals * man_globals, char * entry) #endif /* We Really could not find it, this should never happen, yea right. */ snprintf(error_buf, sizeof(error_buf), @@ -674,7 +715,7 @@ PopupWarning(man_globals, error_buf); XtPopdown( XtParent(man_globals->standby) ); return(NULL); -@@ -573,6 +575,19 @@ Format(ManpageGlobals * man_globals, cha +@@ -571,6 +573,19 @@ Format(ManpageGlobals * man_globals, char * entry) ParseEntry(entry, path, sect, NULL); #ifndef HANDLE_ROFFSEQ @@ -694,7 +735,7 @@ #ifndef HAS_MKSTEMP snprintf(cmdbuf, sizeof(cmdbuf), "cd %s ; %s %s %s > %s %s", path, TBL, filename, FORMAT, man_globals->tempfile, "2> /dev/null"); -@@ -580,10 +595,13 @@ Format(ManpageGlobals * man_globals, cha +@@ -578,10 +593,13 @@ Format(ManpageGlobals * man_globals, char * entry) snprintf(cmdbuf, sizeof(cmdbuf), "cd %s ; %s %s %s >> %s %s", path, TBL, filename, FORMAT, man_globals->tempfile, "2> /dev/null"); #endif @@ -704,12 +745,12 @@ #else /* Handle more flexible way of specifying the formatting pipeline */ if (! ConstructCommand(cmdbuf, path, filename, man_globals->tempfile)) { -- sprintf(error_buf, "Constructed command was too long!"); -+ sprintf(error_buf, gettext("Constructed command was too long!")); - PopupWarning(man_globals, error_buf); +- PopupWarning(man_globals, "Constructed command was too long!"); ++ PopupWarning(man_globals, gettext("Constructed command was too long!")); file = NULL; } -@@ -592,15 +610,15 @@ Format(ManpageGlobals * man_globals, cha + else +@@ -589,15 +607,15 @@ Format(ManpageGlobals * man_globals, char * entry) if(system(cmdbuf) != 0) { /* execute search. */ snprintf(error_buf, sizeof(error_buf), @@ -721,14 +762,14 @@ else { #ifndef HAS_MKSTEMP if ((file = fopen(man_globals->tempfile,"r")) == NULL) { -- sprintf(error_buf, "Something went wrong in retrieving the %s", -- "temp file, try cleaning up /tmp"); -+ sprintf(error_buf, gettext("Something went wrong in retrieving the %s"), -+ gettext("temp file, try cleaning up /tmp")); - PopupWarning(man_globals, error_buf); +- PopupWarning(man_globals, "Something went wrong in retrieving the " +- "temp file, try cleaning up /tmp"); ++ PopupWarning(man_globals, gettext("Something went wrong in retrieving " ++ "the temp file, try cleaning up /tmp")); } else { -@@ -1071,7 +1089,7 @@ AddCursor(Widget w, Cursor cursor) + #endif +@@ -1066,7 +1084,7 @@ AddCursor(Widget w, Cursor cursor) Colormap c_map; if (!XtIsRealized(w)) { @@ -737,7 +778,7 @@ return; } -@@ -1182,14 +1200,14 @@ ParseEntry(char *entry, char *path, char +@@ -1177,14 +1195,14 @@ ParseEntry(char *entry, char *path, char *sect, char *page) c = rindex(temp, '/'); if (c == NULL) @@ -754,7 +795,7 @@ *c++ = '\0'; #if defined(SFORMAT) && defined(SMAN) /* sgmltoroff sometimes puts an extra ./ in the path to .so entries */ -@@ -1236,12 +1254,12 @@ GetGlobals(Widget w) +@@ -1231,12 +1249,12 @@ GetGlobals(Widget w) if (temp == NULL) XtAppError(XtWidgetToApplicationContext(w), @@ -769,7 +810,7 @@ return( (ManpageGlobals *) data); } -@@ -1263,7 +1281,7 @@ SaveGlobals(Widget w, ManpageGlobals * g +@@ -1258,7 +1276,7 @@ SaveGlobals(Widget w, ManpageGlobals * globals) if (XSaveContext(XtDisplay(w), XtWindow(w), manglobals_context, (caddr_t) globals) != XCSUCCESS) XtAppError(XtWidgetToApplicationContext(w), @@ -778,16 +819,17 @@ } /* Function Name: RemoveGlobals -@@ -1281,5 +1299,5 @@ RemoveGlobals(Widget w) +@@ -1276,5 +1294,5 @@ RemoveGlobals(Widget w) if (XDeleteContext(XtDisplay(w), XtWindow(w), manglobals_context) != XCSUCCESS) XtAppError(XtWidgetToApplicationContext(w), - "Xman: Could not remove global data?"); + gettext("Xman: Could not remove global data?")); } -diff -urp -x '*~' -x '*.orig' search.c search.c ---- search.c 2009-10-16 14:39:48.000000000 -0700 -+++ search.c 2011-01-28 20:32:24.196499890 -0800 +diff --git a/search.c b/search.c +index 48c4efe..21d413d 100644 +--- a/search.c ++++ b/search.c @@ -30,7 +30,8 @@ from the X Consortium. */ /* $XFree86: xc/programs/xman/search.c,v 1.5 2001/01/27 17:24:27 herrb Exp $ */ @@ -798,7 +840,7 @@ #include "globals.h" #include "vendor.h" -@@ -70,7 +71,7 @@ MakeSearchWidget(ManpageGlobals * man_gl +@@ -70,7 +71,7 @@ MakeSearchWidget(ManpageGlobals * man_globals, Widget parent) arglist, num_args); if ( (text = XtNameToWidget(dialog, "value")) == (Widget) NULL) @@ -807,7 +849,7 @@ else XtSetKeyboardFocus(dialog, text); -@@ -86,7 +87,7 @@ MakeSearchWidget(ManpageGlobals * man_gl +@@ -86,7 +87,7 @@ MakeSearchWidget(ManpageGlobals * man_globals, Widget parent) if ( ((command = XtNameToWidget(dialog, MANUALSEARCH)) == (Widget) NULL) || ((cancel = XtNameToWidget(dialog, CANCEL)) == (Widget) NULL) ) PopupWarning(NULL, @@ -825,7 +867,7 @@ return(NULL); } -@@ -165,16 +166,16 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -165,16 +166,16 @@ DoSearch(ManpageGlobals * man_globals, int type) /* If the string is empty or starts with a space then do not search */ if ( streq(search_string,"") ) { @@ -845,7 +887,7 @@ return(NULL); } -@@ -210,7 +211,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -210,7 +211,7 @@ DoSearch(ManpageGlobals * man_globals, int type) } snprintf(label, sizeof(label), @@ -854,7 +896,7 @@ #ifdef NO_MANPATH_SUPPORT /* not quite correct, but the best I can do. */ snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, search_string, mantmp); -@@ -219,7 +220,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -219,7 +220,7 @@ DoSearch(ManpageGlobals * man_globals, int type) #endif if(system(cmdbuf) != 0) { /* execute search. */ @@ -863,7 +905,7 @@ PopupWarning(man_globals, error_buf); } -@@ -228,7 +229,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -228,7 +229,7 @@ DoSearch(ManpageGlobals * man_globals, int type) #else if((file = fopen(mantmp,"r")) == NULL) #endif @@ -872,7 +914,7 @@ /* * Since we keep the FD open we can unlink the file safely, this -@@ -237,7 +238,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -237,7 +238,7 @@ DoSearch(ManpageGlobals * man_globals, int type) unlink(mantmp); @@ -881,7 +923,7 @@ /* * Check first LOOKLINES lines for "nothing appropriate". -@@ -276,7 +277,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -276,7 +277,7 @@ DoSearch(ManpageGlobals * man_globals, int type) else { /* MANUAL SEACH */ file = DoManualSearch(man_globals, search_string); if (file == NULL) { @@ -890,7 +932,7 @@ ChangeLabel(man_globals->label, string_buf); if (man_globals->label == NULL) PopupWarning(man_globals, string_buf); -@@ -290,7 +291,7 @@ DoSearch(ManpageGlobals * man_globals, i +@@ -290,7 +291,7 @@ DoSearch(ManpageGlobals * man_globals, int type) dialog = XtNameToWidget(man_globals->search_widget, DIALOG); if (dialog == NULL) @@ -908,9 +950,10 @@ head++; tail = rindex(head, '.'); -diff -urp -x '*~' -x '*.orig' vendor.c vendor.c ---- vendor.c 2009-10-16 14:39:48.000000000 -0700 -+++ vendor.c 2011-01-28 20:32:24.196781956 -0800 +diff --git a/vendor.c b/vendor.c +index 79cc8bb..b3772dd 100644 +--- a/vendor.c ++++ b/vendor.c @@ -34,6 +34,8 @@ from the X Consortium. #include "globals.h" @@ -1012,11 +1055,11 @@ @@ -188,10 +244,10 @@ char * path) for (i=0; i < numSections; i++) { - sprintf(file, "%s%s", SEARCHDIR, SectionNames[i].suffix); + snprintf(file, sizeof(file), "%s%s", SEARCHDIR, SectionNames[i].suffix); - AddNewSection(list, path, file, SectionNames[i].name, TRUE); + AddNewSection(list, path, file, gettext(SectionNames[i].name), TRUE); #ifdef SEARCHOTHER - sprintf(file, "%s%s", SEARCHOTHER, SectionNames[i].suffix); + snprintf(file, sizeof(file), "%s%s", SEARCHOTHER, SectionNames[i].suffix); - AddNewSection(list, path, file, SectionNames[i].name, TRUE); + AddNewSection(list, path, file, gettext(SectionNames[i].name), TRUE); #endif @@ -1025,7 +1068,7 @@ @@ -252,7 +308,7 @@ char *path) int flags = (int) *p++; while (*p != NULL) { - sprintf(file, "%s%s", SEARCHDIR, *p++); + snprintf(file, sizeof(file), "%s%s", SEARCHDIR, *p++); - AddNewSection(list, path, file, message, flags); + AddNewSection(list, path, file, gettext(message), flags); } diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xman/Makefile --- a/open-src/app/xman/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xman/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,17 +29,17 @@ MODULE_NAME=xman # Version number (used in path names) -MODULE_VERSION=1.1.1 +MODULE_VERSION=1.1.2 # Checksums for upstream tarball -TARBALL_MD5 = 56a00ccb38996c3518f14bb87c03a03e -TARBALL_SHA1 = c8e1170e837da4bc280ee907030b3f9245608ef2 +TARBALL_MD5 = 17d89b043083cba9e335379fc61981c0 +TARBALL_SHA1 = ba10cf0b2d0c2b40ded93e892c69e7bd4586ad1e # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = 6708109.patch +SOURCE_PATCHES = 6708109.patch,-p1 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xman.man MODULE_STABILITY=Committed MODULE_ADD_INSTALL_TARGETS = install_po diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xprop/Makefile --- a/open-src/app/xprop/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xprop/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,11 +29,11 @@ MODULE_NAME=xprop # Version number (used in path names) -MODULE_VERSION=1.2.0 +MODULE_VERSION=1.2.1 # Checksums for upstream tarball -TARBALL_MD5 = e6d0673a1e1e469f0a6220a6868fb94b -TARBALL_SHA1 = 278f83c5077eed1d96c180bdc0a6f22ba5279a66 +TARBALL_MD5 = d5529dc8d811efabd136ca2d8e857deb +TARBALL_SHA1 = d531be0f5f2b7758216ea4d7890f88c42c5fa3fd # Patches to apply to source after unpacking, in order SOURCE_PATCHES = @@ -49,7 +49,7 @@ MODULE_ARC_CASES += PSARC/2011/033 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xprop.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xrandr/Makefile --- a/open-src/app/xrandr/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xrandr/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,11 +29,11 @@ MODULE_NAME=xrandr # Version number (used in path names) -MODULE_VERSION=1.3.4 +MODULE_VERSION=1.3.5 # Checksums for upstream tarball -TARBALL_MD5 = d6d20038257eba5178b523e10239d51c -TARBALL_SHA1 = 637949501b8a45d32d9cab809e8822ee45b69414 +TARBALL_MD5 = 9735173a84dca9b05e06fd4686196b07 +TARBALL_SHA1 = ef45925d5b0e72c73d21798d65a41d476fdb0d3f # pkg(5) name we deliver the files in (override default) MODULE_PKGNAME=x11/x11-server-utilities @@ -48,7 +48,7 @@ MODULE_ARC_CASES += PSARC/2009/269 # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xrandr.man MODULE_STABILITY=Volatile # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xset/Makefile --- a/open-src/app/xset/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xset/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,14 +29,15 @@ MODULE_NAME=xset # Version number (used in path names) -MODULE_VERSION=1.2.1 +MODULE_VERSION=1.2.2 # Checksums for upstream tarball -TARBALL_MD5 = 4e0ce390394416c9e2c5cd4d7413ba87 -TARBALL_SHA1 = 9b1eb8835637dd70eea1a1365df5d909a306cc2c +TARBALL_MD5 = d44e0057d6722b25d5a314e82e0b7e7c +TARBALL_SHA1 = e48d628259dbe1ff413ec8408b4fee9561c8815c +TARBALL_SHA256 = 61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8 # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = xsetfbpm.patch +SOURCE_PATCHES = xsetfbpm.patch,-p1 # pkg(5) name we deliver the files in (override default) MODULE_PKGNAME=x11/x11-server-utilities @@ -50,7 +51,7 @@ # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xset.man MODULE_STABILITY=Uncommitted # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xset/xsetfbpm.patch --- a/open-src/app/xset/xsetfbpm.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xset/xsetfbpm.patch Tue Aug 02 13:30:29 2011 -0700 @@ -18,12 +18,79 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -Adds support for Sun's Frame Buffer Power Management (fbpm) extension + +Adds support for Solaris's Frame Buffer Power Management (fbpm) extension -diff -urp -x '*~' -x '*.orig' xset.c xset.c ---- xset.c 2010-11-09 18:15:26.000000000 -0800 -+++ xset.c 2011-01-28 20:59:48.793243393 -0800 -@@ -65,6 +65,10 @@ in this Software without prior written a +diff --git a/man/xset.man b/man/xset.man +index ff46e9f..624dee9 100644 +--- a/man/xset.man ++++ b/man/xset.man +@@ -1,4 +1,5 @@ + .\" Copyright 1988, 1998 The Open Group ++.\" Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved. + .\" + .\" Permission to use, copy, modify, distribute, and sell this software and its + .\" documentation for any purpose is hereby granted without fee, provided that +@@ -40,6 +41,10 @@ xset - user preference utility for X + [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] + [dpms force {standby|suspend|off|on}] + .br ++[+fbpm] [-fbpm] ++.br ++ [fbpm force {standby|suspend|off|on}] ++.br + [fp=\fIpathlist\fP] + [-fp=\fIpathlist\fP] + [+fp=\fIpathlist\fP] +@@ -121,7 +126,9 @@ the volume to the nearest value that the hardware can support. + The \fB\-dpms\fP option disables DPMS (Energy Star) features. + .TP 8 + .B +dpms +-The \fB+dpms\fP option enables DPMS (Energy Star) features. ++Enable Energy Star mode. Default times are standby = 1440, suspend = 1620, and ++off = 1800 seconds. ++.PP + .TP 8 + .B dpms \fIflags...\fP + The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be +@@ -136,6 +143,32 @@ The first value given is for the `standby' mode, the second is for the + `suspend' mode, and the third is for the `off' mode. Setting these + values implicitly enables the DPMS features. A value of zero disables + a particular mode. ++Note that standby is less than suspend is less than off, if this condition is not met, an error is produced. ++.PP ++.TP 8 ++.B +fbpm ++Enable frame buffer power management. NOTE: FBPM timing is linked to DPMS, See DPMS for default timeout values. ++.PP ++.TP 8 ++.B -fbpm ++Disable frame buffer power management. NOTE: Does not affect DPMS timeouts. ++.PP ++.TP 8 ++.B fbpm force standby ++Force to standby power level. ++.PP ++.TP 8 ++.B fbpm force suspend ++Force to suspend power level. ++.PP ++.TP 8 ++.B fbpm force off ++Force power to off. ++.PP ++.TP 8 ++.B fbpm force on ++Force power to on. ++.PP + .TP 8 + .B fp= \fIpath,...\fP + The \fBfp=\fP sets the font path to the entries given in the path argument. +diff --git a/xset.c b/xset.c +index 40fc7e1..f696941 100644 +--- a/xset.c ++++ b/xset.c +@@ -65,6 +65,10 @@ in this Software without prior written authorization from The Open Group. #endif #ifdef DPMSExtension # include @@ -34,7 +101,7 @@ # ifdef WIN32 # define BOOL wBOOL # ifdef Status -@@ -639,6 +643,62 @@ main(int argc, char *argv[]) +@@ -623,6 +627,62 @@ main(int argc, char *argv[]) } } #endif /* DPMSExtension */ @@ -97,7 +164,7 @@ else if (strcmp(arg, "s") == 0) { if (i >= argc) { set_saver(dpy, ALL, 0); /* Set everything to default */ -@@ -1522,6 +1582,46 @@ query(Display *dpy) +@@ -1506,6 +1566,46 @@ query(Display *dpy) } } #endif @@ -144,7 +211,7 @@ #ifdef FONTCACHE { int dummy; -@@ -1652,6 +1752,16 @@ usage(char *fmt, ...) +@@ -1636,6 +1736,16 @@ usage(char *fmt, ...) fprintf(stderr, "\t (also implicitly enables DPMS features) \n"); fprintf(stderr, "\t a timeout value of zero disables the mode \n"); #endif @@ -161,67 +228,3 @@ #ifdef FONTCACHE fprintf(stderr, " To control font cache:\n"); fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n"); -diff -urp -x '*~' -x '*.orig' xset.man xset.man ---- xset.man 2010-11-09 18:15:26.000000000 -0800 -+++ xset.man 2011-01-28 20:59:48.793541415 -0800 -@@ -1,4 +1,5 @@ - .\" Copyright 1988, 1998 The Open Group -+.\" Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved. - .\" - .\" Permission to use, copy, modify, distribute, and sell this software and its - .\" documentation for any purpose is hereby granted without fee, provided that -@@ -40,6 +41,10 @@ xset - user preference utility for X - [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] - [dpms force {standby|suspend|off|on}] - .br -+[+fbpm] [-fbpm] -+.br -+ [fbpm force {standby|suspend|off|on}] -+.br - [fp=\fIpathlist\fP] - [-fp=\fIpathlist\fP] - [+fp=\fIpathlist\fP] -@@ -121,7 +126,9 @@ the volume to the nearest value that the - The \fB\-dpms\fP option disables DPMS (Energy Star) features. - .TP 8 - .B +dpms --The \fB+dpms\fP option enables DPMS (Energy Star) features. -+Enable Energy Star mode. Default times are standby = 1440, suspend = 1620, and -+off = 1800 seconds. -+.PP - .TP 8 - .B dpms \fIflags...\fP - The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be -@@ -136,6 +143,32 @@ The first value given is for the `standb - `suspend' mode, and the third is for the `off' mode. Setting these - values implicitly enables the DPMS features. A value of zero disables - a particular mode. -+Note that standby is less than suspend is less than off, if this condition is not met, an error is produced. -+.PP -+.TP 8 -+.B +fbpm -+Enable frame buffer power management. NOTE: FBPM timing is linked to DPMS, See DPMS for default timeout values. -+.PP -+.TP 8 -+.B -fbpm -+Disable frame buffer power management. NOTE: Does not affect DPMS timeouts. -+.PP -+.TP 8 -+.B fbpm force standby -+Force to standby power level. -+.PP -+.TP 8 -+.B fbpm force suspend -+Force to suspend power level. -+.PP -+.TP 8 -+.B fbpm force off -+Force power to off. -+.PP -+.TP 8 -+.B fbpm force on -+Force power to on. -+.PP - .TP 8 - .B fp= \fIpath,...\fP - The \fBfp=\fP sets the font path to the entries given in the path argument. diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/app/xwininfo/Makefile --- a/open-src/app/xwininfo/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/app/xwininfo/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -1,8 +1,8 @@ ############################################################################### # -# xwininfo 1.x Makefile +# xwininfo Makefile # -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -33,17 +33,17 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.1.1 +MODULE_VERSION=1.1.2 # Checksums for upstream tarball -TARBALL_MD5 = 7a7f44b826d877ba39c19cf5913978d7 -TARBALL_SHA1 = 945e5d51632876e304e001003c8068f34ffe299e +TARBALL_MD5 = 9e8b58c8aa6172e87ab4f9cf3612fedd +TARBALL_SHA1 = c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3 # Patches to apply to source after unpacking, in order SOURCE_PATCHES = # Man pages to apply Sun footer to & attributes to list -SUNTOUCHED_MANPAGES=*.man +SUNTOUCHED_MANPAGES=man/xwininfo.man MODULE_STABILITY=Committed # Compatibility links from /usr/X11/bin to /usr/bin diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/common/Makefile.inc --- a/open-src/common/Makefile.inc Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/common/Makefile.inc Tue Aug 02 13:30:29 2011 -0700 @@ -276,6 +276,15 @@ "$${ACTUAL_SHA1} != ${TARBALL_SHA1}" ; \ exit 1; \ fi ; \ + if [[ -n "${TARBALL_SHA256}" ]] ; then \ + ACTUAL_SHA256="$$(digest -a sha256 ${SOURCE_TARBALL})" ; \ + if [[ "$${ACTUAL_SHA256}" != "${TARBALL_SHA256}" ]] ; then \ + print -u2 \ + "ERROR: SHA256 sum mismatch on ${SOURCE_TARBALL}\n" \ + "$${ACTUAL_SHA256} !=\n ${TARBALL_SHA256}" ; \ + exit 1; \ + fi ; \ + fi ; \ fi touch $(CHECKSUM_TARGET) diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/doc/xorg-sgml-doctools/Makefile --- a/open-src/doc/xorg-sgml-doctools/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/doc/xorg-sgml-doctools/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -31,11 +31,11 @@ MODULE_PKGTAIL_SET=yes # Version number (used in path names) -MODULE_VERSION=1.7 +MODULE_VERSION=1.8 # Checksums for upstream tarball -TARBALL_MD5 = 2588efb3f49f7fc6ecf41ce42e0b2e5e -TARBALL_SHA1 = 5301166d1e36df9cd796adf944d003f32b7b4945 +TARBALL_MD5 = c6ad2cca27c24115e3e74a34beb9f4d5 +TARBALL_SHA1 = 524c994832508d3097c1a42bd3623251c9f87d77 # Patches to apply to source after unpacking, in order SOURCE_PATCHES= diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/driver/xf86-input-synaptics/Makefile --- a/open-src/driver/xf86-input-synaptics/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/driver/xf86-input-synaptics/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,19 +29,18 @@ MODULE_NAME=xf86-input-synaptics # Version number (used in path names) -MODULE_VERSION=1.4.0 +MODULE_VERSION=1.4.1 # Checksums for upstream tarball -TARBALL_MD5 = cbe487f9d22237d1e39c7d0b5812ab7e -TARBALL_SHA1 = 96541b063482568e177f883a9fcfbe9a22c25569 +TARBALL_MD5 = 2dac10f93918ed5bf7d1039d56880cf4 +TARBALL_SHA1 = e41201476f4bc8658291808d2d6ef2e0535179ae # Man pages to apply Sun footer to & attributes to list SUNTOUCHED_MANPAGES=man/*.man MODULE_STABILITY=Volatile # Extra flags to pass to configure script -MODULE_CONFIG_OPTS= \ - --bindir=$(X11_SERVERLIBS_DIR) +MODULE_CONFIG_OPTS= --bindir=$(X11_SERVERLIBS_DIR) # Libraries/modules to link with MODULE_LD_OPTIONS= -lm diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/6789219.patch --- a/open-src/lib/libX11/6789219.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/6789219.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,7 +1,8 @@ -diff -urp -x '*~' -x '*.orig' modules/om/generic/omGeneric.c modules/om/generic/omGeneric.c ---- modules/om/generic/omGeneric.c 2008-10-07 10:18:17.000000000 -0700 -+++ modules/om/generic/omGeneric.c 2009-04-08 00:19:29.991807000 -0700 -@@ -841,7 +841,7 @@ parse_omit_name( +diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c +index 7f02c85..c5d9416 100644 +--- a/modules/om/generic/omGeneric.c ++++ b/modules/om/generic/omGeneric.c +@@ -832,7 +832,7 @@ parse_omit_name( return True; /* This may mot be needed anymore as XListFonts() takes care of this */ @@ -10,7 +11,7 @@ if ((last - buf) > (XLFD_MAX_LEN - 2)) return -1; *last = '*'; -@@ -852,7 +852,7 @@ parse_omit_name( +@@ -843,7 +843,7 @@ parse_omit_name( if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL) return True; } diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/7038737.patch --- a/open-src/lib/libX11/7038737.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -From 393921cf2188b2b0713cc157effaf17d0abab783 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Thu, 21 Apr 2011 16:21:04 -0700 -Subject: [PATCH:libX11] Delete special case code to append "/sparcv9" to i18n module path - -Was triggered by defined(__sparcv9) so only built on Solaris SPARC 64-bit. -Inconsistent with all other platforms, and a bit overcomplicated. - -Should anyone need to continue using that path, simply build with -a #define POSTLOCALELIBDIR "sparcv9" to get the same result. - -Fixes Solaris bug 7038737: - sparcv9 Xlib looking in wrong path for i18n loadable modules - -Signed-off-by: Alan Coopersmith -Reviewed-by: Daniel Stone ---- - src/xlibi18n/XlcDL.c | 40 ---------------------------------------- - 1 files changed, 0 insertions(+), 40 deletions(-) - -diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c -index bf06490..75e193c 100644 ---- a/src/xlibi18n/XlcDL.c -+++ b/src/xlibi18n/XlcDL.c -@@ -86,16 +86,6 @@ Sun Microsystems, Inc. or its licensors is granted. - #include "XlcPublic.h" - #include "XlcPubI.h" - --#if defined(_LP64) && defined(__sparcv9) --# define _MACH64_NAME "sparcv9" --#else --# undef _MACH64_NAME --#endif /* defined(_LP64) && defined(__sparcv9) */ -- --#ifdef _MACH64_NAME --# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) --#endif -- - #define XI18N_DLREL 2 - - #define iscomment(ch) ((ch) == '\0' || (ch) == '#') -@@ -269,35 +259,6 @@ __lc_path(const char *dl_name, const char *lc_dir) - if (strstr (dl_name, "../")) - return NULL; - --#if defined (_LP64) && defined (_MACH64_NAME) -- len = (lc_dir ? strlen(lc_dir) : 0 ) + -- (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10; -- path = Xmalloc(len + 1); -- -- if (strchr(dl_name, '/') != NULL) { -- char *tmp = strdup(dl_name); -- char *dl_dir, *dl_file; -- char *slash_p; -- slash_p = strchr(tmp, '/'); -- *slash_p = '\0'; -- dl_dir = tmp; -- dl_file = ++slash_p; -- -- slash_p = strrchr(lc_dir, '/'); -- *slash_p = '\0'; -- strcpy(path, lc_dir); strcat(path, "/"); -- strcat(path, dl_dir); strcat(path, "/"); -- strcat(path, _MACH64_NAME); strcat(path, "/"); -- strcat(path, dl_file); strcat(path, ".so.2"); -- -- *slash_p = '/'; -- Xfree(tmp); -- } else { -- strcpy(path, lc_dir); strcat(path, "/"); -- strcat(path, _MACH64_NAME); strcat(path, "/"); -- strcat(path, dl_name); strcat(path, ".so.2"); -- } --#else - len = (lc_dir ? strlen(lc_dir) : 0 ) + - (dl_name ? strlen(dl_name) : 0) + 10; - #if defined POSTLOCALELIBDIR -@@ -322,7 +283,6 @@ __lc_path(const char *dl_name, const char *lc_dir) - #endif - strcat(path, dl_name); strcat(path, ".so.2"); - } --#endif - return path; - } - --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/Makefile --- a/open-src/lib/libX11/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -27,33 +27,31 @@ MODULE_NAME=libX11 # Version number (used in path names) -MODULE_VERSION = 1.4.3 +MODULE_VERSION = 1.4.4 # Checksums for upstream tarball -TARBALL_MD5 = 85e942627aaa020813e0eb8433353563 -TARBALL_SHA1 = 174270a0e51614b5077026fc6c20701d4e09aef8 +TARBALL_MD5 = ed7c382cbf8c13425b6a66bcac0ca5d9 +TARBALL_SHA1 = 2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90 +TARBALL_SHA256 = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d # Patches to apply to source after unpacking, in order SOURCE_PATCHES = \ - xml-install.patch,-p1 \ - xml-install-paths.patch,-p1 \ - 7038737.patch,-p1 \ 1234757.patch \ 4010755.patch \ 4614834.patch \ 5039226.patch \ - solaris-abi.patch \ + solaris-abi.patch,-p1 \ solaris-kbd.patch \ SolarisIA.patch \ 6714036.patch \ - 6789219.patch \ + 6789219.patch,-p1 \ im-suneu-greek.patch \ im-ximcp.patch \ lc-jisx0212.patch \ lc-jisx0208.patch \ - lc-ksc5601.1992-3.patch \ - lc-gb18030.patch \ - om-generic.patch \ + lc-ksc5601.1992-3.patch,-p1 \ + lc-gb18030.patch,-p1 \ + om-generic.patch,-p1 \ compose.dir.patch \ compose-iso8859-1.patch \ compose-iso8859-2.patch \ @@ -75,7 +73,7 @@ compose-zh_TW.UTF-8.patch \ locale.aliases.patch \ locale.dir.patch \ - locale.paths.patch \ + locale.paths.patch,-p1 \ locale-C.patch \ locale-iso8859-1.patch \ locale-iso8859-6.patch \ diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/lc-gb18030.patch --- a/open-src/lib/libX11/lc-gb18030.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/lc-gb18030.patch Tue Aug 02 13:30:29 2011 -0700 @@ -21,10 +21,11 @@ # DEALINGS IN THE SOFTWARE. # -diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac ---- configure.ac 2011-04-06 13:52:26.413533808 -0700 -+++ configure.ac 2011-04-06 13:52:27.461991654 -0700 -@@ -450,6 +450,7 @@ AC_CONFIG_FILES([Makefile +diff --git a/configure.ac b/configure.ac +index 64c9f60..c2f2376 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -442,6 +442,7 @@ AC_CONFIG_FILES([Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile @@ -32,15 +33,17 @@ modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile -diff -Nurp -x '*~' -x '*.orig' modules/lc/Makefile.am modules/lc/Makefile.am ---- modules/lc/Makefile.am 2010-09-03 22:52:38.000000000 -0700 -+++ modules/lc/Makefile.am 2011-04-06 13:52:27.462144697 -0700 +diff --git a/modules/lc/Makefile.am b/modules/lc/Makefile.am +index 3cad2d6..2ba5e1a 100644 +--- a/modules/lc/Makefile.am ++++ b/modules/lc/Makefile.am @@ -1 +1 @@ -SUBDIRS=Utf8 def gen xlocale +SUBDIRS=Utf8 def gen xlocale gb18030 -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/Makefile.am src/xlibi18n/Makefile.am ---- src/xlibi18n/Makefile.am 2011-01-29 10:09:13.000000000 -0800 -+++ src/xlibi18n/Makefile.am 2011-04-06 13:52:27.462304357 -0700 +diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am +index 853953a..94c17e1 100644 +--- a/src/xlibi18n/Makefile.am ++++ b/src/xlibi18n/Makefile.am @@ -36,6 +36,7 @@ LC_LIBS = \ ${top_builddir}/modules/lc/def/libxlcDef.la \ ${top_builddir}/modules/lc/gen/libxlibi18n.la \ @@ -49,9 +52,10 @@ ${top_builddir}/modules/lc/xlocale/libxlocale.la OM_LIBS = \ -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/Xlcint.h src/xlibi18n/Xlcint.h ---- src/xlibi18n/Xlcint.h 2010-09-03 22:52:39.000000000 -0700 -+++ src/xlibi18n/Xlcint.h 2011-04-06 13:52:27.462605995 -0700 +diff --git a/src/xlibi18n/Xlcint.h b/src/xlibi18n/Xlcint.h +index 95d1f5d..7ce4d7e 100644 +--- a/src/xlibi18n/Xlcint.h ++++ b/src/xlibi18n/Xlcint.h @@ -932,6 +932,12 @@ extern XLCd _XlcUtf8Loader( const char* name ); @@ -65,10 +69,11 @@ /* The old EUC locale loader. */ extern XLCd _XlcEucLoader( const char* name -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcCT.c src/xlibi18n/lcCT.c ---- src/xlibi18n/lcCT.c 2011-04-06 13:52:26.445490222 -0700 -+++ src/xlibi18n/lcCT.c 2011-04-06 13:52:27.462981375 -0700 -@@ -126,6 +126,8 @@ static const CTDataRec default_ct_data[] +diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c +index ac07cb1..045c45d 100644 +--- a/src/xlibi18n/lcCT.c ++++ b/src/xlibi18n/lcCT.c +@@ -126,6 +126,8 @@ static const CTDataRec default_ct_data[] = { "BIG5-0:GLGR", "\033%/2"}, { "BIG5HKSCS-0:GLGR", "\033%/2"}, { "GBK-0:GLGR", "\033%/2"}, @@ -77,10 +82,11 @@ /* used by Emacs, but not backed by ISO-IR */ { "BIG5-E0:GL", "\033$(0" }, { "BIG5-E0:GR", "\033$)0" }, -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcInit.c src/xlibi18n/lcInit.c ---- src/xlibi18n/lcInit.c 2011-01-29 10:09:13.000000000 -0800 -+++ src/xlibi18n/lcInit.c 2011-04-06 13:52:27.463186940 -0700 -@@ -106,6 +106,7 @@ Sun Microsystems, Inc. or its licensors +diff --git a/src/xlibi18n/lcInit.c b/src/xlibi18n/lcInit.c +index 5aaf183..da7a8c2 100644 +--- a/src/xlibi18n/lcInit.c ++++ b/src/xlibi18n/lcInit.c +@@ -106,6 +106,7 @@ Sun Microsystems, Inc. or its licensors is granted. #define USE_GENERIC_LOADER #define USE_DEFAULT_LOADER #define USE_UTF8_LOADER @@ -110,9 +116,10 @@ #ifdef USE_DYNAMIC_LOADER _XlcRemoveLoader(_XlcDynamicLoader); #endif -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcUTF8.c src/xlibi18n/lcUTF8.c ---- src/xlibi18n/lcUTF8.c 2011-04-06 13:52:26.446628892 -0700 -+++ src/xlibi18n/lcUTF8.c 2011-04-06 13:52:27.463715259 -0700 +diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c +index 59dfe1a..32241ce 100644 +--- a/src/xlibi18n/lcUTF8.c ++++ b/src/xlibi18n/lcUTF8.c @@ -213,6 +213,7 @@ typedef struct { #include "lcUniConv/big5_emacs.h" #include "lcUniConv/big5hkscs.h" @@ -140,9 +147,10 @@ /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning (for lookup speed), once at the end (as a fallback). */ -diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcUniConv/gbk.h src/xlibi18n/lcUniConv/gbk.h ---- src/xlibi18n/lcUniConv/gbk.h 2010-09-03 22:52:39.000000000 -0700 -+++ src/xlibi18n/lcUniConv/gbk.h 2011-04-06 13:52:27.466387657 -0700 +diff --git a/src/xlibi18n/lcUniConv/gbk.h b/src/xlibi18n/lcUniConv/gbk.h +index 09c2e63..63aee26 100644 +--- a/src/xlibi18n/lcUniConv/gbk.h ++++ b/src/xlibi18n/lcUniConv/gbk.h @@ -1,9 +1,41 @@ +/* + * Copyright The Open Group @@ -186,7 +194,7 @@ /* 0x81 */ 0x4e02, 0x4e04, 0x4e05, 0x4e06, 0x4e0f, 0x4e12, 0x4e17, 0x4e1f, 0x4e20, 0x4e21, 0x4e23, 0x4e26, 0x4e29, 0x4e2e, 0x4e2f, 0x4e31, -@@ -850,7 +882,7 @@ static const unsigned short gbk_2uni_pag +@@ -850,7 +882,7 @@ static const unsigned short gbk_2uni_page81[23766] = { 0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, 0x2487, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, @@ -195,7 +203,7 @@ 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0xfffd, 0xfffd, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216a, 0x216b, 0xfffd, 0xfffd, -@@ -995,7 +1027,7 @@ static const unsigned short gbk_2uni_pag +@@ -995,7 +1027,7 @@ static const unsigned short gbk_2uni_page81[23766] = { 0x0101, 0x00e1, 0x01ce, 0x00e0, 0x0113, 0x00e9, 0x011b, 0x00e8, 0x012b, 0x00ed, 0x01d0, 0x00ec, 0x014d, 0x00f3, 0x01d2, 0x00f2, 0x016b, 0x00fa, 0x01d4, 0x00f9, 0x01d6, 0x01d8, 0x01da, 0x01dc, @@ -204,7 +212,7 @@ 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3105, 0x3106, 0x3107, 0x3108, 0x3109, 0x310a, 0x310b, 0x310c, 0x310d, 0x310e, 0x310f, 0x3110, 0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, 0x3118, -@@ -1014,8 +1046,8 @@ static const unsigned short gbk_2uni_pag +@@ -1014,8 +1046,8 @@ static const unsigned short gbk_2uni_page81[23766] = { 0xfe51, 0xfe52, 0xfe54, 0xfe55, 0xfe56, 0xfe57, 0xfe59, 0xfe5a, 0xfe5b, 0xfe5c, 0xfe5d, 0xfe5e, 0xfe5f, 0xfe60, 0xfe61, 0xfe62, 0xfe63, 0xfe64, 0xfe65, 0xfe66, 0xfe68, 0xfe69, 0xfe6a, 0xfe6b, @@ -215,7 +223,7 @@ 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x2500, 0x2501, 0x2502, 0x2503, 0x2504, 0x2505, 0x2506, 0x2507, 0x2508, 0x2509, 0x250a, 0x250b, 0x250c, -@@ -3132,6 +3164,16 @@ static const unsigned short gbk_2uni_pag +@@ -3132,6 +3164,16 @@ static const unsigned short gbk_2uni_page81[23766] = { /* 0xfe */ 0xfa0c, 0xfa0d, 0xfa0e, 0xfa0f, 0xfa11, 0xfa13, 0xfa14, 0xfa18, 0xfa1f, 0xfa20, 0xfa21, 0xfa23, 0xfa24, 0xfa27, 0xfa28, 0xfa29, @@ -232,7 +240,7 @@ }; static int -@@ -3145,7 +3187,7 @@ gbk_mbtowc (conv_t conv, ucs4_t *pwc, co +@@ -3145,7 +3187,7 @@ gbk_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) unsigned int i = 190 * (c1 - 0x81) + (c2 - (c2 >= 0x80 ? 0x41 : 0x40)); unsigned short wc = 0xfffd; { @@ -241,7 +249,7 @@ wc = gbk_2uni_page81[i]; } if (wc != 0xfffd) { -@@ -3335,6 +3377,28 @@ static const unsigned short gbk_page26[7 +@@ -3335,6 +3377,28 @@ static const unsigned short gbk_page26[72] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ 0xa1e2, 0x0000, 0xa1e1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ }; @@ -270,7 +278,7 @@ static const unsigned short gbk_page30[304] = { 0xa1a1, 0xa1a2, 0xa1a3, 0xa1a8, 0x0000, 0xa1a9, 0xa965, 0xa996, /*0x00-0x07*/ 0xa1b4, 0xa1b5, 0xa1b6, 0xa1b7, 0xa1b8, 0xa1b9, 0xa1ba, 0xa1bb, /*0x08-0x0f*/ -@@ -3343,7 +3407,7 @@ static const unsigned short gbk_page30[3 +@@ -3343,7 +3407,7 @@ static const unsigned short gbk_page30[304] = { 0x0000, 0xa940, 0xa941, 0xa942, 0xa943, 0xa944, 0xa945, 0xa946, /*0x20-0x27*/ 0xa947, 0xa948, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ @@ -279,7 +287,7 @@ 0x0000, 0xa4a1, 0xa4a2, 0xa4a3, 0xa4a4, 0xa4a5, 0xa4a6, 0xa4a7, /*0x40-0x47*/ 0xa4a8, 0xa4a9, 0xa4aa, 0xa4ab, 0xa4ac, 0xa4ad, 0xa4ae, 0xa4af, /*0x48-0x4f*/ 0xa4b0, 0xa4b1, 0xa4b2, 0xa4b3, 0xa4b4, 0xa4b5, 0xa4b6, 0xa4b7, /*0x50-0x57*/ -@@ -6135,6 +6199,93 @@ static const unsigned short gbk_pageffb[ +@@ -6135,6 +6199,93 @@ static const unsigned short gbk_pageffb[8] = { 0xa1e9, 0xa1ea, 0xa956, 0xa3fe, 0xa957, 0xa3a4, 0x0000, 0x0000, /*0xe0-0xe7*/ }; @@ -373,7 +381,7 @@ static int gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { -@@ -6144,6 +6295,8 @@ gbk_wctomb (conv_t conv, unsigned char * +@@ -6144,6 +6295,8 @@ gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) c = gbk_page00[wc-0x00a0]; else if (wc >= 0x01c8 && wc < 0x01e0) c = gbk_page01[wc-0x01c8]; @@ -382,7 +390,7 @@ else if (wc >= 0x0250 && wc < 0x0268) c = gbk_page02a[wc-0x0250]; else if (wc >= 0x02c0 && wc < 0x02e0) -@@ -6154,6 +6307,8 @@ gbk_wctomb (conv_t conv, unsigned char * +@@ -6154,6 +6307,8 @@ gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) c = gbk_page04[wc-0x0400]; else if (wc >= 0x2010 && wc < 0x2040) c = gbk_page20[wc-0x2010]; @@ -391,7 +399,7 @@ else if (wc >= 0x2100 && wc < 0x21a0) c = gbk_page21[wc-0x2100]; else if (wc >= 0x2208 && wc < 0x22c0) -@@ -6166,6 +6321,10 @@ gbk_wctomb (conv_t conv, unsigned char * +@@ -6166,6 +6321,10 @@ gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) c = gbk_page25[wc-0x2500]; else if (wc >= 0x2600 && wc < 0x2648) c = gbk_page26[wc-0x2600]; @@ -402,7 +410,7 @@ else if (wc >= 0x3000 && wc < 0x3130) c = gbk_page30[wc-0x3000]; else if (wc >= 0x3220 && wc < 0x3238) -@@ -6174,6 +6333,8 @@ gbk_wctomb (conv_t conv, unsigned char * +@@ -6174,6 +6333,8 @@ gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) c = 0xa949; else if (wc >= 0x3388 && wc < 0x33d8) c = gbk_page33[wc-0x3388]; diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/lc-ksc5601.1992-3.patch --- a/open-src/lib/libX11/lc-ksc5601.1992-3.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/lc-ksc5601.1992-3.patch Tue Aug 02 13:30:29 2011 -0700 @@ -21,9 +21,10 @@ # DEALINGS IN THE SOFTWARE. # -diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcCT.c src/xlibi18n/lcCT.c ---- src/xlibi18n/lcCT.c 2010-09-03 22:52:39.000000000 -0700 -+++ src/xlibi18n/lcCT.c 2010-11-21 18:48:03.683823575 -0800 +diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c +index 2fbe8aa..ac07cb1 100644 +--- a/src/xlibi18n/lcCT.c ++++ b/src/xlibi18n/lcCT.c @@ -51,7 +51,7 @@ * Static representation of a character set that can be used in Compound Text. */ @@ -33,7 +34,7 @@ const char ct_sequence[5]; /* Compound Text encoding, ESC sequence */ } CTDataRec, *CTData; -@@ -95,6 +95,7 @@ static const CTDataRec default_ct_data[] +@@ -95,6 +95,7 @@ static const CTDataRec default_ct_data[] = { "JISX0212.1990-0:GR", /* JIS_X0212-1990 159 */ "\033$)D" }, { "KSC5601.1987-0:GL", /* KS_C_5601-1987 149 */ "\033$(C" }, { "KSC5601.1987-0:GR", /* KS_C_5601-1987 149 */ "\033$)C" }, @@ -41,10 +42,11 @@ { "CNS11643.1986-1:GL", /* CNS 11643-1992 pl.1 171 */ "\033$(G" }, { "CNS11643.1986-1:GR", /* CNS 11643-1992 pl.1 171 */ "\033$)G" }, { "CNS11643.1986-2:GL", /* CNS 11643-1992 pl.2 172 */ "\033$(H" }, -diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcGeneric.c src/xlibi18n/lcGeneric.c ---- src/xlibi18n/lcGeneric.c 2010-09-03 22:52:39.000000000 -0700 -+++ src/xlibi18n/lcGeneric.c 2010-11-21 18:48:03.684217722 -0800 -@@ -756,6 +756,8 @@ load_generic( +diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c +index 619cb47..3f6ebe7 100644 +--- a/src/xlibi18n/lcGeneric.c ++++ b/src/xlibi18n/lcGeneric.c +@@ -745,6 +745,8 @@ load_generic( /* 3.4.1 side */ if (!_XlcNCompareISOLatin1(value[0], "none", 4)) { codeset->side = XlcNONE; @@ -53,9 +55,10 @@ } else if (!_XlcNCompareISOLatin1(value[0], "GL", 2)) { codeset->side = XlcGL; } else { -diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcUTF8.c src/xlibi18n/lcUTF8.c ---- src/xlibi18n/lcUTF8.c 2010-09-03 22:52:39.000000000 -0700 -+++ src/xlibi18n/lcUTF8.c 2010-11-21 18:48:03.684843035 -0800 +diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c +index 3e934b7..59dfe1a 100644 +--- a/src/xlibi18n/lcUTF8.c ++++ b/src/xlibi18n/lcUTF8.c @@ -208,6 +208,7 @@ typedef struct { #include "lcUniConv/jisx0208.h" #include "lcUniConv/jisx0212.h" diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/locale.paths.patch --- a/open-src/lib/libX11/locale.paths.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/locale.paths.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,9 +1,10 @@ Allow passing multi-directory paths to configure search for locale files -diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac ---- configure.ac 2011-04-06 13:52:52.161843884 -0700 -+++ configure.ac 2011-04-06 13:52:53.339680452 -0700 -@@ -422,11 +422,16 @@ AC_ARG_WITH(locale-lib-dir, AS_HELP_STRI +diff --git a/configure.ac b/configure.ac +index c2f2376..9d85355 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -414,11 +414,16 @@ AC_ARG_WITH(locale-lib-dir, AS_HELP_STRING([--with-locale-lib-dir=DIR], [Directory where locale libraries files are installed (default: $libdir/X11/locale)]), [ X11_LOCALELIBDIR="$withval" ], [ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ]) diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/om-generic.patch --- a/open-src/lib/libX11/om-generic.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/om-generic.patch Tue Aug 02 13:30:29 2011 -0700 @@ -21,9 +21,10 @@ # DEALINGS IN THE SOFTWARE. # -diff -urp -x '*~' -x '*.orig' modules/om/generic/omGeneric.c modules/om/generic/omGeneric.c ---- modules/om/generic/omGeneric.c 2010-11-21 18:48:04.435666511 -0800 -+++ modules/om/generic/omGeneric.c 2010-11-21 18:48:05.261723978 -0800 +diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c +index c5d9416..d286165 100644 +--- a/modules/om/generic/omGeneric.c ++++ b/modules/om/generic/omGeneric.c @@ -175,6 +175,11 @@ init_fontset( if((font_set->substitute = init_fontdata(data->substitute, data->substitute_num)) == NULL) @@ -143,7 +144,7 @@ continue; font_set->id = count; -@@ -1177,7 +1202,7 @@ parse_fontname( +@@ -1163,7 +1188,7 @@ parse_fontname( * a "missing_charset" will be reported to the client * for this CharSet. */ @@ -152,7 +153,7 @@ font_data_return.side = XlcUnknown; ret = parse_fontdata(oc, font_set, font_set->font_data, -@@ -1275,7 +1300,7 @@ set_missing_list( +@@ -1258,7 +1283,7 @@ set_missing_list( count = length = 0; for ( ; font_set_num-- > 0; font_set++) { @@ -161,7 +162,7 @@ continue; } -@@ -1322,7 +1347,7 @@ set_missing_list( +@@ -1305,7 +1330,7 @@ set_missing_list( font_set_num = gen->font_set_num; for ( ; font_set_num-- > 0; font_set++) { @@ -170,7 +171,7 @@ continue; } -@@ -2110,6 +2135,20 @@ init_om( +@@ -2089,6 +2114,20 @@ init_om( } read_vw(lcd,data,num); length += strlen(data->font_data->name) + 1; @@ -191,9 +192,10 @@ } /* required charset list */ -diff -urp -x '*~' -x '*.orig' modules/om/generic/omXChar.c modules/om/generic/omXChar.c ---- modules/om/generic/omXChar.c 2010-09-03 22:52:38.000000000 -0700 -+++ modules/om/generic/omXChar.c 2010-11-21 18:48:05.262027476 -0800 +diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c +index ff517d5..0120c5b 100644 +--- a/modules/om/generic/omXChar.c ++++ b/modules/om/generic/omXChar.c @@ -326,6 +326,12 @@ load_font( XOC oc, FontSet font_set) @@ -220,9 +222,10 @@ length = *to_left - cs_left; -diff -urp -x '*~' -x '*.orig' src/XomGeneric.h src/XomGeneric.h ---- src/XomGeneric.h 2010-09-03 22:52:39.000000000 -0700 -+++ src/XomGeneric.h 2010-11-21 18:48:05.262416597 -0800 +diff --git a/src/XomGeneric.h b/src/XomGeneric.h +index d6f182d..d8eaf89 100644 +--- a/src/XomGeneric.h ++++ b/src/XomGeneric.h @@ -81,6 +81,9 @@ typedef struct _OMDataRec { XlcCharSet *charset_list; int font_data_count; diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/solaris-abi.patch --- a/open-src/lib/libX11/solaris-abi.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libX11/solaris-abi.patch Tue Aug 02 13:30:29 2011 -0700 @@ -20,10 +20,11 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. # -diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac ---- configure.ac 2011-04-05 13:28:42.000000000 -0700 -+++ configure.ac 2011-04-06 13:52:15.327642630 -0700 -@@ -204,7 +204,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; the +diff --git a/configure.ac b/configure.ac +index 6a4878e..64c9f60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -196,7 +196,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; then fi AC_DEFINE(USE_DYNAMIC_LC,1, [Split some i18n functions into loadable modules]) @@ -32,9 +33,10 @@ fi AC_MSG_RESULT($XLIB_LOADABLE_I18N) -diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am ---- src/Makefile.am 2011-02-17 20:54:46.000000000 -0800 -+++ src/Makefile.am 2011-04-06 13:52:15.327994531 -0700 +diff --git a/src/Makefile.am b/src/Makefile.am +index 71e02e7..a825bb9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -368,9 +368,14 @@ if XKB USE_XKB_LIBS = $(XKB_LIBS) endif diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/xml-install-paths.patch --- a/open-src/lib/libX11/xml-install-paths.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -From 78a05d38e4736d75a175a1b99270940f83a24b56 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Fri, 8 Apr 2011 21:36:11 -0700 -Subject: [PATCH:libX11] Make doc install directories match pre-docbook.am paths - -Signed-off-by: Alan Coopersmith ---- - specs/i18n/framework/Makefile.am | 2 +- - specs/i18n/localedb/Makefile.am | 2 +- - specs/i18n/trans/Makefile.am | 2 +- - specs/libX11/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am -index 350b7df..af7ae1d 100644 ---- a/specs/i18n/framework/Makefile.am -+++ b/specs/i18n/framework/Makefile.am -@@ -8,7 +8,7 @@ docbook = framework.xml - chapters = framework.svg - - # The location where the DocBook/XML files and their generated formats are installed --shelfdir = $(docdir)/framework -+shelfdir = $(docdir)/i18n/framework - - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am -diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am -index 0c52a13..68a917c 100644 ---- a/specs/i18n/localedb/Makefile.am -+++ b/specs/i18n/localedb/Makefile.am -@@ -5,7 +5,7 @@ if ENABLE_SPECS - docbook = localedb.xml - - # The location where the DocBook/XML files and their generated formats are installed --shelfdir = $(docdir)/localedb -+shelfdir = $(docdir)/i18n/localedb - - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am -diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am -index 6e4baf1..40a135a 100644 ---- a/specs/i18n/trans/Makefile.am -+++ b/specs/i18n/trans/Makefile.am -@@ -5,7 +5,7 @@ if ENABLE_SPECS - docbook = trans.xml - - # The location where the DocBook/XML files and their generated formats are installed --shelfdir = $(docdir)/trans -+shelfdir = $(docdir)/i18n/trans - - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am -diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am -index c4de67e..b87e568 100644 ---- a/specs/libX11/Makefile.am -+++ b/specs/libX11/Makefile.am -@@ -30,7 +30,7 @@ chapters = \ - glossary.xml - - # The location where the DocBook/XML files and their generated formats are installed --shelfdir = $(docdir) -+shelfdir = $(docdir)/libX11 - - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libX11/xml-install.patch --- a/open-src/lib/libX11/xml-install.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ -From b95c288c7d897ed3ed9268572b7c097ed2652907 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Fri, 8 Apr 2011 13:24:28 -0700 -Subject: [PATCH:libX11] Install xml versions of specs even if HAVE_XMLTO is false - -Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour -from before docbook.am changes (commit e8c76407d2f6e3) - -Signed-off-by: Alan Coopersmith ---- - docbook.am | 2 ++ - specs/XIM/Makefile.am | 2 -- - specs/XKB/Makefile.am | 2 -- - specs/i18n/framework/Makefile.am | 2 -- - specs/i18n/localedb/Makefile.am | 2 -- - specs/i18n/trans/Makefile.am | 2 -- - specs/libX11/Makefile.am | 2 -- - 7 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/docbook.am b/docbook.am -index 3cf21e8..6937083 100644 ---- a/docbook.am -+++ b/docbook.am -@@ -20,6 +20,7 @@ shelf_DATA = - # DocBook/XML file with chapters, appendix and images it includes - dist_shelf_DATA = $(docbook) $(chapters) - -+if HAVE_XMLTO - # - # Generate DocBook/XML output formats with or without stylesheets - # -@@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ - - endif HAVE_XSLTPROC - endif HAVE_STYLESHEETS -+endif HAVE_XMLTO - - CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) -diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am -index a1fa72d..68b0b3f 100644 ---- a/specs/XIM/Makefile.am -+++ b/specs/XIM/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = xim.xml -@@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS -diff --git a/specs/XKB/Makefile.am b/specs/XKB/Makefile.am -index 3939db6..90771cc 100644 ---- a/specs/XKB/Makefile.am -+++ b/specs/XKB/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = xkblib.xml -@@ -59,5 +58,4 @@ shelfdir = $(docdir)/XKB - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS -diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am -index 6e8b010..350b7df 100644 ---- a/specs/i18n/framework/Makefile.am -+++ b/specs/i18n/framework/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = framework.xml -@@ -14,5 +13,4 @@ shelfdir = $(docdir)/framework - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS -diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am -index 8db6a7b..0c52a13 100644 ---- a/specs/i18n/localedb/Makefile.am -+++ b/specs/i18n/localedb/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = localedb.xml -@@ -11,5 +10,4 @@ shelfdir = $(docdir)/localedb - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS -diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am -index cdec750..6e4baf1 100644 ---- a/specs/i18n/trans/Makefile.am -+++ b/specs/i18n/trans/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = trans.xml -@@ -11,5 +10,4 @@ shelfdir = $(docdir)/trans - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS -diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am -index 0e59ad8..c4de67e 100644 ---- a/specs/libX11/Makefile.am -+++ b/specs/libX11/Makefile.am -@@ -1,6 +1,5 @@ - - if ENABLE_SPECS --if HAVE_XMLTO - - # Main DocBook/XML files (DOCTYPE book) - docbook = libX11.xml -@@ -36,5 +35,4 @@ shelfdir = $(docdir) - # Generate DocBook/XML output formats with or without stylesheets - include $(top_srcdir)/docbook.am - --endif HAVE_XMLTO - endif ENABLE_SPECS --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libXcursor/Makefile --- a/open-src/lib/libXcursor/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libXcursor/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,11 +29,11 @@ MODULE_NAME=libXcursor # Version number (used in path names) -MODULE_VERSION=1.1.11 +MODULE_VERSION=1.1.12 # Checksums for upstream tarball -TARBALL_MD5 = 866ed46f7e0d85b8c0003cebbb78a4af -TARBALL_SHA1 = 35491bd17cbcdda712e1a064c67ccbc523e2702c +TARBALL_MD5 = a93b5a6f5b05976d2c0d3f8a07f6ac6a +TARBALL_SHA1 = f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c # Patches to apply to source after unpacking, in order SOURCE_PATCHES = diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libXi/Makefile --- a/open-src/lib/libXi/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libXi/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,15 +29,17 @@ MODULE_NAME=libXi # Version number (used in path names) -MODULE_VERSION=1.4.1 +MODULE_VERSION=1.4.3 # Checksums for upstream tarball -TARBALL_MD5 = e4b6fb1b08a92075469174f0cccde168 -TARBALL_SHA1 = 15c9d369cc76c73b5e3833ba3b39355e6cc06636 +TARBALL_MD5 = 792e8a7ddc7175911d69f823d38eaff6 +TARBALL_SHA1 = c66cfdee74e8d169a7992b5f257395e653ca761b # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = \ - solaris-abi.patch +SOURCE_PATCHES = solaris-abi.patch,-p1 man-fixme.patch,-p1 + +# Need to regen Makefile.in after man-fixme.patch changes Makefile.am +AUTORECONF=yes # Library name (used for specfiles/mapfiles) LIBNAME=Xi diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libXi/man-fixme.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/open-src/lib/libXi/man-fixme.patch Tue Aug 02 13:30:29 2011 -0700 @@ -0,0 +1,28 @@ +From 2c97ff2264fbced5f6506c288fc5f83c04c48aa1 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Mon, 1 Aug 2011 16:10:03 -0700 +Subject: [PATCH:libXi] Fix the FIXME output in man page .TH macros generated by asciidoc + +Signed-off-by: Alan Coopersmith +--- + man/Makefile.am | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 2181ea9..d4c37b3 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -155,6 +155,10 @@ XIFreeDeviceInfo.man: XIQueryDevice.man + # Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion + MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' + ++# asciidoc is generating [FIXME...] values in the .TH line we should fix. ++MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' ++MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' ++ + SUFFIXES = .man .$(LIB_MAN_SUFFIX) + .man.$(LIB_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +-- +1.7.3.2 + diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libXi/solaris-abi.patch --- a/open-src/lib/libXi/solaris-abi.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libXi/solaris-abi.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,6 +1,7 @@ -diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am ---- src/Makefile.am 2010-10-25 16:55:23.000000000 -0700 -+++ src/Makefile.am 2011-02-11 16:44:24.132405127 -0800 +diff --git a/src/Makefile.am b/src/Makefile.am +index c036ae7..91e8029 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -72,7 +72,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ $(CWARNFLAGS) @@ -10,10 +11,11 @@ libXiincludedir = $(includedir)/X11/extensions libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h \ -diff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in ---- src/Makefile.in 2011-01-25 13:42:19.000000000 -0800 -+++ src/Makefile.in 2011-02-11 16:44:24.132924989 -0800 -@@ -337,7 +337,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ +diff --git a/src/Makefile.in b/src/Makefile.in +index 4ca3ac7..b66f7b3 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -340,7 +340,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/lib/libXrandr/Makefile --- a/open-src/lib/libXrandr/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/lib/libXrandr/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -29,11 +29,11 @@ MODULE_NAME=libXrandr # Version number (used in path names) -MODULE_VERSION=1.3.1 +MODULE_VERSION=1.3.2 # Checksums for upstream tarball -TARBALL_MD5 = 7785c3f7cff2735c94657e8f87ed8ad3 -TARBALL_SHA1 = 8e89622b0656cb2eb22c1f3c646c797dc648ead5 +TARBALL_MD5 = 92473da2fccf5fac665be4fa4f2037fa +TARBALL_SHA1 = 0c844a4c5237f96794f0c18a5af16dc5ab7a36ec # Patches to apply to source after unpacking, in order SOURCE_PATCHES = diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/proto/inputproto/Makefile --- a/open-src/proto/inputproto/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/proto/inputproto/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -27,11 +27,11 @@ MODULE_NAME=inputproto # Version number (used in path names) -MODULE_VERSION=2.0.1 +MODULE_VERSION=2.0.2 # Checksums for upstream tarball -TARBALL_MD5 = da9bf9e5d174163f597d2d72757d9038 -TARBALL_SHA1 = 9c11b99b7cccceafa6b4235a3084523fb7cb4621 +TARBALL_MD5 = 07d54ae098ed4e6dce472f6ef3de05ce +TARBALL_SHA1 = a34c01c67aa2ed9058ff19ace0041978b1d8d711 # Patches to apply to source after unpacking, in order SOURCE_PATCHES= diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/proto/x11proto/Makefile --- a/open-src/proto/x11proto/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/proto/x11proto/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -27,15 +27,15 @@ MODULE_NAME=xproto # Version number (used in path names) -MODULE_VERSION=7.0.21 +MODULE_VERSION=7.0.22 # Checksums for upstream tarball -TARBALL_MD5 = c5a93a69b701cf81925fab02b35b0d0e -TARBALL_SHA1 = 608290fa354b1aff4a075c905f1057d979c62ac9 +TARBALL_MD5 = da0b0eb2f432b7cc1d665b05422a0457 +TARBALL_SHA1 = 96d9b37d15591412a94dd0d3620008e20ef500ca # Patches to apply to source after unpacking, in order SOURCE_PATCHES= \ - X.h-patch + X.h-patch,-p1 # ARC cases that covered this module # PSARC/2001/108 X11 Over IPv6 diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/proto/x11proto/X.h-patch --- a/open-src/proto/x11proto/X.h-patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/proto/x11proto/X.h-patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,9 +1,11 @@ Need to retain FamilyInternetV6 for backwards compatibility with CDE and other sources written to the original X11/IPv6 draft which was included in Solaris 9. ---- X.h Mon Apr 10 17:55:35 2006 -+++ X.h Mon Apr 10 18:46:35 2006 -@@ -303,6 +303,7 @@ +diff --git a/X.h b/X.h +index 5cf695d..d06886b 100644 +--- a/X.h ++++ b/X.h +@@ -299,6 +299,7 @@ are reserved in the protocol for errors and replies. */ #define FamilyDECnet 1 #define FamilyChaos 2 #define FamilyInternet6 6 /* IPv6 */ diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/util/util-macros/Makefile --- a/open-src/util/util-macros/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/util/util-macros/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -31,11 +31,11 @@ MODULE_PKGNAME_SET=yes # Version number (used in path names) -MODULE_VERSION=1.13.0 +MODULE_VERSION=1.15.0 # Checksums for upstream tarball -TARBALL_MD5 = ed6dbe0cd80c29fd7d6653385b1db540 -TARBALL_SHA1 = 5d86ac2a4c0aa3428d72aff35dacc07baf883121 +TARBALL_MD5 = 357efdfa69f3e092de3b7000b90f6f4a +TARBALL_SHA1 = 1c4871ba4b4c6cac894b64489053d85e0a122e60 # Patches to apply to source after unpacking, in order SOURCE_PATCHES= diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/Makefile.inc --- a/open-src/xserver/Makefile.inc Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/Makefile.inc Tue Aug 02 13:30:29 2011 -0700 @@ -39,7 +39,7 @@ include $(TOP)/open-src/common/Makefile.init # Xorg server source tarball to use sources from -XORGSERVER_VERS=1.10.2 +XORGSERVER_VERS=1.10.3 # Patches shared between Xorg & Xvnc builds XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/7050250.patch --- a/open-src/xserver/xorg/7050250.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -From 5752cc473648bf73f9ca71b7ccffc03b23e9195b Mon Sep 17 00:00:00 2001 -From: Marko Macek -Date: Sat, 21 May 2011 13:30:59 +0100 -Subject: [PATCH 1/2] DIX: Set backgroundState correctly for root window - -When we change the root window's background to None, and we've run with --wr or -br for a forced solid background, make sure we also change the -background state to BackgroundPixel, so we don't try to lookup either -pScreen->whitePixel or pScreen->blackPixel as a pixmap. - -Signed-off-by: Marko Macek -Reviewed-by: Walter Harms -Reviewed-by: Daniel Stone -Signed-off-by: Keith Packard -(cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a) ---- - dix/window.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/dix/window.c b/dix/window.c -index 9be7064..41306b3 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -474,6 +474,7 @@ InitRootWindow(WindowPtr pWin) - pWin->background.pixel = pScreen->whitePixel; - backFlag |= CWBackPixmap; - } else { -+ pWin->backgroundState = BackgroundPixel; - if (whiteRoot) - pWin->background.pixel = pScreen->whitePixel; - else -@@ -972,6 +973,7 @@ SetRootWindowBackground(WindowPtr pWin, ScreenPtr pScreen, Mask *index2) - else if (party_like_its_1989) - MakeRootTile(pWin); - else { -+ pWin->backgroundState = BackgroundPixel; - if (whiteRoot) - pWin->background.pixel = pScreen->whitePixel; - else --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/CR7054054.patch --- a/open-src/xserver/xorg/CR7054054.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/CR7054054.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,6 +1,7 @@ -diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Globals.c hw/xfree86/common/xf86Globals.c ---- hw/xfree86/common/xf86Globals.c 2011-06-16 07:12:02.147878487 -0400 -+++ hw/xfree86/common/xf86Globals.c 2011-06-15 14:15:33.000000000 -0400 +diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c +index f87c1eb..bd0279a 100644 +--- a/hw/xfree86/common/xf86Globals.c ++++ b/hw/xfree86/common/xf86Globals.c @@ -103,6 +103,8 @@ xf86InfoRec xf86Info = { .vtPendingNum = -1, #endif @@ -10,10 +11,11 @@ .dontZap = FALSE, .dontZoom = FALSE, .notrapSignals = FALSE, -diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c ---- hw/xfree86/common/xf86Init.c 2011-06-16 07:12:02.229728639 -0400 -+++ hw/xfree86/common/xf86Init.c 2011-06-15 14:18:08.000000000 -0400 -@@ -1334,6 +1334,16 @@ ddxProcessArgument(int argc, char **argv +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index c3ff668..db8c02b 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -1334,6 +1334,16 @@ ddxProcessArgument(int argc, char **argv, int i) xf86xkbdirFlag = TRUE; return 0; } @@ -39,9 +41,10 @@ /* OS-specific usage */ xf86UseMsg(); ErrorF("\n"); -diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Privstr.h hw/xfree86/common/xf86Privstr.h ---- hw/xfree86/common/xf86Privstr.h 2010-11-14 05:27:21.000000000 -0500 -+++ hw/xfree86/common/xf86Privstr.h 2011-06-15 14:19:12.000000000 -0400 +diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h +index 608f9bd..cdc67cb 100644 +--- a/hw/xfree86/common/xf86Privstr.h ++++ b/hw/xfree86/common/xf86Privstr.h @@ -66,6 +66,8 @@ typedef struct { int vtPendingNum; #endif @@ -51,10 +54,11 @@ Bool dontZap; Bool dontZoom; Bool notrapSignals; /* don't exit cleanly - die at fault */ -diff -urp -x '*~' -x '*.orig' hw/xfree86/doc/man/Xorg.man hw/xfree86/doc/man/Xorg.man ---- hw/xfree86/doc/man/Xorg.man 2011-06-16 07:12:02.427320678 -0400 -+++ hw/xfree86/doc/man/Xorg.man 2011-06-15 14:33:05.000000000 -0400 -@@ -335,6 +335,10 @@ as root (i.e, with real-uid 0). +diff --git a/hw/xfree86/doc/man/Xorg.man b/hw/xfree86/doc/man/Xorg.man +index 6fa334c..ffeefd1 100644 +--- a/hw/xfree86/doc/man/Xorg.man ++++ b/hw/xfree86/doc/man/Xorg.man +@@ -334,6 +334,10 @@ as root (i.e, with real-uid 0). .B \-nosilk Disable Silken Mouse support. .TP 8 @@ -65,7 +69,7 @@ .B \-pixmap24 Set the internal pixmap format for depth 24 pixmaps to 24 bits per pixel. The default is usually 32 bits per pixel. There is normally little -@@ -377,6 +381,9 @@ and +@@ -376,6 +380,9 @@ and .B \-ggamma options. .TP 8 @@ -75,9 +79,10 @@ .BI \-screen " screen-name" Use the __xconfigfile__(__filemansuffix__) file .B Screen -diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/bsd/bsd_init.c hw/xfree86/os-support/bsd/bsd_init.c ---- hw/xfree86/os-support/bsd/bsd_init.c 2011-02-27 18:48:26.000000000 -0500 -+++ hw/xfree86/os-support/bsd/bsd_init.c 2011-06-16 07:43:20.548858212 -0400 +diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c +index 123eb17..c9ef330 100644 +--- a/hw/xfree86/os-support/bsd/bsd_init.c ++++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -45,7 +45,6 @@ static int devConsoleFd = -1; #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) static int VTnum = -1; @@ -132,7 +137,7 @@ switch (xf86Info.consType) { -@@ -723,11 +723,6 @@ xf86ProcessArgument(int argc, char *argv +@@ -723,11 +723,6 @@ xf86ProcessArgument(int argc, char *argv[], int i) return 1; } #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -144,9 +149,10 @@ if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { if (sscanf(argv[i], "vt%2d", &VTnum) == 0 || -diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/linux/lnx_init.c hw/xfree86/os-support/linux/lnx_init.c ---- hw/xfree86/os-support/linux/lnx_init.c 2010-12-02 15:25:57.000000000 -0500 -+++ hw/xfree86/os-support/linux/lnx_init.c 2011-06-16 07:39:56.547383139 -0400 +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 77dfb2f..8977ab8 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -39,8 +39,6 @@ #include @@ -156,16 +162,16 @@ static int activeVT = -1; static char vtname[11]; -@@ -105,7 +103,7 @@ xf86OpenConsole(void) +@@ -109,7 +107,7 @@ xf86OpenConsole(void) "xf86OpenConsole: Cannot open /dev/tty0 (%s)\n", strerror(errno)); - if (ShareVTs) + if (xf86Info.ShareVTs) { - if (ioctl(fd, VT_GETSTATE, &vts) == 0) - xf86Info.vtno = vts.v_active; -@@ -177,7 +175,7 @@ xf86OpenConsole(void) + SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts)); + if (ret < 0) +@@ -184,7 +182,7 @@ xf86OpenConsole(void) } #endif @@ -174,7 +180,7 @@ { struct termios nTty; -@@ -229,7 +227,7 @@ xf86OpenConsole(void) +@@ -240,7 +238,7 @@ xf86OpenConsole(void) * of Init?$#*&Device(). So I just place it here */ } } else { /* serverGeneration != 1 */ @@ -183,16 +189,16 @@ { /* now get the VT */ switch_to(xf86Info.vtno, "xf86OpenConsole"); -@@ -242,7 +240,7 @@ xf86CloseConsole(void) - { +@@ -254,7 +252,7 @@ xf86CloseConsole(void) struct vt_mode VT; + int ret; - if (ShareVTs) { + if (xf86Info.ShareVTs) { close(xf86Info.consoleFd); return; } -@@ -271,7 +269,7 @@ xf86CloseConsole(void) +@@ -286,7 +284,7 @@ xf86CloseConsole(void) strerror(errno)); } @@ -201,7 +207,7 @@ { /* * Perform a switch back to the active VT when we were started -@@ -296,16 +294,6 @@ xf86ProcessArgument(int argc, char *argv +@@ -311,16 +309,6 @@ xf86ProcessArgument(int argc, char *argv[], int i) KeepTty = TRUE; return 1; } @@ -218,17 +224,18 @@ if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) -@@ -325,6 +313,4 @@ xf86UseMsg(void) +@@ -340,6 +328,4 @@ xf86UseMsg(void) ErrorF("vtXX use the specified VT number\n"); ErrorF("-keeptty "); ErrorF("don't detach controlling tty (for debugging only)\n"); - ErrorF("-novtswitch don't immediately switch to new VT\n"); - ErrorF("-sharevts share VTs with another X server\n"); } -diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/solaris/sun_init.c hw/xfree86/os-support/solaris/sun_init.c ---- hw/xfree86/os-support/solaris/sun_init.c 2011-06-16 07:12:02.278692640 -0400 -+++ hw/xfree86/os-support/solaris/sun_init.c 2011-06-15 14:51:09.000000000 -0400 -@@ -66,6 +66,22 @@ static char consoleDev[PATH_MAX] = "/dev +diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c +index 42e20ac..4fe40ca 100644 +--- a/hw/xfree86/os-support/solaris/sun_init.c ++++ b/hw/xfree86/os-support/solaris/sun_init.c +@@ -66,6 +66,22 @@ static char consoleDev[PATH_MAX] = "/dev/fb"; Used by hw/xfree86/common/xf86AutoConfig.c for VIS_GETIDENTIFIER */ _X_HIDDEN char xf86SolarisFbDev[PATH_MAX] = "/dev/fb"; diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/IA.patch --- a/open-src/xserver/xorg/IA.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/IA.patch Tue Aug 02 13:30:29 2011 -0700 @@ -31,10 +31,10 @@ config \ hw \ diff --git a/configure.ac b/configure.ac -index 926d159..f4311c3 100644 +index d960d4c..c6cbb69 100644 --- a/configure.ac +++ b/configure.ac -@@ -1141,6 +1141,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension]) +@@ -1147,6 +1147,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension]) XI_LIB='$(top_builddir)/Xi/libXi.la' XI_INC='-I$(top_srcdir)/Xi' @@ -45,7 +45,7 @@ AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes) AM_CONDITIONAL(XAA, test "x$XAA" = xyes) AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes) -@@ -2270,3 +2274,6 @@ test/Makefile +@@ -2276,3 +2280,6 @@ test/Makefile test/xi2/Makefile xorg-server.pc ]) @@ -53,7 +53,7 @@ +# Add Sun IA extension +AC_OUTPUT([IA/Makefile]) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 9622eab..21bfe0b 100644 +index 387c134..e1d24e4 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -125,6 +125,7 @@ static ModuleDefault ModuleDefaults[] = { diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/Makefile --- a/open-src/xserver/xorg/Makefile Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/Makefile Tue Aug 02 13:30:29 2011 -0700 @@ -32,8 +32,9 @@ MODULE_VERSION=$(XORGSERVER_VERS) # Checksums for upstream tarball -TARBALL_MD5 = c9ba50bd44ea70da51f13100336a5484 -TARBALL_SHA1 = fd831b3c6297d1a68830c602d767752d87b9ca54 +TARBALL_MD5 = fc1bb18a09244cd43a998625a6a1b071 +TARBALL_SHA1 = 1699be5c0edeca553cfa3ee6caa228483465136b +TARBALL_SHA256 = 05ec05fbc8ec336127071db38cfb61c618e43b720edbd8d51d171c0cd359e290 # Patches to apply to source after unpacking, in order # *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/autoconfig.patch --- a/open-src/xserver/xorg/autoconfig.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/autoconfig.patch Tue Aug 02 13:30:29 2011 -0700 @@ -21,10 +21,10 @@ 6385111: Xorg auto-configuration Improvement diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index d5e2097..e64d54c 100644 +index 3c3735e..764fe7e 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c -@@ -2005,7 +2005,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor) +@@ -2019,7 +2019,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor) cmodep = conf_monitor->mon_modeline_lst; while( cmodep ) { mode = xnfcalloc(1, sizeof(DisplayModeRec)); diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/dtlogin-userinfo.patch --- a/open-src/xserver/xorg/dtlogin-userinfo.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/dtlogin-userinfo.patch Tue Aug 02 13:30:29 2011 -0700 @@ -19,10 +19,10 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. diff --git a/configure.ac b/configure.ac -index de6665a..ac7caae 100644 +index d59ea4a..d960d4c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1458,6 +1458,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) +@@ -1464,6 +1464,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}" XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB" XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" @@ -31,7 +31,7 @@ AC_SUBST([XSERVER_SYS_LIBS]) diff --git a/dix/main.c b/dix/main.c -index e20ffd6..7cab838 100644 +index f79e861..148fb08 100644 --- a/dix/main.c +++ b/dix/main.c @@ -115,6 +115,11 @@ Equipment Corporation. @@ -60,7 +60,7 @@ if(serverGeneration == 1) { CreateWellKnownSockets(); -@@ -293,6 +305,11 @@ int main(int argc, char *argv[], char *envp[]) +@@ -294,6 +306,11 @@ int main(int argc, char *argv[], char *envp[]) pthread_mutex_unlock(&serverRunningMutex); #endif @@ -73,10 +73,10 @@ /* Now free up whatever must be freed */ diff --git a/os/Makefile.am b/os/Makefile.am -index 66a4a0f..b4f90ce 100644 +index 725691d..c41954d 100644 --- a/os/Makefile.am +++ b/os/Makefile.am -@@ -40,6 +40,9 @@ if NEED_STRLCAT +@@ -41,6 +41,9 @@ if NEED_STRLCAT libos_la_SOURCES += $(STRLCAT_SRCS) endif diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/hotkey.patch --- a/open-src/xserver/xorg/hotkey.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/hotkey.patch Tue Aug 02 13:30:29 2011 -0700 @@ -1,5 +1,5 @@ diff --git a/Xi/exevents.c b/Xi/exevents.c -index 327873e..717f275 100644 +index 9bd9d60..e41fa74 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -187,7 +187,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) @@ -20,10 +20,10 @@ mk->sourceid = device->id; diff --git a/Xi/extinit.c b/Xi/extinit.c -index 82df7eb..6b99fae 100644 +index 7f09dfe..d81ca33 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c -@@ -371,6 +371,10 @@ extern XExtensionVersion XIVersion; +@@ -372,6 +372,10 @@ extern XExtensionVersion XIVersion; Mask PropagateMask[MAXDEVICES]; @@ -34,7 +34,7 @@ /***************************************************************** * * Versioning support -@@ -1255,6 +1259,11 @@ XInputExtensionInit(void) +@@ -1258,6 +1262,11 @@ XInputExtensionInit(void) if (!dixRegisterPrivateKey(&XIClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(XIClientRec))) FatalError("Cannot request private for XI.\n"); @@ -159,7 +159,7 @@ diff --git a/include/inputstr.h b/include/inputstr.h -index b74ee04..808f36f 100644 +index 2ee2fd8..1c3711c 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -57,6 +57,11 @@ SOFTWARE. diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/osaudit.patch --- a/open-src/xserver/xorg/osaudit.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/osaudit.patch Tue Aug 02 13:30:29 2011 -0700 @@ -24,7 +24,7 @@ 7010804 Xorg should audit connections and disconnections. diff --git a/configure.ac b/configure.ac -index 756733e..1f1ba8e 100644 +index 122396b..d59ea4a 100644 --- a/configure.ac +++ b/configure.ac @@ -312,6 +312,12 @@ AC_CHECK_HEADER([execinfo.h],[ @@ -37,11 +37,11 @@ + [Define to 1 if you have the Solaris auditing library (-lbsm)])]) +AM_CONDITIONAL([HAVE_LIBBSM], [test "x$HAVE_LIBBSM" = xyes]) + - dnl ARM needs additional compiler flags for proper backtraces if GCC is - dnl used. Compile a dummy program with the -mapcs-frame option. If it - dnl succeeds, we know that we are building for ARM with GCC. + dnl --------------------------------------------------------------------------- + dnl Bus options and CPU capabilities. Replaces logic in + dnl hw/xfree86/os-support/bus/Makefile.am, among others. diff --git a/dix/main.c b/dix/main.c -index 692bec1..dcc38b3 100644 +index e20ffd6..f79e861 100644 --- a/dix/main.c +++ b/dix/main.c @@ -202,6 +202,7 @@ int main(int argc, char *argv[], char *envp[]) @@ -67,10 +67,10 @@ #undef HAVE_LIBM diff --git a/os/Makefile.am b/os/Makefile.am -index 3e4f2c5..40c732f 100644 +index 66a4a0f..725691d 100644 --- a/os/Makefile.am +++ b/os/Makefile.am -@@ -23,6 +23,7 @@ libos_la_SOURCES = \ +@@ -15,6 +15,7 @@ libos_la_SOURCES = \ connection.c \ io.c \ mitauth.c \ @@ -90,6 +90,3 @@ +extern void OSAuditInit (void); + #endif /* _OSDEP_H_ */ --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/patch-list --- a/open-src/xserver/xorg/patch-list Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/patch-list Tue Aug 02 13:30:29 2011 -0700 @@ -1,7 +1,5 @@ -randr-check-rotate.patch,-p1 -7050250.patch,-p1 +oslog-race.patch,-p1 osaudit.patch,-p1 -oslog-race.patch,-p1 sun-paths.patch,-p1 sun-extramodes.patch,-p1 sun-manpage.patch,-p1 @@ -28,4 +26,5 @@ 6912996.patch,-p1 record-regset.patch,-p1 autodetect-kernel-dev-fb.patch,-p1 -CR7054054.patch,-p0 +trim-fallbacks.patch,-p1 +CR7054054.patch,-p1 diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/randr-check-rotate.patch --- a/open-src/xserver/xorg/randr-check-rotate.patch Mon Aug 01 13:50:13 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Tue, 24 May 2011 16:02:42 -0700 -Subject: [PATCH] randr: check rotated virtual size limits correctly - -Commit d1107918d4626268803b54033a07405122278e7f introduced checks to -the RandR path that cause RRSetScreenConfig requests to fail if the -size is too large. Unfortunately, when RandR 1.1 rotation is enabled -it compares the rotated screen dimensions to the unrotated limits, -which causes 90- and 270-degree rotation to fail unless your screen -happens to be square: - - X Error of failed request: BadValue (integer parameter out of range for operation) - Major opcode of failed request: 153 (RANDR) - Minor opcode of failed request: 2 (RRSetScreenConfig) - Value in failed request: 0x780 - Serial number of failed request: 14 - Current serial number in output stream: 14 - -Fix this by moving the check above the code that swaps the dimensions -based on the rotation. - -Signed-off-by: Aaron Plattner -Reviewed-by: Jeremy Huddleston -Tested-by: Robert Hooker -Tested-by: Kent Baxley -Signed-off-by: Keith Packard -(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3) ---- - randr/rrscreen.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/randr/rrscreen.c b/randr/rrscreen.c -index 1bc1a9e..da6d48d 100644 ---- a/randr/rrscreen.c -+++ b/randr/rrscreen.c -@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client) - */ - width = mode->mode.width; - height = mode->mode.height; -- if (rotation & (RR_Rotate_90|RR_Rotate_270)) -- { -- width = mode->mode.height; -- height = mode->mode.width; -- } -- - if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { - client->errorValue = width; - free(pData); -@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client) - return BadValue; - } - -+ if (rotation & (RR_Rotate_90|RR_Rotate_270)) -+ { -+ width = mode->mode.height; -+ height = mode->mode.width; -+ } -+ - if (width != pScreen->width || height != pScreen->height) - { - int c; --- -1.7.3.2 - diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/trim-fallbacks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/open-src/xserver/xorg/trim-fallbacks.patch Tue Aug 02 13:30:29 2011 -0700 @@ -0,0 +1,36 @@ +From 8c9f6e0377ed5c1dc7b137e4a3e89129f6176275 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Mon, 1 Aug 2011 14:09:33 -0700 +Subject: [PATCH] Don't fallback to wsfb or fbdev on Solaris + +We don't ship either one, so don't waste time and make confusing log +entries trying to load them. + +Signed-off-by: Alan Coopersmith +--- + hw/xfree86/common/xf86AutoConfig.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7dc3189..76a9109 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -300,6 +300,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches) + #endif + } + ++#if !defined(sun) + /* Fallback to platform default frame buffer driver */ + if (i < (nmatches - 1)) { + #if !defined(__linux__) && defined(__sparc__) +@@ -308,6 +309,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches) + matches[i++] = xnfstrdup("fbdev"); + #endif + } ++#endif /* !sun */ + } + + /* copy a screen section and enter the desired driver +-- +1.7.3.2 + diff -r 859fc7cfa429 -r 4ad971e180c3 open-src/xserver/xorg/xtsol.patch --- a/open-src/xserver/xorg/xtsol.patch Mon Aug 01 13:50:13 2011 -0700 +++ b/open-src/xserver/xorg/xtsol.patch Tue Aug 02 13:30:29 2011 -0700 @@ -88,7 +88,7 @@ + #endif /* _SECURITY_SRV_H */ diff --git a/configure.ac b/configure.ac -index f4311c3..69057ec 100644 +index c6cbb69..32a3cce 100644 --- a/configure.ac +++ b/configure.ac @@ -227,6 +227,14 @@ dnl Find the math libary @@ -106,7 +106,7 @@ AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h]) dnl AGPGART headers -@@ -1501,6 +1509,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) +@@ -1507,6 +1515,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) if test "x$XVFB" = xyes; then XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" @@ -115,7 +115,7 @@ AC_SUBST([XVFB_LIBS]) AC_SUBST([XVFB_SYS_LIBS]) fi -@@ -1522,6 +1532,8 @@ if test "x$XNEST" = xyes; then +@@ -1528,6 +1538,8 @@ if test "x$XNEST" = xyes; then fi XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB" XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" @@ -124,7 +124,7 @@ AC_SUBST([XNEST_LIBS]) AC_SUBST([XNEST_SYS_LIBS]) fi -@@ -2086,6 +2098,7 @@ if test "$KDRIVE" = yes; then +@@ -2092,6 +2104,7 @@ if test "$KDRIVE" = yes; then KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB" @@ -132,7 +132,7 @@ KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' case $host_os in *linux*) -@@ -2277,3 +2290,6 @@ xorg-server.pc +@@ -2283,3 +2296,6 @@ xorg-server.pc # Add Sun IA extension AC_OUTPUT([IA/Makefile]) @@ -194,7 +194,7 @@ int x, int y, int width, int height, Mask planemask, xGetImageReply **im_return) diff --git a/dix/window.c b/dix/window.c -index 9be7064..25f1a52 100644 +index 41306b3..6d4db39 100644 --- a/dix/window.c +++ b/dix/window.c @@ -97,6 +97,33 @@ Equipment Corporation. @@ -243,7 +243,7 @@ #ifdef DEBUG /****** * PrintWindowTree -@@ -1835,7 +1867,12 @@ IsSiblingAboveMe( +@@ -1837,7 +1869,12 @@ IsSiblingAboveMe( return Below; } @@ -257,7 +257,7 @@ WindowExtents( WindowPtr pWin, BoxPtr pBox) -@@ -1865,7 +1902,12 @@ MakeBoundingRegion ( +@@ -1867,7 +1904,12 @@ MakeBoundingRegion ( return pRgn; } @@ -271,7 +271,7 @@ ShapeOverlap ( WindowPtr pWin, BoxPtr pWinBox, -@@ -2065,7 +2107,12 @@ WhereDoIGoInTheStack( +@@ -2067,7 +2109,12 @@ WhereDoIGoInTheStack( } } @@ -286,7 +286,7 @@ WindowPtr pWin, WindowPtr pSib, diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 21bfe0b..7c548eb 100644 +index e1d24e4..9827e4f 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = { @@ -406,10 +406,10 @@ #endif /* EXTENSIONSTRUCT_H */ diff --git a/include/input.h b/include/input.h -index f96a0a9..89ab1bf 100644 +index 95aae43..3f8a884 100644 --- a/include/input.h +++ b/include/input.h -@@ -403,7 +403,7 @@ extern void NoteLedState( +@@ -408,7 +408,7 @@ extern void NoteLedState( int /*led*/, Bool /*on*/); diff -r 859fc7cfa429 -r 4ad971e180c3 pkg/manifests/x11-library-libx11.p5m --- a/pkg/manifests/x11-library-libx11.p5m Mon Aug 01 13:50:13 2011 -0700 +++ b/pkg/manifests/x11-library-libx11.p5m Tue Aug 02 13:30:29 2011 -0700 @@ -627,7 +627,7 @@ file path=usr/share/man/man3x11/XFreeFontPath.3x11 file path=usr/share/man/man3x11/XFreeFontSet.3x11 file path=usr/share/man/man3x11/XFreeGC.3x11 -file path=usr/share/man/man3x11/XFreeModifierMap.3x11 +file path=usr/share/man/man3x11/XFreeModifiermap.3x11 file path=usr/share/man/man3x11/XFreePixmap.3x11 file path=usr/share/man/man3x11/XFreeStringList.3x11 file path=usr/share/man/man3x11/XGCValues.3x11