- still we need a LD_PRELOAD for the freshly introduced libxcb-util;
added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to help on openSUSE 12.1, but apparently not on openSUSE 11.4 (bnc #742297) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=184
This commit is contained in:
parent
2e5c29cb15
commit
9d868c402d
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 3 10:14:23 UTC 2012 - sndirsch@suse.com
|
||||||
|
|
||||||
|
- still we need a LD_PRELOAD for the freshly introduced libxcb-util;
|
||||||
|
added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to
|
||||||
|
help on openSUSE 12.1, but apparently not on openSUSE 11.4
|
||||||
|
(bnc #742297)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 23 10:59:06 UTC 2012 - sndirsch@suse.com
|
Mon Jan 23 10:59:06 UTC 2012 - sndirsch@suse.com
|
||||||
|
|
||||||
|
7
xorg-x11-libs.csh
Normal file
7
xorg-x11-libs.csh
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
|
||||||
|
if ( ${?LD_PRELOAD} ) then
|
||||||
|
setenv LD_PRELOAD "${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
|
||||||
|
else
|
||||||
|
setenv LD_PRELOAD /usr/lib64/libxcb-util.so.0
|
||||||
|
endif
|
||||||
|
|
6
xorg-x11-libs.sh
Normal file
6
xorg-x11-libs.sh
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
|
||||||
|
if [ -z "$LD_PRELOAD" ]; then
|
||||||
|
export LD_PRELOAD=/usr/lib64/libxcb-util.so.0
|
||||||
|
else
|
||||||
|
export LD_PRELOAD="${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
|
||||||
|
fi
|
@ -69,6 +69,8 @@ Source29: libvnc-20070501.tar.bz2
|
|||||||
Source30: libXcliplist-20070501.tar.bz2
|
Source30: libXcliplist-20070501.tar.bz2
|
||||||
Source31: xcb-util-0.3.8.tar.bz2
|
Source31: xcb-util-0.3.8.tar.bz2
|
||||||
Source90: baselibs.conf
|
Source90: baselibs.conf
|
||||||
|
Source91: xorg-x11-libs.sh
|
||||||
|
Source92: xorg-x11-libs.csh
|
||||||
Patch2: libXft-2.1.7-lcd-filter-2.patch
|
Patch2: libXft-2.1.7-lcd-filter-2.patch
|
||||||
Patch5: libxkbui.diff
|
Patch5: libxkbui.diff
|
||||||
Patch10: libXxf86misc-xcb.diff
|
Patch10: libXxf86misc-xcb.diff
|
||||||
@ -154,6 +156,12 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
|
|||||||
gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
|
gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
|
||||||
-o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
|
-o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
|
||||||
done
|
done
|
||||||
|
%if %suse_version < 1220
|
||||||
|
# still we need a LD_PRELOAD for the freshly introduced libxcb-util
|
||||||
|
# (bnc #742297)
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
|
||||||
|
install -m 644 %{SOURCE91} %{SOURCE92} $RPM_BUILD_ROOT/etc/profile.d/
|
||||||
|
%endif
|
||||||
%if %suse_version > 1110
|
%if %suse_version > 1110
|
||||||
%{__rm} -f %{buildroot}%{_libdir}/*.la
|
%{__rm} -f %{buildroot}%{_libdir}/*.la
|
||||||
%endif
|
%endif
|
||||||
@ -168,6 +176,11 @@ rm -rf "$RPM_BUILD_ROOT"
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%if %suse_version < 1220
|
||||||
|
%dir /etc/profile.d
|
||||||
|
/etc/profile.d/xorg-x11-libs.csh
|
||||||
|
/etc/profile.d/xorg-x11-libs.sh
|
||||||
|
%endif
|
||||||
/usr/include/X11/bitmaps/
|
/usr/include/X11/bitmaps/
|
||||||
/usr/include/X11/pixmaps/
|
/usr/include/X11/pixmaps/
|
||||||
/usr/%{_lib}/*.so.*
|
/usr/%{_lib}/*.so.*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user