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

baselibs.conf

@@ -9,5 +9,4 @@ xorg-x11-devel
   provides  "XFree86-devel-<targettype>"
   requires -xorg-x11-<targettype>
   requires "xorg-x11-libs-<targettype> = <version>"
-libpixman-1-0
 libpciaccess0

pixman-0.12.0.diff

@@ -1,30 +0,0 @@
----
- pixman/pixman-pict.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: pixman/pixman-pict.c
-===================================================================
---- pixman/pixman-pict.c.orig	2008-11-18 10:01:38.000000000 +0100
-+++ pixman/pixman-pict.c	2008-11-21 17:14:57.000000000 +0100
-@@ -1922,10 +1922,10 @@ pixman_bool_t pixman_have_vmx (void) {
- #include <signal.h>
- #include <setjmp.h>
- 
--static jmp_buf jump_env;
-+static sigjmp_buf jump_env;
- 
- static void vmx_test(int sig, siginfo_t *si, void *unused) {
--    longjmp (jump_env, 1);
-+    siglongjmp (jump_env, 1);
- }
- 
- pixman_bool_t pixman_have_vmx (void) {
-@@ -1936,7 +1936,7 @@ pixman_bool_t pixman_have_vmx (void) {
-         sigemptyset(&sa.sa_mask);
-         sa.sa_sigaction = vmx_test;
-         sigaction(SIGILL, &sa, &osa);
--	jmp_result = setjmp (jump_env);
-+	jmp_result = sigsetjmp (jump_env, 1);
- 	if (jmp_result == 0) {
- 	    asm volatile ( "vor 0, 0, 0" );
- 	}

pixman-0.12.0.tar.bz2

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

xorg-x11-libs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 13 07:04:00 CET 2009 - sndirsch@suse.de
+
+- libpixman now in seperate source package (bnc #439019)
+
 -------------------------------------------------------------------
 Wed Feb 11 15:05:13 CET 2009 - coolo@suse.de
 

xorg-x11-libs.spec

@@ -32,7 +32,7 @@ Obsoletes:      xorg-x11-libs-64bit
 #
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        11
+Release:        12
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -69,14 +69,12 @@ Source28:       libXft1-X11R6.9-1.2.tar.bz2
 Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.2.1.tar.bz2
-Source32:       pixman-0.12.0.tar.bz2
 Source33:       libpciaccess-0.10.3.tar.bz2
 Patch:          libXrandr.diff
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch3:         p_xft_cjk.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
-Patch32:        pixman-0.12.0.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -127,75 +125,6 @@ to develop X11 applications that require these.
 
 
 
-Authors:
---------
-    
-    Apple Computer Corporation
-    Dave Lemke
-    David Dawes
-    Derek Wang
-    Frank Giessler
-    Jim Gettys
-    Juliusz Chroboczek
-    Jungshik Shin
-    Keith Packard
-    Kensuke Matsuzaki
-    Marc La France
-    Mark Leisher
-    Noah Levitt
-    Phil Karlton
-    Ralf Habacker
-    Shunsuke Akiyama
-    Suhaib Siddiqi
-    Susan Angebrandt
-
-%package -n libpixman-1-0
-License:        X11/MIT
-Summary:        Pixman library
-Group:          System/Libraries
-Provides:       xorg-x11-libs:/usr/X11R6/%{_lib}/libpixman-1.so.0
-AutoReqProv:    on
-
-%description -n libpixman-1-0
-Pixman library.
-
-
-
-Authors:
---------
-    
-    Apple Computer Corporation
-    Dave Lemke
-    David Dawes
-    Derek Wang
-    Frank Giessler
-    Jim Gettys
-    Juliusz Chroboczek
-    Jungshik Shin
-    Keith Packard
-    Kensuke Matsuzaki
-    Marc La France
-    Mark Leisher
-    Noah Levitt
-    Phil Karlton
-    Ralf Habacker
-    Shunsuke Akiyama
-    Suhaib Siddiqi
-    Susan Angebrandt
-
-%package -n libpixman-1-0-devel
-License:        X11/MIT
-Summary:        Include Files and Libraries mandatory for X11 Development
-Group:          Development/Libraries/X11
-Provides:       xorg-x11-devel:/usr/X11R6/%{_lib}/libpixman-1.so
-Requires:       libpixman-1-0
-
-%description -n libpixman-1-0-devel
-This package contains all necessary include files and libraries needed
-to develop X11 applications that require these.
-
-
-
 Authors:
 --------
     
@@ -305,9 +234,6 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
-pushd pixman-*
-%patch32
-popd
 
 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -318,7 +244,7 @@ for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
         xmkmf -a 
         ;;
       *) 
-        echo $dir | grep -q -E "libvnc|libXcliplist|pixman" && autoreconf -fi
+        echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
         ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
                     --enable-type1 \
                     --prefix=/usr \
@@ -353,10 +279,6 @@ rm -rf "$RPM_BUILD_ROOT"
 test -L usr/include/X11 && rm usr/include/X11
 exit 0
 
-%post -n libpixman-1-0 -p /sbin/ldconfig
-
-%postun -n libpixman-1-0 -p /sbin/ldconfig
-
 %post -n libpciaccess0 -p /sbin/ldconfig
 
 %postun -n libpciaccess0 -p /sbin/ldconfig
@@ -366,7 +288,6 @@ exit 0
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*
-%exclude /usr/%{_lib}/libpixman-1.so.0*
 %exclude /usr/%{_lib}/libpciaccess.so.0*
 
 %files -n xorg-x11-devel
@@ -384,28 +305,14 @@ exit 0
 /usr/include/xcb/
 /usr/%{_lib}/*.a
 /usr/%{_lib}/*.la
-%exclude /usr/%{_lib}/libpixman-1.*a
 %exclude /usr/%{_lib}/libpciaccess.*a
 /usr/%{_lib}/*.so
-%exclude /usr/%{_lib}/libpixman-1.so.0*
 %exclude /usr/%{_lib}/libpciaccess.so.0*
 /usr/%{_lib}/pkgconfig/*.pc
 /usr/share/aclocal/*.m4
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
-%files -n libpixman-1-0
-%defattr(-,root,root)
-/usr/%{_lib}/libpixman-1.so.0*
-
-%files -n libpixman-1-0-devel
-%defattr(-,root,root)
-%dir /usr/include/pixman-1
-/usr/include/pixman-1/pixman.h
-/usr/include/pixman-1/pixman-version.h
-/usr/%{_lib}/libpixman-1.*a
-/usr/%{_lib}/libpixman-1.so
-
 %files -n libpciaccess0
 %defattr(-,root,root)
 /usr/%{_lib}/libpciaccess.so.0*
@@ -417,6 +324,8 @@ exit 0
 /usr/%{_lib}/libpciaccess.so
 
 %changelog
+* Fri Feb 13 2009 sndirsch@suse.de
+- libpixman now in seperate source package (bnc #439019)
 * Wed Feb 11 2009 coolo@suse.de
 - fix baselibs.conf for the split out libs
 * Sun Feb 08 2009 sndirsch@suse.de