rpms/xscreensaver/F-8 xscreensaver-5.03-screen-depth.patch, NONE, 1.1 xscreensaver.spec, 1.57, 1.58
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Thu Nov 1 13:50:59 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26937/F-8
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.03-screen-depth.patch
Log Message:
* Thu Nov 1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-13
- Patch from upstream to fix screen depth problem (also "really"
fix bug 336331).
xscreensaver-5.03-screen-depth.patch:
--- NEW FILE xscreensaver-5.03-screen-depth.patch ---
diff -u -r1.85 lock.c
--- lock.c 10 Jul 2007 20:27:24 -0000 1.85
+++ lock.c 1 Nov 2007 09:34:59 -0000
@@ -1076,9 +1076,10 @@
pw->user_entry_pixmap = 0;
}
- pw->user_entry_pixmap = XCreatePixmap(si->dpy, si->passwd_dialog,
- rects[0].width, rects[0].height, pw->prompt_screen->current_depth);
-
+ pw->user_entry_pixmap =
+ XCreatePixmap (si->dpy, si->passwd_dialog,
+ rects[0].width, rects[0].height,
+ DefaultDepthOfScreen (pw->prompt_screen));
XFillRectangle (si->dpy, pw->user_entry_pixmap, gc2,
0, 0, rects[0].width, rects[0].height);
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xscreensaver.spec 19 Oct 2007 11:46:53 -0000 1.57
+++ xscreensaver.spec 1 Nov 2007 13:50:23 -0000 1.58
@@ -4,10 +4,10 @@
%define beta_ver %{nil}
%if 0%{?fedora} <= 6
%define modular_conf 0
-%define fedora_rel 1.1
+%define fedora_rel 1.12
%else
%define modular_conf 1
-%define fedora_rel 12
+%define fedora_rel 13
%endif
%define extrarel %{nil}
@@ -40,6 +40,7 @@
Patch40: xscreensaver-5.02-pidnumber-write_long.patch
Patch41: xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
Patch42: xscreensaver-5.03-compiler-warning.patch
+Patch43: xscreensaver-5.03-screen-depth.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -183,6 +184,7 @@
%patch40 -p1 -b .pidnum_debug
%patch41 -p1 -b .conf_max
%patch42 -p1 -b .warn
+%patch43 -p1 -b .screen_depth
change_option(){
set +x
@@ -386,6 +388,7 @@
# Move %%{_bindir}/xscreensaver-gl-helper to gl-base
# (bug 336331).
+%if %{modular_conf}
echo "%%defattr(-,root,root,-)" >> $dd/gl-base.files
sed -i -e '/xscreensaver-gl-helper/d' $dd/gl-extras.files
@@ -395,6 +398,7 @@
done
popd
sed -i -e 's|^\(%{_mandir}.*\)$|\1*|' $dd/gl-base.files
+%endif
%if %{modular_conf}
# install update script
@@ -543,8 +547,10 @@
%files -f extras.files extras
%defattr(-,root,root,-)
+%if %{modular_conf}
%files -f gl-base.files gl-base
%defattr(-,root,root,-)
+%endif
%files -f gl-extras.files gl-extras
%defattr(-,root,root,-)
@@ -556,6 +562,10 @@
%defattr(-,root,root,-)
%changelog
+* Thu Nov 1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-13
+- Patch from upstream to fix screen depth problem (also "really"
+ fix bug 336331).
+
* Thu Oct 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-12
- Create -gl-base subpackage and split xscreensaver-gl-helper
into -gl-base subpackage so that external GL screensavers can
More information about the fedora-extras-commits
mailing list