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=12

Browse Source
This commit is contained in:
OBS User unknown 2007-03-03 13:38:53 +00:00 committed by Git OBS Bridge
parent 8d032f622d
commit bac08adb36
4 changed files with 114 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libXxf86misc-xcb.diff Normal file
View File

@ -0,0 +1,48 @@
diff -p -u -r ../libXxf86misc-X11R7.1-1.0.1.orig/src/XF86Misc.c ./src/XF86Misc.c
--- ../libXxf86misc-X11R7.1-1.0.1.orig/src/XF86Misc.c 2007-03-01 21:31:06.431364114 +0100
+++ ./src/XF86Misc.c 2007-03-01 21:39:06.546988660 +0100
@@ -154,6 +154,8 @@ Bool XF86MiscGetMouseSettings(dpy, mouse
if (!(mouseinfo->device = Xcalloc(rep.devnamelen + 1, 1))) {
_XEatData(dpy, (rep.devnamelen+3) & ~3);
Xfree(mouseinfo->device);
+ UnlockDisplay(dpy);
+ SyncHandle();
return False;
}
_XReadPad(dpy, mouseinfo->device, rep.devnamelen);
@@ -308,6 +310,8 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
if (!(filpaths->configfile = Xcalloc(rep.configlen + 1, 1))) {
_XEatData(dpy, ((rep.configlen+3) & ~3) + ((rep.modulelen+3) & ~3)
+ ((rep.loglen+3) & ~3));
+ UnlockDisplay(dpy);
+ SyncHandle();
return False;
}
}
@@ -318,6 +322,8 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
+ ((rep.loglen+3) & ~3));
if (filpaths->configfile)
Xfree(filpaths->configfile);
+ UnlockDisplay(dpy);
+ SyncHandle();
return False;
}
}
@@ -330,6 +336,8 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
Xfree(filpaths->configfile);
if (filpaths->modulepath)
Xfree(filpaths->modulepath);
+ UnlockDisplay(dpy);
+ SyncHandle();
return False;
}
}
@@ -394,6 +402,8 @@ Status XF86MiscPassMessage(dpy, screen,
if (rep.mesglen) {
if (!(*retmsg = Xcalloc(rep.mesglen + 1, 1))) {
_XEatData(dpy, ((rep.mesglen+3) & ~3));
+ UnlockDisplay(dpy);
+ SyncHandle();
return BadAlloc;
}
_XReadPad(dpy, *retmsg, rep.mesglen);

3
xcb-util-0.2.tar.bz2 Normal file
View File

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

30
xorg-x11-libs.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Sat Mar 3 05:33:02 CET 2007 - sndirsch@suse.de
- added xcb-util 0.2:
The xcb-util module provides a number of libraries which sit on
top of libxcb, the core X protocol library, and some of the
extension libraries. These experimental libraries provide
convenience functions and interfaces which make the raw X
protocol more usable. Some of the libraries also provide
client-side code which is not strictly part of the X protocol but
which have traditionally been provided by Xlib. These libraries
are currently included, roughly ordered by maturity:
* render-util: Convenience functions for the Render extension.
* aux: Convenient access to connection setup and some core
requests.
* atom: Standard core X atom constants and atom caching.
* property: Callback X property-change handling.
* icccm: Both client and window-manager helpers for ICCCM.
* keysyms: Standard X key constants and conversion to/from
keycodes.
* event: Callback X event handling.
* image: Port of Xlib's XImage and XShmImage functions.
* wm: Framework for window manager implementation.
-------------------------------------------------------------------
Thu Mar 1 22:26:14 CET 2007 - sndirsch@suse.de
- libXxf86misc-xcb.diff:
* added missing UnlockDisplay() calls
-------------------------------------------------------------------
Fri Feb 23 14:46:06 CET 2007 - dmueller@suse.de

37
xorg-x11-libs.spec
View File

@ -11,7 +11,7 @@
# norootforbuild
Name: xorg-x11-libs
BuildRequires: fontconfig-devel freetype2-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
BuildRequires: fontconfig-devel freetype2-devel gperf 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)
%else
@ -19,7 +19,7 @@ Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
Release: 42
Release: 44
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@ -55,6 +55,7 @@ Source27: libXres-1.0.3.tar.bz2
Source28: libXft1-X11R6.9-1.2.tar.bz2
Source29: libvnc-20070111.tar.bz2
Source30: libXcliplist-20070111.tar.bz2
Source31: xcb-util-0.2.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
@ -64,6 +65,7 @@ Patch6: libXi-20061015090357.diff
Patch7: libXi-20061119100426.diff
Patch8: bug233919-libXaw.diff
Patch9: p_xrandr-headers.diff
Patch10: libXxf86misc-xcb.diff
%description
This package contains the remaining X.Org libraries.
@ -129,8 +131,7 @@ Authors:
Susan Angebrandt
%prep
%setup -n . -T -D
rm -rf $RPM_BUILD_DIR/*
%setup -T -c %{name}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
pushd libXrandr-*
%patch
@ -153,6 +154,9 @@ popd
pushd libXaw-*
%patch8 -p0
popd
pushd libXxf86misc-*
%patch10 -p0
popd
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@ -209,6 +213,7 @@ exit 0
/usr/include/X11/XprintAppUtil/
/usr/include/X11/extensions/*.h
/usr/include/X11/fonts/*.h
/usr/include/xcb/
/usr/%{_lib}/*.a
/usr/%{_lib}/*.la
/usr/%{_lib}/*.so
@ -218,6 +223,30 @@ exit 0
%{_mandir}/man3/*
%changelog
* Sat Mar 03 2007 - sndirsch@suse.de
- added xcb-util 0.2:
The xcb-util module provides a number of libraries which sit on
top of libxcb, the core X protocol library, and some of the
extension libraries. These experimental libraries provide
convenience functions and interfaces which make the raw X
protocol more usable. Some of the libraries also provide
client-side code which is not strictly part of the X protocol but
which have traditionally been provided by Xlib. These libraries
are currently included, roughly ordered by maturity:
* render-util: Convenience functions for the Render extension.
* aux: Convenient access to connection setup and some core
requests.
* atom: Standard core X atom constants and atom caching.
* property: Callback X property-change handling.
* icccm: Both client and window-manager helpers for ICCCM.
* keysyms: Standard X key constants and conversion to/from
keycodes.
* event: Callback X event handling.
* image: Port of Xlib's XImage and XShmImage functions.
* wm: Framework for window manager implementation.
* Thu Mar 01 2007 - sndirsch@suse.de
- libXxf86misc-xcb.diff:
* added missing UnlockDisplay() calls
* Fri Feb 23 2007 - dmueller@suse.de
- p_xrandr-headers.diff:
* delete is a keyword in non-C languages