pool/xorg-x11-libs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=23

Browse Source
This commit is contained in:
OBS User unknown 2007-08-24 00:12:55 +00:00 committed by Git OBS Bridge
parent 90bf74b721
commit af34fb9603
5 changed files with 92 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libXtst-1.0.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
size 224741

3
libXtst-1.0.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
size 224637

66
pixman.diff Normal file
View File

@ -0,0 +1,66 @@
--- ../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

10
xorg-x11-libs.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Aug 8 23:04:35 CEST 2007 - sndirsch@suse.de

18
xorg-x11-libs.spec
View File

@ -19,7 +19,7 @@ Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6
%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 @@ Source13: libXi-1.1.2.tar.bz2
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 @@ Patch4: p_xft_register.diff
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 @@ popd
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 @@ for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
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 @@ exit 0
%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 @@ exit 0
/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 @@ exit 0
%{_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