diff --git a/Header-cleanup-bug-4703.patch b/Header-cleanup-bug-4703.patch deleted file mode 100644 index d5eb08f..0000000 --- a/Header-cleanup-bug-4703.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 60bb5229f0fb16cee27077552fbc35d53c94f031 Mon Sep 17 00:00:00 2001 -From: Erik Andren -Date: Sat, 25 Oct 2008 20:34:27 +0200 -Subject: Header cleanup (bug#4703) - -Remove prototypes for nonexistent functions from Xft.h, and add missing -include in xftglyphs.c - -Signed-off-by: Julien Cristau ---- - include/X11/Xft/Xft.h | 12 ------------ - src/xftglyphs.c | 4 ++++ - 2 files changed, 4 insertions(+), 12 deletions(-) - -Index: libXft-2.1.13/include/X11/Xft/Xft.h -=================================================================== ---- libXft-2.1.13.orig/include/X11/Xft/Xft.h -+++ libXft-2.1.13/include/X11/Xft/Xft.h -@@ -127,16 +127,6 @@ XftColorFree (Display *dpy, - Colormap cmap, - XftColor *color); - -- --/* xftcore.c */ -- --/* xftdir.c */ --FcBool --XftDirScan (FcFontSet *set, _Xconst char *dir, FcBool force); -- --FcBool --XftDirSave (FcFontSet *set, _Xconst char *dir); -- - /* xftdpy.c */ - Bool - XftDefaultHasRender (Display *dpy); -@@ -619,8 +609,6 @@ XftTextRenderUtf16 (Display *dpy, - FcEndian endian, - int len); - --/* xftstr.c */ -- - /* xftxlfd.c */ - FcPattern * - XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete); diff --git a/baselibs.conf b/baselibs.conf index 6c692bf..a92e11b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,8 +2,8 @@ xorg-x11-libs obsoletes "XFree86-compat-libs- XFree86-libs-" provides "XFree86-compat-libs- XFree86-libs-" targettype x86 provides "baselibs-x86:/usr/X11R6/lib/libX11.so.6" - targettype 32bit provides "libXaw.so.8 libXaw.so.7 libXaw.so.6" - targettype 64bit provides "libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit)" + targettype 32bit provides "libXaw.so.8 libXaw.so.7 libXaw.so.6 libXaw8.so.8 libXaw7.so.7 libXaw6.so.6" + targettype 64bit provides "libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit)" xorg-x11-devel obsoletes "XFree86-devel-" provides "XFree86-devel-" diff --git a/libWindowsWM-1.0.1.tar.bz2 b/libWindowsWM-1.0.1.tar.bz2 new file mode 100644 index 0000000..79930b1 --- /dev/null +++ b/libWindowsWM-1.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25f07cf847cbe91d36c20f348b4b9494c4504fe02966e8cdf65cf56316a70edc +size 246815 diff --git a/libWindowsWM-X11R7.0-1.0.0.tar.bz2 b/libWindowsWM-X11R7.0-1.0.0.tar.bz2 deleted file mode 100644 index fb1889e..0000000 --- a/libWindowsWM-X11R7.0-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ccdb6adfc51a4c40e90fe66f599ee4de4787fca44860b851dd4bbf97f7889d -size 211133 diff --git a/libXScrnSaver-1.1.3.tar.bz2 b/libXScrnSaver-1.1.3.tar.bz2 deleted file mode 100644 index 4e9fa30..0000000 --- a/libXScrnSaver-1.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988 -size 219568 diff --git a/libXScrnSaver-1.2.0.tar.bz2 b/libXScrnSaver-1.2.0.tar.bz2 new file mode 100644 index 0000000..96d2769 --- /dev/null +++ b/libXScrnSaver-1.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85 +size 248744 diff --git a/libXaw-1.0.4.tar.bz2 b/libXaw-1.0.4.tar.bz2 deleted file mode 100644 index affee45..0000000 --- a/libXaw-1.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9 -size 517275 diff --git a/libXaw-1.0.7.tar.bz2 b/libXaw-1.0.7.tar.bz2 new file mode 100644 index 0000000..170d7cf --- /dev/null +++ b/libXaw-1.0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:740aaee9b09586b1c80f80890381c5ee70ea11efa4b6159f707c0f3684c6f328 +size 598661 diff --git a/libXcomposite-0.4.0.tar.bz2 b/libXcomposite-0.4.0.tar.bz2 deleted file mode 100644 index 5f65712..0000000 --- a/libXcomposite-0.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510 -size 217145 diff --git a/libXcomposite-0.4.1.tar.bz2 b/libXcomposite-0.4.1.tar.bz2 new file mode 100644 index 0000000..cf95de3 --- /dev/null +++ b/libXcomposite-0.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13 +size 249284 diff --git a/libXcursor-1.1.10.tar.bz2 b/libXcursor-1.1.10.tar.bz2 new file mode 100644 index 0000000..bfa0e79 --- /dev/null +++ b/libXcursor-1.1.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd +size 264543 diff --git a/libXcursor-1.1.9.tar.bz2 b/libXcursor-1.1.9.tar.bz2 deleted file mode 100644 index a39b32e..0000000 --- a/libXcursor-1.1.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4 -size 234749 diff --git a/libXdamage-1.1.1.tar.bz2 b/libXdamage-1.1.1.tar.bz2 deleted file mode 100644 index 63b7ec5..0000000 --- a/libXdamage-1.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e -size 201096 diff --git a/libXdamage-1.1.2.tar.bz2 b/libXdamage-1.1.2.tar.bz2 new file mode 100644 index 0000000..8bf8355 --- /dev/null +++ b/libXdamage-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a +size 238443 diff --git a/libXfont-1.4.0.tar.bz2 b/libXfont-1.4.0.tar.bz2 deleted file mode 100644 index f71d353..0000000 --- a/libXfont-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75 -size 410560 diff --git a/libXfont-1.4.1.tar.bz2 b/libXfont-1.4.1.tar.bz2 new file mode 100644 index 0000000..cad8a5d --- /dev/null +++ b/libXfont-1.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:112bfc30820b98deec4c9914536c5aa2f8b5162bd2b0bdb342343168e06f7679 +size 428802 diff --git a/libXft-2.1.13.tar.bz2 b/libXft-2.1.13.tar.bz2 deleted file mode 100644 index cfa578b..0000000 --- a/libXft-2.1.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c -size 268153 diff --git a/libXft-2.1.14.tar.bz2 b/libXft-2.1.14.tar.bz2 new file mode 100644 index 0000000..1a28c79 --- /dev/null +++ b/libXft-2.1.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:700e9d594b81cad3dfd5fac4a5cfd0c4cf7780c812507ef04eb40139ebf5175e +size 289068 diff --git a/libXft-2.1.7-lcd-filter-2.patch b/libXft-2.1.7-lcd-filter-2.patch index a14d0ff..5a3d2f0 100644 --- a/libXft-2.1.7-lcd-filter-2.patch +++ b/libXft-2.1.7-lcd-filter-2.patch @@ -1,13 +1,15 @@ -Index: src/xftglyphs.c -=================================================================== ---- src.orig/xftglyphs.c -+++ src/xftglyphs.c -@@ -21,23 +21,14 @@ +--- src/xftglyphs.c.orig 2009-01-30 00:19:09.000000000 +0100 ++++ src/xftglyphs.c 2010-04-05 00:23:18.000000000 +0200 +@@ -21,27 +21,18 @@ */ #include "xftint.h" -#include + #if HAVE_FT_GLYPHSLOT_EMBOLDEN + #include + #endif + -static const int filters[3][3] = { - /* red */ -#if 0 @@ -32,7 +34,7 @@ Index: src/xftglyphs.c /* * Validate the memory info for a font -@@ -65,6 +56,295 @@ _XftFontValidateMemory (Display *dpy, Xf +@@ -69,6 +60,295 @@ _XftFontValidateMemory (Display *dpy, Xf font->glyph_memory, glyph_memory); } @@ -328,7 +330,7 @@ Index: src/xftglyphs.c _X_EXPORT void XftFontLoadGlyphs (Display *dpy, XftFont *pub, -@@ -83,20 +363,14 @@ XftFontLoadGlyphs (Display *dpy, +@@ -87,20 +367,14 @@ XftFontLoadGlyphs (Display *dpy, unsigned char *bufBitmap = bufLocal; int bufSize = sizeof (bufLocal); int size, pitch; @@ -352,7 +354,7 @@ Index: src/xftglyphs.c if (!info) return; -@@ -106,24 +380,19 @@ XftFontLoadGlyphs (Display *dpy, +@@ -110,24 +384,19 @@ XftFontLoadGlyphs (Display *dpy, if (!face) return; @@ -381,7 +383,7 @@ Index: src/xftglyphs.c } } -@@ -144,7 +413,10 @@ XftFontLoadGlyphs (Display *dpy, +@@ -148,7 +417,10 @@ XftFontLoadGlyphs (Display *dpy, if (xftg->glyph_memory) continue; @@ -392,7 +394,7 @@ Index: src/xftglyphs.c if (error) { /* -@@ -177,7 +449,7 @@ XftFontLoadGlyphs (Display *dpy, +@@ -181,7 +453,7 @@ XftFontLoadGlyphs (Display *dpy, /* * Compute glyph metrics from FreeType information */ @@ -401,7 +403,7 @@ Index: src/xftglyphs.c { /* * calculate the true width by transforming all four corners. -@@ -256,17 +528,14 @@ XftFontLoadGlyphs (Display *dpy, +@@ -260,17 +532,14 @@ XftFontLoadGlyphs (Display *dpy, } } @@ -426,7 +428,7 @@ Index: src/xftglyphs.c if (font->info.spacing >= FC_MONO) { -@@ -306,103 +575,13 @@ XftFontLoadGlyphs (Display *dpy, +@@ -310,103 +579,13 @@ XftFontLoadGlyphs (Display *dpy, xftg->metrics.yOff = -TRUNC(ROUND(glyphslot->advance.y)); } @@ -450,9 +452,7 @@ Index: src/xftglyphs.c - bufSize = size; - } - memset (bufBitmap, 0, size); -+ // compute the size of the final bitmap -+ ftbit = &glyphslot->bitmap; - +- - /* - * Rasterize into the local buffer - */ @@ -472,7 +472,9 @@ Index: src/xftglyphs.c - FT_Outline_Transform (&glyphslot->outline, &matrix); - - FT_Outline_Translate ( &glyphslot->outline, -left*hmul, -bottom*vmul ); -- ++ // compute the size of the final bitmap ++ ftbit = &glyphslot->bitmap; + - FT_Outline_Get_Bitmap( _XftFTlibrary, &glyphslot->outline, &ftbit ); - break; - case ft_glyph_format_bitmap: @@ -535,7 +537,7 @@ Index: src/xftglyphs.c if (XftDebug() & XFT_DBG_GLYPH) { -@@ -419,29 +598,72 @@ XftFontLoadGlyphs (Display *dpy, +@@ -423,29 +602,72 @@ XftFontLoadGlyphs (Display *dpy, int x, y; unsigned char *line; @@ -614,7 +616,7 @@ Index: src/xftglyphs.c /* * Use the glyph index as the wire encoding; it * might be more efficient for some locales to map -@@ -451,121 +673,24 @@ XftFontLoadGlyphs (Display *dpy, +@@ -455,130 +677,33 @@ XftFontLoadGlyphs (Display *dpy, */ glyph = (Glyph) glyphindex; @@ -681,7 +683,25 @@ Index: src/xftglyphs.c - green += filters[gf][s]*in[x+o]; - blue += filters[bf][s]*in[x+o]; - o += os; -- } ++ xftg->glyph_memory = size + sizeof (XftGlyph); ++ ++ if (font->format) { ++ if (!font->glyphset) ++ font->glyphset = XRenderCreateGlyphSet (dpy, font->format); ++ ++ if ( mode == FT_RENDER_MODE_MONO ) { ++ /* swap bits in each byte */ ++ if (BitmapBitOrder (dpy) != MSBFirst) { ++ unsigned char *line = (unsigned char*)bufBitmap; ++ int i = size; ++ ++ while (i--) { ++ int c = *line; ++ c = ((c << 1) & 0xaa) | ((c >> 1) & 0x55); ++ c = ((c << 2) & 0xcc) | ((c >> 2) & 0x33); ++ c = ((c << 4) & 0xf0) | ((c >> 4) & 0x0f); ++ *line++ = c; + } - red = red / 65536; - green = green / 65536; - blue = blue / 65536; @@ -690,11 +710,10 @@ Index: src/xftglyphs.c - } - - xftg->glyph_memory = sizergba + sizeof (XftGlyph); -+ xftg->glyph_memory = size + sizeof (XftGlyph); - if (font->format) - { - if (!font->glyphset) - font->glyphset = XRenderCreateGlyphSet (dpy, font->format); +- if (font->format) +- { +- if (!font->glyphset) +- font->glyphset = XRenderCreateGlyphSet (dpy, font->format); - if (ImageByteOrder (dpy) != XftNativeByteOrder ()) - XftSwapCARD32 ((CARD32 *) bufBitmapRgba, sizergba >> 2); - XRenderAddGlyphs (dpy, font->glyphset, &glyph, @@ -708,10 +727,10 @@ Index: src/xftglyphs.c - xftg->bitmap = malloc (sizergba); - if (xftg->bitmap) - memcpy (xftg->bitmap, bufBitmapRgba, sizergba); -- } + } - else -- xftg->bitmap = 0; -- } +- xftg->bitmap = NULL; + } - } - else - { @@ -722,32 +741,25 @@ Index: src/xftglyphs.c - * swap bit order around; FreeType is always MSBFirst - */ - if (!font->info.antialias) -+ -+ if ( mode == FT_RENDER_MODE_MONO ) - { -+ /* swap bits in each byte */ - if (BitmapBitOrder (dpy) != MSBFirst) - { +- { +- if (BitmapBitOrder (dpy) != MSBFirst) +- { - unsigned char *line; - unsigned char c; - int i; -+ unsigned char *line = (unsigned char*)bufBitmap; -+ int i = size; - +- - line = (unsigned char *) bufBitmap; - i = size; - while (i--) - { +- while (i--) +- { - c = *line; -+ int c = *line; -+ - c = ((c << 1) & 0xaa) | ((c >> 1) & 0x55); - c = ((c << 2) & 0xcc) | ((c >> 2) & 0x33); - c = ((c << 4) & 0xf0) | ((c >> 4) & 0x0f); -@@ -573,8 +698,12 @@ XftFontLoadGlyphs (Display *dpy, - } - } - } +- c = ((c << 1) & 0xaa) | ((c >> 1) & 0x55); +- c = ((c << 2) & 0xcc) | ((c >> 2) & 0x33); +- c = ((c << 4) & 0xf0) | ((c >> 4) & 0x0f); +- *line++ = c; +- } +- } +- } - if (!font->glyphset) - font->glyphset = XRenderCreateGlyphSet (dpy, font->format); + else if ( mode != FT_RENDER_MODE_NORMAL ) @@ -759,16 +771,16 @@ Index: src/xftglyphs.c XRenderAddGlyphs (dpy, font->glyphset, &glyph, &xftg->metrics, 1, (char *) bufBitmap, size); -@@ -590,7 +719,7 @@ XftFontLoadGlyphs (Display *dpy, +@@ -594,7 +719,7 @@ XftFontLoadGlyphs (Display *dpy, else - xftg->bitmap = 0; + xftg->bitmap = NULL; } - } + font->glyph_memory += xftg->glyph_memory; info->glyph_memory += xftg->glyph_memory; if (XftDebug() & XFT_DBG_CACHE) -@@ -601,8 +730,6 @@ XftFontLoadGlyphs (Display *dpy, +@@ -605,8 +730,6 @@ XftFontLoadGlyphs (Display *dpy, } if (bufBitmap != bufLocal) free (bufBitmap); diff --git a/libXinerama-1.0.3.tar.bz2 b/libXinerama-1.0.3.tar.bz2 deleted file mode 100644 index cb44582..0000000 --- a/libXinerama-1.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219 -size 236386 diff --git a/libXinerama-1.1.tar.bz2 b/libXinerama-1.1.tar.bz2 new file mode 100644 index 0000000..47ff62d --- /dev/null +++ b/libXinerama-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34 +size 245133 diff --git a/libXres-1.0.3.tar.bz2 b/libXres-1.0.3.tar.bz2 deleted file mode 100644 index 240a5b3..0000000 --- a/libXres-1.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230 -size 218203 diff --git a/libXres-1.0.4.tar.bz2 b/libXres-1.0.4.tar.bz2 new file mode 100644 index 0000000..d03d3d2 --- /dev/null +++ b/libXres-1.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df +size 249779 diff --git a/libXvMC-1.0.4.tar.bz2 b/libXvMC-1.0.4.tar.bz2 deleted file mode 100644 index 0a59c96..0000000 --- a/libXvMC-1.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb -size 225137 diff --git a/libXvMC-1.0.5.tar.bz2 b/libXvMC-1.0.5.tar.bz2 new file mode 100644 index 0000000..c5e40af --- /dev/null +++ b/libXvMC-1.0.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f +size 256570 diff --git a/libpciaccess-0.10.6.tar.bz2 b/libpciaccess-0.10.6.tar.bz2 deleted file mode 100644 index 63064b4..0000000 --- a/libpciaccess-0.10.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce -size 267671 diff --git a/libpciaccess-0.10.9.tar.bz2 b/libpciaccess-0.10.9.tar.bz2 new file mode 100644 index 0000000..cce81a3 --- /dev/null +++ b/libpciaccess-0.10.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead +size 282316 diff --git a/p_xft_cjk.diff b/p_xft_cjk.diff deleted file mode 100644 index 2715a27..0000000 --- a/p_xft_cjk.diff +++ /dev/null @@ -1,36 +0,0 @@ -Index: src/xftfreetype.c -=================================================================== ---- src.orig/xftfreetype.c -+++ src/xftfreetype.c -@@ -385,6 +385,7 @@ XftFontInfoFill (Display *dpy, _Xconst F - FcChar32 hash, *hashp; - FT_Face face; - int nhash; -+ FcBool bitmap; - - if (!info) - return FcFalse; -@@ -512,8 +513,22 @@ XftFontInfoFill (Display *dpy, _Xconst F - */ - fi->load_flags = FT_LOAD_DEFAULT; - -+#ifndef XFT_EMBEDDED_BITMAP -+#define XFT_EMBEDDED_BITMAP "embeddedbitmap" -+#endif -+ -+ switch (FcPatternGetBool (pattern, XFT_EMBEDDED_BITMAP, 0, &bitmap)) { -+ case FcResultNoMatch: -+ bitmap = FcFalse; -+ break; -+ case FcResultMatch: -+ break; -+ default: -+ goto bail1; -+ } -+ - /* disable bitmaps when anti-aliasing or transforming glyphs */ -- if (fi->antialias || fi->transform) -+ if ((!bitmap && fi->antialias) || fi->transform) - fi->load_flags |= FT_LOAD_NO_BITMAP; - - /* disable hinting if requested */ diff --git a/xbitmaps-1.1.0.tar.bz2 b/xbitmaps-1.1.0.tar.bz2 new file mode 100644 index 0000000..43aa1e3 --- /dev/null +++ b/xbitmaps-1.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9a2059c8b0636b7ee1169647bb22f6eb4a0589e36fdb98936002e2569ad8761 +size 101645 diff --git a/xbitmaps-X11R7.0-1.0.1.tar.bz2 b/xbitmaps-X11R7.0-1.0.1.tar.bz2 deleted file mode 100644 index a54a4b4..0000000 --- a/xbitmaps-X11R7.0-1.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d7b78cf588871caa00ef79f5f66657803cf9a07350ac5dcf56fbe5ca2a794a8 -size 55492 diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 4ceee05..c0711b3 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Apr 5 07:11:20 CEST 2010 - sndirsch@suse.de + +- libXaw 1.0.7 +- provide libXaw8.so.8, libXaw7.so.7, libXaw6.so.6 +- create compatibility symlinks libXaw8.so.8, libXaw.so.8 + +------------------------------------------------------------------- +Sun Apr 4 17:07:59 CEST 2010 - sndirsch@suse.de + +- libWindowsWM 1.0.1 +- libXScrnSaver 1.2.0 +- libXcomposite 0.4.1 +- libXcursor 1.1.10 +- libXdamage 1.1.2 +- libXfont 1.4.1 +- libXinerama 1.1 +- libXres 1.0.4 +- libXvMC 1.0.5 +- libpciaccess 0.10.9 +- xbitmaps 1.1.0 +- libXft 2.1.14 +- obsoletes p_xft_cjk.diff, Header-cleanup-bug-4703.patch +- adjusted libXft-2.1.7-lcd-filter-2.patch +- bumped version number to 7.5 + ------------------------------------------------------------------- Thu Feb 18 06:13:05 CET 2010 - sndirsch@suse.de diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 2ba3bcb..f1c670a 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-libs (Version 7.4) +# spec file for package xorg-x11-libs (Version 7.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,10 @@ Name: xorg-x11-libs BuildRequires: fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel %ifarch ppc64 s390x x86_64 Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) +Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit) %else Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 +Provides: libXaw8.so.8 libXaw7.so.7 libXaw6.so.6 %endif # bug437293 %ifarch ppc64 @@ -31,29 +33,29 @@ Obsoletes: xorg-x11-libs-64bit %endif # Url: http://xorg.freedesktop.org/ -Version: 7.4 -Release: 28 +Version: 7.5 +Release: 1 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries Summary: Remaining X.Org libraries Source1: libFS-1.0.2.tar.bz2 -Source2: libWindowsWM-X11R7.0-1.0.0.tar.bz2 -Source3: libXScrnSaver-1.1.3.tar.bz2 +Source2: libWindowsWM-1.0.1.tar.bz2 +Source3: libXScrnSaver-1.2.0.tar.bz2 Source4: libXTrap-X11R7.0-1.0.0.tar.bz2 -Source5: libXaw-1.0.4.tar.bz2 -Source6: libXcomposite-0.4.0.tar.bz2 -Source7: libXcursor-1.1.9.tar.bz2 -Source8: libXdamage-1.1.1.tar.bz2 +Source5: libXaw-1.0.7.tar.bz2 +Source6: libXcomposite-0.4.1.tar.bz2 +Source7: libXcursor-1.1.10.tar.bz2 +Source8: libXdamage-1.1.2.tar.bz2 Source9: libXevie-1.0.2.tar.bz2 -Source10: libXfont-1.4.0.tar.bz2 +Source10: libXfont-1.4.1.tar.bz2 Source11: libXfontcache-1.0.4.tar.bz2 -Source12: libXft-2.1.13.tar.bz2 -Source14: libXinerama-1.0.3.tar.bz2 +Source12: libXft-2.1.14.tar.bz2 +Source14: libXinerama-1.1.tar.bz2 Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2 Source16: libXrandr-1.3.0.tar.bz2 Source17: libXtst-1.1.0.tar.bz2 -Source18: libXvMC-1.0.4.tar.bz2 +Source18: libXvMC-1.0.5.tar.bz2 Source19: libXxf86dga-1.1.1.tar.bz2 Source20: libXxf86misc-X11R7.1-1.0.1.tar.bz2 Source21: libXxf86vm-1.1.0.tar.bz2 @@ -61,18 +63,16 @@ Source22: libdmx-1.1.0.tar.bz2 Source23: liblbxutil-1.1.0.tar.bz2 Source24: liboldX-X11R7.0-1.0.1.tar.bz2 Source25: libxkbui-X11R7.1-1.0.2.tar.bz2 -Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2 -Source27: libXres-1.0.3.tar.bz2 +Source26: xbitmaps-1.1.0.tar.bz2 +Source27: libXres-1.0.4.tar.bz2 Source29: libvnc-20070501.tar.bz2 Source30: libXcliplist-20070501.tar.bz2 Source31: xcb-util-0.3.6.tar.bz2 -Source33: libpciaccess-0.10.6.tar.bz2 +Source33: libpciaccess-0.10.9.tar.bz2 Source90: baselibs.conf Patch2: libXft-2.1.7-lcd-filter-2.patch -Patch3: p_xft_cjk.diff Patch5: libxkbui.diff Patch10: libXxf86misc-xcb.diff -Patch20: Header-cleanup-bug-4703.patch Patch21: libxtrap-pcfix.patch %description @@ -222,7 +222,6 @@ pushd libXft-*/src %if %suse_version > 1010 %patch2 -p1 %endif -%patch3 -p1 popd pushd libxkbui-* %patch5 @@ -230,9 +229,6 @@ popd pushd libXxf86misc-* %patch10 -p0 popd -pushd libXft-* -%patch20 -p1 -popd pushd libXTrap-* %patch21 -p1 popd @@ -270,6 +266,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la # already in libXext now (same version) rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbuf.h rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbufstr.h +# for compatibility reasons +ln -s libXaw7.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw8.so.8 +ln -s libXaw.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw.so.8 %clean rm -rf "$RPM_BUILD_ROOT" @@ -315,9 +314,16 @@ exit 0 %endif /usr/%{_lib}/pkgconfig/*.pc %exclude /usr/%{_lib}/pkgconfig/pciaccess.pc -/usr/share/aclocal/*.m4 +#/usr/share/aclocal/*.m4 %{_mandir}/man1/* %{_mandir}/man3/* +%dir %{_datadir}/doc/libXvMC +%{_datadir}/doc/libXvMC/XvMC_API.txt +%dir %{_datadir}/doc/libXaw +%{_datadir}/doc/libXaw/widgets.html +%{_datadir}/doc/libXaw/widgets.index.ps +%{_datadir}/doc/libXaw/widgets.ps +%{_datadir}/doc/libXaw/widgets.txt %files -n libpciaccess0 %defattr(-,root,root)