Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Fri Aug 24 02:12:55 CEST 2007.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2007-08-08 23:04:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2007-08-21 22:53:11.115946000 +0200
@@ -1,0 +2,10 @@
+Tue Aug 21 22:53:55 CEST 2007 - sndirsch@suse.de
+
+- fixed build of libpixman
+
+-------------------------------------------------------------------
+Sat Aug 18 09:17:27 CEST 2007 - sndirsch@suse.de
+
+- libXtst man pages generation fails if srcdir != builddir
+
+-------------------------------------------------------------------
Old:
----
libXtst-1.0.2.tar.bz2
New:
----
libXtst-1.0.3.tar.bz2
pixman.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.e15416/_old 2007-08-24 02:12:36.000000000 +0200
+++ /var/tmp/diff_new_pack.e15416/_new 2007-08-24 02:12:36.000000000 +0200
@@ -19,7 +19,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 85
+Release: 89
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -41,7 +41,7 @@
Source14: libXinerama-1.0.2.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
Source16: libXrandr-1.2.1.tar.bz2
-Source17: libXtst-1.0.2.tar.bz2
+Source17: libXtst-1.0.3.tar.bz2
Source18: libXvMC-1.0.4.tar.bz2
Source19: libXxf86dga-X11R7.1-1.0.1.tar.bz2
Source20: libXxf86misc-X11R7.1-1.0.1.tar.bz2
@@ -64,6 +64,7 @@
Patch5: libxkbui.diff
Patch8: bug233919-libXaw.diff
Patch10: libXxf86misc-xcb.diff
+Patch11: pixman.diff
%description
This package contains the remaining X.Org libraries.
@@ -150,6 +151,10 @@
pushd libXxf86misc-*
%patch10 -p0
popd
+pushd pixman-*
+mv pixman-1.pc.in pixman.pc.in
+%patch11 -p0
+popd
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -160,7 +165,7 @@
xmkmf -a
;;
*)
- echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
+ echo $dir | grep -q -E "libvnc|libXcliplist|pixman" && autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--enable-type1 \
--prefix=/usr \
@@ -198,8 +203,8 @@
%files -n xorg-x11-devel
%defattr(-,root,root)
-%dir /usr/include/pixman-1
/usr/bin/xft-config
+/usr/include/*.h
/usr/include/X11/*.h
/usr/include/X11/Xaw/
/usr/include/X11/Xcursor/
@@ -207,7 +212,6 @@
/usr/include/X11/XprintAppUtil/
/usr/include/X11/extensions/*.h
/usr/include/X11/fonts/*.h
-/usr/include/pixman-1/*.h
/usr/include/xcb/
/usr/%{_lib}/*.a
/usr/%{_lib}/*.la
@@ -218,6 +222,10 @@
%{_mandir}/man3/*
%changelog
+* Tue Aug 21 2007 - sndirsch@suse.de
+- fixed build of libpixman
+* Sat Aug 18 2007 - sndirsch@suse.de
+- libXtst man pages generation fails if srcdir != builddir
* Wed Aug 08 2007 - sndirsch@suse.de
- pixman 0.9.4
* This is the initial release of the pixman library. Pixman
++++++ libXtst-1.0.2.tar.bz2 -> libXtst-1.0.3.tar.bz2 ++++++
++++ 4550 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/libXtst-1.0.2/ChangeLog new/libXtst-1.0.3/ChangeLog
--- old/libXtst-1.0.2/ChangeLog 2007-06-07 03:49:22.000000000 +0200
+++ new/libXtst-1.0.3/ChangeLog 2007-08-17 23:58:43.000000000 +0200
@@ -1,3 +1,21 @@
+commit 4a5ac6a63c22bdfac9a873803f3a0fa3d6e20a5b
+Author: Alan Coopersmith
+Date: Fri Aug 17 14:57:22 2007 -0700
+
+ Version bump: 1.0.3
+
+commit fe206f87078c90afaa5eba42a4bbe1c0ea300e9b
+Author: zoka
+Date: Mon Jul 2 20:34:52 2007 -0700
+
+ libXtst man pages generation fails if srcdir != builddir
+
+commit a8738715dd5b74f0dec904c83b732ef6471be0db
+Author: Alan Coopersmith
+Date: Wed Jun 6 18:57:12 2007 -0700
+
+ Version bump: 1.0.2
+
commit 8bbc3b75318c67f6089d50f68d53d092390c8233
Author: Alan Coopersmith
Date: Wed Jun 6 18:41:36 2007 -0700
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/libXtst-1.0.2/configure.ac new/libXtst-1.0.3/configure.ac
--- old/libXtst-1.0.2/configure.ac 2007-06-07 03:48:04.000000000 +0200
+++ new/libXtst-1.0.3/configure.ac 2007-08-17 23:56:44.000000000 +0200
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXtst, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
+AC_INIT(libXtst, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
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/libXtst-1.0.2/man/Makefile.am new/libXtst-1.0.3/man/Makefile.am
--- old/libXtst-1.0.2/man/Makefile.am 2007-06-07 02:38:53.000000000 +0200
+++ new/libXtst-1.0.3/man/Makefile.am 2007-08-08 05:16:08.000000000 +0200
@@ -28,7 +28,7 @@
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-libman_xml = XTest.xml
+libman_xml = $(srcdir)/XTest.xml
XTest_manpages = \
XTestQueryExtension \
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/libXtst-1.0.2/missing new/libXtst-1.0.3/missing
--- old/libXtst-1.0.2/missing 2007-06-07 03:49:05.000000000 +0200
+++ new/libXtst-1.0.3/missing 2007-08-17 23:58:25.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
++++++ pixman.diff ++++++
--- ../pixman-0.9.4.orig/Makefile.am 2007-08-21 22:15:29.950632500 +0200
+++ ./Makefile.am 2007-08-21 22:20:47.882502000 +0200
@@ -1,6 +1,6 @@
SUBDIRS = pixman test
pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=pixman-1.pc
+pkgconfig_DATA=pixman.pc
-$(pkgconfig_DATA): pixman-1.pc.in
+$(pkgconfig_DATA): pixman.pc.in
--- ../pixman-0.9.4.orig/configure.ac 2007-08-21 22:15:29.966633500 +0200
+++ ./configure.ac 2007-08-21 22:22:54.362406500 +0200
@@ -125,7 +125,7 @@
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
-AC_OUTPUT([pixman-1.pc
+AC_OUTPUT([pixman.pc
Makefile
pixman/Makefile
test/Makefile])
--- ../pixman-0.9.4.orig/pixman/Makefile.am 2007-08-21 22:15:28.750557500 +0200
+++ ./pixman/Makefile.am 2007-08-21 22:29:32.375280750 +0200
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libpixman-1.la
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
-libpixman_1_la_SOURCES = \
+lib_LTLIBRARIES = libpixman.la
+libpixman_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpixman_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
+libpixman_la_SOURCES = \
pixman.h \
pixman-region.c \
pixman-private.h \
@@ -15,7 +15,7 @@
pixman-compute-region.c \
pixman-timer.c
-libpixmanincludedir = $(includedir)/pixman-1/
+libpixmanincludedir = $(includedir)/
libpixmaninclude_HEADERS = pixman.h
# wrapper library
@@ -35,5 +35,5 @@
pixman-mmx.h
libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
libpixman_mmx_la_LIBADD = $(DEP_LIBS)
-libpixman_1_la_LIBADD += libpixman-mmx.la
+libpixman_la_LIBADD += libpixman-mmx.la
endif
--- ../pixman-0.9.4.orig/test/Makefile.am 2007-08-21 22:15:31.722743250 +0200
+++ ./test/Makefile.am 2007-08-21 22:34:40.038508500 +0200
@@ -7,7 +7,7 @@
INCLUDES = -I$(top_srcdir)/pixman $(GTK_CFLAGS)
-composite_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
-gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
+composite_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
+gradient_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
-endif
\ No newline at end of file
+endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org