Hello community,
here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory
checked in at Tue Nov 2 10:34:57 CET 2010.
--------
--- xorg-x11-libX11/xorg-x11-libX11.changes 2010-09-22 09:14:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2010-10-30 18:15:20.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Oct 30 16:01:11 UTC 2010 - sndirsch@novell.com
+
+- update to release 1.3.99.903
+ * This is the third release candidate for libX11 1.4. Will the
+ third time be the charm? Hopefully Dan's fixes to disable
+ fopping the docs by default will solve the build issues that
+ many people had with the second RC.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libX11-1.3.99.902.tar.bz2
New:
----
libX11-1.3.99.903.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libX11.spec ++++++
--- /var/tmp/diff_new_pack.9x0NkQ/_old 2010-11-02 10:34:14.000000000 +0100
+++ /var/tmp/diff_new_pack.9x0NkQ/_new 2010-11-02 10:34:14.000000000 +0100
@@ -20,7 +20,7 @@
Name: xorg-x11-libX11
%define xcb 1
-%define dirsuffix 1.3.99.902
+%define dirsuffix 1.3.99.903
BuildRequires: fdupes pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel zlib-devel
%if %xcb
BuildRequires: xorg-x11-libxcb-devel
@@ -28,7 +28,7 @@
PreReq: coreutils
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 5
+Release: 6
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
++++++ libX11-1.3.99.902.tar.bz2 -> libX11-1.3.99.903.tar.bz2 ++++++
++++ 3025 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/ChangeLog new/libX11-1.3.99.903/ChangeLog
--- old/libX11-1.3.99.902/ChangeLog 2010-09-22 05:11:12.000000000 +0200
+++ new/libX11-1.3.99.903/ChangeLog 2010-10-30 07:03:01.000000000 +0200
@@ -1,3 +1,85 @@
+commit 3e8907305e1818369aef5a5c0da61f09e20de4f8
+Author: Alan Coopersmith
+Date: Fri Oct 29 22:02:10 2010 -0700
+
+ libX11 1.3.99.903 (1.4.0 RC3)
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5d245d8013289b13e0c42100951b26166c7fada4
+Author: Alan Coopersmith
+Date: Fri Oct 29 22:01:39 2010 -0700
+
+ Require xorg-macros 1.11 now that it is released
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1ec89689fc771f116a6165226b9e076f54254a40
+Author: Dan Nicholson
+Date: Fri Oct 22 19:09:07 2010 -0700
+
+ docs: Disable fop documentation by default
+
+ fop is used to generate the pdf and ps formats of the documentation.
+ This can significantly slow down the build, especially when creating all
+ the compose key charts. Since few people probably want the full set of
+ doc formats, set the default to 'no'.
+
+ The default parameter for XORG_WITH_FOP is only available in recent
+ macros. Users generating configure from older macros will just get
+ 'auto' as the default.
+
+ Signed-off-by: Dan Nicholson
+ Reviewed-by: Gaetan Nadon
+ Reviewed-by: Alan Coopersmith
+ Signed-off-by: Alan Coopersmith
+
+commit 03877bda911b72ac60a7144d6eced7d5be4b4d72
+Author: Jon TURNEY
+Date: Wed Apr 14 13:38:18 2010 +0100
+
+ Add C.UTF-8 and C.ASCII locale aliases
+
+ Add C.UTF-8 locale as an alias for en_US.UTF-8
+ Add C.ASCII locale as an alias for C
+
+ (C.UTF-8 is the default locale for cygwin. It also exists in debian,
+ although I don't think it's intended for use by humans.)
+
+ Signed-off-by: Jon TURNEY
+ Acked-by: Julien Cristau
+ Reviewed-by: James Cloos
+
+commit 81d1d9a6bdca779a44f931730b866eea75777c00
+Author: Dan Nicholson
+Date: Sat Oct 9 16:00:47 2010 -0700
+
+ docs: Remove directory prerequisites from make rules
+
+ Make expects prerequisites to be files with valid timestamps, and
+ directories are treated as always being out of date. Thus, any targets
+ depending on directories will always be rebuilt.
+
+ Instead, the doc rules are changed to always create the target's leading
+ directory. This should prevent the documentation from being rebuilt when
+ "make install" is run.
+
+ Signed-off-by: Dan Nicholson
+ Reviewed-by: Jeremy Huddleston
+ Signed-off-by: Alan Coopersmith
+
+commit d0cbf388919364fe6b5b9127f36426eb744090a0
+Author: Jeremy Huddleston
+Date: Sun Sep 26 21:21:16 2010 -0700
+
+ Add an "X11_" string to header guards to avoid possible collision
+
+ This addresses a build failure which can result from and
+ being included in the same code since they both used the same
+ _XLOCALE_H_ protection.
+
+ Signed-off-by: Jeremy Huddleston
+
commit b51ac675f44f5ce1a28c5734bf3c26983f8b4192
Author: Alan Coopersmith
Date: Tue Sep 21 19:53:03 2010 -0700
@@ -989,7 +1071,7 @@
Reviewed-by: Jamey Sharp
commit fd82552d5c0ce1931f29006a0c36f5e03cf8577e
-Merge: aae2a4a... 933aee1...
+Merge: aae2a4a 933aee1
Author: Jamey Sharp
Date: Mon May 10 16:51:24 2010 -0700
@@ -3685,7 +3767,7 @@
Add some Khmer digraphs to all locales with a Compose.pre.
commit e54cffb649b1622c17457e470cfab8cc56d38c97
-Merge: 19802cc... 721b574...
+Merge: 19802cc 721b574
Author: Daniel Stone
Date: Tue Jun 10 20:04:30 2008 +0300
@@ -3704,7 +3786,7 @@
Require xproto 7.0.13 and libxcb 1.1.90 (for GenericEvents)
commit e9195db7257e418f83707233baeeb84b225caf4f
-Merge: c34f76f... a7f8556...
+Merge: c34f76f a7f8556
Author: Peter Hutterer
Date: Thu May 22 12:14:28 2008 +0930
@@ -3740,7 +3822,7 @@
Build with xcb as transport layer highly recommended.
commit c9b2ff1e6a607463993afa4a8d085857d97cc2f3
-Merge: 17d7dcb... 9129057...
+Merge: 17d7dcb 9129057
Author: Peter Hutterer
Date: Mon May 12 17:58:37 2008 +0930
@@ -3947,7 +4029,7 @@
X.Org bug#13786 http://bugs.freedesktop.org/show_bug.cgi?id=13786
commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea
-Merge: 8f0bd3f... e8d4cef...
+Merge: 8f0bd3f e8d4cef
Author: James Cloos
Date: Fri Dec 14 22:43:47 2007 -0500
@@ -3978,14 +4060,14 @@
Added launchd support.
commit 17d7dcbfced4a9417b33507bd3fd9b7dd8268242
-Merge: 5dfefd3... 13ac804...
+Merge: 5dfefd3 13ac804
Author: Peter Hutterer
Date: Thu Dec 6 14:08:29 2007 +1030
Merge branch 'master' into xge
commit 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5
-Merge: a68a1cd... eff33ae...
+Merge: a68a1cd eff33ae
Author: Peter Hutterer
Date: Thu Dec 6 13:57:09 2007 +1030
@@ -4041,7 +4123,7 @@
2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
commit 02e04059c89e175f51647e3b031344f743286b34
-Merge: 1254c57... b57129e...
+Merge: 1254c57 b57129e
Author: James Cloos
Date: Tue Dec 4 06:55:04 2007 -0500
@@ -4219,7 +4301,7 @@
X.Org Bugzilla #9516 https://bugs.freedesktop.org/show_bug.cgi?id=9516
commit d8fe979fc929833e8c754aed32641786d5a0622b
-Merge: 21ca953... 4ec1723...
+Merge: 21ca953 4ec1723
Author: James Cloos
Date: Mon Aug 20 15:34:50 2007 -0400
@@ -4839,7 +4921,7 @@
Since XlibConf.h is built by configure, don't distribute it.
commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376
-Merge: 129bbb9... 769b985...
+Merge: 129bbb9 769b985
Author: Jeremy C. Reed
Date: Thu Dec 14 14:23:20 2006 -0600
@@ -5079,7 +5161,7 @@
Release libX11 1.1 RC1 (1.0.99.1).
commit bf237409c5fce32c557d298f62f44d456c2b5bc8
-Merge: ba47719... 2d426d1...
+Merge: ba47719 2d426d1
Author: Jamey Sharp
Date: Sat Oct 7 21:07:16 2006 -0700
@@ -5516,7 +5598,7 @@
(cherry picked from e3acee88cfcc4ef0fa8a7db39763a5ebe2e985cb commit)
commit c336eb6b80a6f91da1d0b3d28634a2cfde324670
-Merge: 33556ca... ad9ebbd...
+Merge: 33556ca ad9ebbd
Author: Donnie Berkholz
Date: Thu Jun 22 14:25:35 2006 -0700
@@ -5529,14 +5611,14 @@
Bump to 1.0.99.0 to avoid confusion.
commit efedfd68e31bcee2d21ac340be8dc9e1825ec890
-Merge: e3acee8... 4b8eb5d...
+Merge: e3acee8 4b8eb5d
Author: Daniel Stone
Date: Thu Jun 22 16:53:45 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/srv/git.freedesktop.org/git/xorg/lib/libX11
commit 4b8eb5d4a1da73a94b5a6ab12e34784aae4c79c5
-Merge: 5169d0e... eff50c9...
+Merge: 5169d0e eff50c9
Author: Matthieu Herrb
Date: Tue Jun 20 21:05:15 2006 +0200
@@ -5869,7 +5951,7 @@
Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre.
commit 9cac8c9824874ca7d835f001a4efa910b7fdd822
-Merge: 19b8840... e514bc8...
+Merge: 19b8840 e514bc8
Author: Daniel Stone
Date: Wed May 10 14:50:37 2006 +0300
@@ -5962,7 +6044,7 @@
Properly clip bounds when only one point is defining an outline.
commit e876efb8aa410f2f5c87aaaa7042f847c4ff96f7
-Merge: be266b2... f71ea0b...
+Merge: be266b2 f71ea0b
Author: Matthieu Herrb
Date: Sat Mar 11 15:40:35 2006 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/configure.ac new/libX11-1.3.99.903/configure.ac
--- old/libX11-1.3.99.902/configure.ac 2010-09-22 03:26:00.000000000 +0200
+++ new/libX11-1.3.99.903/configure.ac 2010-10-30 07:01:47.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.60)
AC_INIT([libX11],
- 1.3.99.902,
+ [1.3.99.903],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -21,14 +21,14 @@
# to avoid autoconf errors.
AC_USE_SYSTEM_EXTENSIONS
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.11 for disabling fop by default
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.11 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.11)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
+XORG_WITH_FOP([no])
XORG_CHECK_SGML_DOCTOOLS(1.5)
XORG_PROG_RAWCPP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/cpprules.in new/libX11-1.3.99.903/cpprules.in
--- old/libX11-1.3.99.902/cpprules.in 2010-09-22 03:25:23.000000000 +0200
+++ new/libX11-1.3.99.903/cpprules.in 2010-10-10 18:43:49.000000000 +0200
@@ -26,4 +26,5 @@
-e '/\@\@$$/s/\@\@$$/\\/'
.pre:
+ @$(MKDIR_P) $(@D)
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/cursorfont.h new/libX11-1.3.99.903/include/X11/cursorfont.h
--- old/libX11-1.3.99.902/include/X11/cursorfont.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/cursorfont.h 2010-10-05 03:02:06.000000000 +0200
@@ -26,8 +26,8 @@
*/
-#ifndef _cursorfont_h_
-#define _cursorfont_h_
+#ifndef _X11_CURSORFONT_H_
+#define _X11_CURSORFONT_H_
#define XC_num_glyphs 154
#define XC_X_cursor 0
@@ -108,4 +108,4 @@
#define XC_watch 150
#define XC_xterm 152
-#endif /* _cursorfont_h_ */
+#endif /* _X11_CURSORFONT_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/ImUtil.h new/libX11-1.3.99.903/include/X11/ImUtil.h
--- old/libX11-1.3.99.902/include/X11/ImUtil.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/ImUtil.h 2010-10-05 03:02:06.000000000 +0200
@@ -1,6 +1,6 @@
-#ifndef _IMUTIL_H_
-#define _IMUTIL_H_
+#ifndef _X11_IMUTIL_H_
+#define _X11_IMUTIL_H_
extern int
_XGetScanlinePad(
@@ -27,4 +27,4 @@
_XInitImageFuncPtrs(
register XImage *image);
-#endif /* _IMUTIL_H_ */
+#endif /* _X11_IMUTIL_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xcms.h new/libX11-1.3.99.903/include/X11/Xcms.h
--- old/libX11-1.3.99.902/include/X11/Xcms.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xcms.h 2010-10-05 03:02:06.000000000 +0200
@@ -26,8 +26,8 @@
* DESCRIPTION
* Public include file for X Color Management System
*/
-#ifndef _XCMS_H_
-#define _XCMS_H_
+#ifndef _X11_XCMS_H_
+#define _X11_XCMS_H_
#include
@@ -800,4 +800,4 @@
_XFUNCPROTOEND
-#endif /* _XCMS_H_ */
+#endif /* _X11_XCMS_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/XKBlib.h new/libX11-1.3.99.903/include/X11/XKBlib.h
--- old/libX11-1.3.99.902/include/X11/XKBlib.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/XKBlib.h 2010-10-05 03:02:06.000000000 +0200
@@ -24,8 +24,8 @@
********************************************************/
-#ifndef _XKBLIB_H_
-#define _XKBLIB_H_
+#ifndef _X11_XKBLIB_H_
+#define _X11_XKBLIB_H_
#include
#include
@@ -1146,4 +1146,4 @@
_XFUNCPROTOEND
-#endif /* _XKBLIB_H_ */
+#endif /* _X11_XKBLIB_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xlib.h new/libX11-1.3.99.903/include/X11/Xlib.h
--- old/libX11-1.3.99.902/include/X11/Xlib.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xlib.h 2010-10-05 03:02:06.000000000 +0200
@@ -30,8 +30,8 @@
* interface library (Xlib) to the X Window System Protocol (V11).
* Structures and symbols starting with "_" are private to the library.
*/
-#ifndef _XLIB_H_
-#define _XLIB_H_
+#ifndef _X11_XLIB_H_
+#define _X11_XLIB_H_
#define XlibSpecificationRelease 6
@@ -4020,4 +4020,4 @@
_XFUNCPROTOEND
-#endif /* _XLIB_H_ */
+#endif /* _X11_XLIB_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xlibint.h new/libX11-1.3.99.903/include/X11/Xlibint.h
--- old/libX11-1.3.99.902/include/X11/Xlibint.h 2010-09-22 03:25:23.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xlibint.h 2010-10-05 03:02:06.000000000 +0200
@@ -27,8 +27,8 @@
*/
-#ifndef _XLIBINT_H_
-#define _XLIBINT_H_ 1
+#ifndef _X11_XLIBINT_H_
+#define _X11_XLIBINT_H_ 1
/*
* Xlibint.h - Header definition and support file for the internal
@@ -1394,4 +1394,4 @@
_XFUNCPROTOEND
-#endif /* _XLIBINT_H_ */
+#endif /* _X11_XLIBINT_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xlib-xcb.h new/libX11-1.3.99.903/include/X11/Xlib-xcb.h
--- old/libX11-1.3.99.902/include/X11/Xlib-xcb.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xlib-xcb.h 2010-10-05 03:02:06.000000000 +0200
@@ -1,8 +1,8 @@
/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett
* This file is licensed under the MIT license. See the file COPYING. */
-#ifndef XLIB_XCB_H
-#define XLIB_XCB_H
+#ifndef _X11_XLIB_XCB_H_
+#define _X11_XLIB_XCB_H_
#include
#include
@@ -17,4 +17,4 @@
_XFUNCPROTOEND
-#endif /* XLIB_XCB_H */
+#endif /* _X11_XLIB_XCB_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xlocale.h new/libX11-1.3.99.903/include/X11/Xlocale.h
--- old/libX11-1.3.99.902/include/X11/Xlocale.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xlocale.h 2010-10-05 03:02:06.000000000 +0200
@@ -26,8 +26,8 @@
*/
-#ifndef _XLOCALE_H_
-#define _XLOCALE_H_
+#ifndef _X11_XLOCALE_H_
+#define _X11_XLOCALE_H_
#include
#include
@@ -56,4 +56,4 @@
#endif /* X_LOCALE */
-#endif /* _XLOCALE_H_ */
+#endif /* _X11_XLOCALE_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xregion.h new/libX11-1.3.99.903/include/X11/Xregion.h
--- old/libX11-1.3.99.902/include/X11/Xregion.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xregion.h 2010-10-05 03:02:06.000000000 +0200
@@ -45,8 +45,8 @@
************************************************************************/
-#ifndef _XREGION_H
-#define _XREGION_H
+#ifndef _X11_XREGION_H_
+#define _X11_XREGION_H_
typedef struct {
short x1, x2, y1, y2;
@@ -186,4 +186,4 @@
struct _POINTBLOCK *next;
} POINTBLOCK;
-#endif
+#endif /* _X11_XREGION_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xresource.h new/libX11-1.3.99.903/include/X11/Xresource.h
--- old/libX11-1.3.99.902/include/X11/Xresource.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xresource.h 2010-10-05 03:02:06.000000000 +0200
@@ -46,8 +46,8 @@
******************************************************************/
-#ifndef _XRESOURCE_H_
-#define _XRESOURCE_H_
+#ifndef _X11_XRESOURCE_H_
+#define _X11_XRESOURCE_H_
#ifndef _XP_PRINT_SERVER_
#include
@@ -354,5 +354,5 @@
_XFUNCPROTOEND
-#endif /* _XRESOURCE_H_ */
+#endif /* _X11_XRESOURCE_H_ */
/* DON'T ADD STUFF AFTER THIS #endif */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/include/X11/Xutil.h new/libX11-1.3.99.903/include/X11/Xutil.h
--- old/libX11-1.3.99.902/include/X11/Xutil.h 2010-09-04 07:52:38.000000000 +0200
+++ new/libX11-1.3.99.903/include/X11/Xutil.h 2010-10-05 03:02:06.000000000 +0200
@@ -46,8 +46,8 @@
******************************************************************/
-#ifndef _XUTIL_H_
-#define _XUTIL_H_
+#ifndef _X11_XUTIL_H_
+#define _X11_XUTIL_H_
/* You must include before including this file */
#include
@@ -823,4 +823,4 @@
_XFUNCPROTOEND
-#endif /* _XUTIL_H_ */
+#endif /* _X11_XUTIL_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/nls/locale.alias.pre new/libX11-1.3.99.903/nls/locale.alias.pre
--- old/libX11-1.3.99.902/nls/locale.alias.pre 2010-09-22 03:25:14.000000000 +0200
+++ new/libX11-1.3.99.903/nls/locale.alias.pre 2010-10-29 09:21:12.000000000 +0200
@@ -10,10 +10,12 @@
POSIX-UTF2: C
C_C.C: C
C.en: C
+C.ASCII: C
C.iso88591: en_US.ISO8859-1
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
+C.UTF-8: en_US.UTF-8
XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
a3: a3_AZ.KOI8-C
a3_AZ: a3_AZ.KOI8-C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.902/nls/Makefile.am new/libX11-1.3.99.903/nls/Makefile.am
--- old/libX11-1.3.99.902/nls/Makefile.am 2010-09-22 03:25:24.000000000 +0200
+++ new/libX11-1.3.99.903/nls/Makefile.am 2010-10-10 18:43:49.000000000 +0200
@@ -1,3 +1,4 @@
+
x11localedir = $(X11_LOCALEDATADIR)
specdir = $(docdir)/Compose
@@ -101,13 +102,11 @@
if HAVE_PERL
doc_sources = Compose/index.xml
-Compose/index.xml: Compose
+Compose/index.xml:
+ @$(MKDIR_P) $(@D)
$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
--index --output="$@" $(locales)
-Compose:
- $(MKDIR_P) $@
-
clean-local: clean-Compose-dir
clean-Compose-dir:
-rm -rf Compose
@@ -122,11 +121,6 @@
EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
CLEANFILES += $(nobase_x11locale_DATA)
-$(nobase_x11locale_DATA): builddirs
-
-builddirs:
- $(MKDIR_P) $(locales)
-
if HAVE_PERL
TESTS_ENVIRONMENT = $(PERL)
TESTS = $(srcdir)/compose-check.pl
@@ -144,6 +138,4 @@
Compose/%.xml: %/Compose.xml
$(AM_V_GEN)cp $< $@
-$(doc_sources): Compose
-
endif HAVE_PERL
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org