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

2008-03-07 22:40:04 +00:00 · 2008-03-07 22:40:04 +00:00 · fb3bf4e78b
commit fb3bf4e78b
parent 6350bfc316
9 changed files with 31 additions and 40 deletions
--- a/bug348296-pcf_font_parser-libXfont.diff
+++ b/bug348296-pcf_font_parser-libXfont.diff
@ -1,25 +0,0 @@
--- src/bitmap/pcfread.c.orig   Tue Aug 29 19:15:50 2006
-+++ src/bitmap/pcfread.c        Tue Dec 18 17:22:26 2007
-@@ -588,7 +588,10 @@
-     pFont->info.lastRow = pcfGetINT16(file, format);
-     pFont->info.defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-
-+    if (pFont->info.firstCol > pFont->info.lastCol ||
-+       pFont->info.firstRow > pFont->info.lastRow ||
-+       pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
-+
-     nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
-        (pFont->info.lastRow - pFont->info.firstRow + 1);
-
-@@ -726,7 +729,10 @@
-     pFontInfo->lastRow = pcfGetINT16(file, format);
-     pFontInfo->defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-
-+    if (pFontInfo->firstCol > pFontInfo->lastCol ||
-+       pFontInfo->firstRow > pFontInfo->lastRow ||
-+       pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
-+
-     nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
-        (pFontInfo->lastRow - pFontInfo->firstRow + 1);
--- a/libXfont-1.3.1.tar.bz2
+++ b/libXfont-1.3.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1
-size 564235
--- a/libXfont-1.3.2.tar.bz2
+++ b/libXfont-1.3.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2
+size 584023
--- a/libXinerama-1.0.2.tar.bz2
+++ b/libXinerama-1.0.2.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
-size 214046
--- a/libXinerama-1.0.3.tar.bz2
+++ b/libXinerama-1.0.3.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
+size 236386
--- a/libpciaccess-0.10.tar.bz2
+++ b/libpciaccess-0.10.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2cd1c725aa2ad2e85ca25bb174ebc6afcde3f0b3d461c1330069fc63ccbe45f
+size 253596
--- a/libpciaccess-0.9.1.tar.bz2
+++ b/libpciaccess-0.9.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0204b93046fd9c2acc75d0d42a57b753747910810632442884d840c4f041e9ac
-size 238005
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Mar  6 22:14:04 CET 2008 - sndirsch@suse.de
+
+- libpciaccess 0.10
+- libXinerama 1.0.3 
+
+-------------------------------------------------------------------
+Thu Mar  6 08:07:27 CET 2008 - sndirsch@suse.de
+
+- libXfont 1.3.2 
+  * obsoletes bug348296-pcf_font_parser-libXfont.diff
+
 -------------------------------------------------------------------
 Fri Feb 29 16:26:45 CET 2008 - dmueller@suse.de

--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@ -20,7 +20,7 @@ Provides:       libXaw.so.8 libXaw.so.7 libXaw.so.6
 %endif
 Url:            http://xorg.freedesktop.org/
 Version:        7.3
-Release:        38
+Release:        40
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@ -35,11 +35,11 @@ Source6:        libXcomposite-0.4.0.tar.bz2
 Source7:        libXcursor-1.1.9.tar.bz2
 Source8:        libXdamage-1.1.1.tar.bz2
 Source9:        libXevie-1.0.2.tar.bz2
-Source10:       libXfont-1.3.1.tar.bz2
+Source10:       libXfont-1.3.2.tar.bz2
 Source11:       libXfontcache-1.0.4.tar.bz2
 Source12:       libXft-2.1.12.tar.bz2
 Source13:       libXi-1.1.3.tar.bz2
-Source14:       libXinerama-1.0.2.tar.bz2
+Source14:       libXinerama-1.0.3.tar.bz2
 Source15:       libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
 Source16:       libXrandr-1.2.2.tar.bz2
 Source17:       libXtst-1.0.3.tar.bz2
@ -58,14 +58,13 @@ Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.2.tar.bz2
 Source32:       pixman-0.9.6.tar.bz2
-Source33:       libpciaccess-0.9.1.tar.bz2
+Source33:       libpciaccess-0.10.tar.bz2
 Patch:          libXrandr.diff
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch3:         p_xft_cjk.diff
 Patch4:         p_xft_register.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
-Patch348296:    bug348296-pcf_font_parser-libXfont.diff

 %description
 This package contains the remaining X.Org libraries.
@ -150,7 +149,6 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
-patch -d libXfont-* -p0 -s -i %PATCH348296

 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@ -222,6 +220,12 @@ exit 0
 %{_mandir}/man3/*

 %changelog
+* Thu Mar 06 2008 sndirsch@suse.de
+- libpciaccess 0.10
+- libXinerama 1.0.3
+* Thu Mar 06 2008 sndirsch@suse.de
+- libXfont 1.3.2
+  * obsoletes bug348296-pcf_font_parser-libXfont.diff
 * Fri Feb 29 2008 dmueller@suse.de
 - add missing %%postun call to ldconfig
 * Fri Jan 18 2008 sndirsch@suse.de