fix thinko

This commit is contained in:
Adam Jackson 2010-10-05 13:31:58 -04:00
parent 755a6a3fed
commit a63afa418e
2 changed files with 6 additions and 3 deletions

View File

@ -30,7 +30,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.9.0 Version: 1.9.0
Release: 12%{?gitdate:.%{gitdate}}%{dist} Release: 13%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -354,7 +354,7 @@ test `getminor extension` == %{extension_minor}
# --with-pie ? # --with-pie ?
autoreconf -v --install || exit 1 autoreconf -v --install || exit 1
export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS" export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS -Os"
%configure --enable-maintainer-mode %{xservers} \ %configure --enable-maintainer-mode %{xservers} \
--disable-static \ --disable-static \
--with-pic \ --with-pic \
@ -560,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Tue Oct 05 2010 Adam Jackson <ajax@redhat.com> 1.9.0-13
- xserver-1.9.0-vbe-insanity.patch: Fix thinko.
* Mon Oct 04 2010 Adam Jackson <ajax@redhat.com> 1.9.0-12 * Mon Oct 04 2010 Adam Jackson <ajax@redhat.com> 1.9.0-12
- xserver-1.9.0-vbe-insanity.patch: Fix VBE < 3.0 support. - xserver-1.9.0-vbe-insanity.patch: Fix VBE < 3.0 support.

View File

@ -77,7 +77,7 @@ index 1defd9a..8c738e7 100644
- } - }
- else - else
- memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216); - memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
+ memcpy(block, pVbe->memory, 256); + memcpy(block, pVbe->memory, sizeof(*block));
return block; return block;
} }