rpms/xscreensaver/devel xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.67, 1.68

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18502

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.05-penetrate-font.patch 
Log Message:
* Sun Apr  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-3
- penetrate - fallback to smaller font


xscreensaver-5.05-penetrate-font.patch:

--- NEW FILE xscreensaver-5.05-penetrate-font.patch ---
--- xscreensaver-5.05/hacks/penetrate.c.font	2006-05-24 06:56:59.000000000 +0900
+++ xscreensaver-5.05/hacks/penetrate.c	2008-04-06 21:49:11.000000000 +0900
@@ -367,6 +367,7 @@
   int i;
   /*char *fontname =   "-*-new century schoolbook-*-r-*-*-*-380-*-*-*-*-*-*"; */
   char *fontname =   "-*-courier-*-r-*-*-*-380-*-*-*-*-*-*";
+  char *fontname2 = "*-courier-*-r-*-*-*-240-*-*-*-*-*-*";
   XGCValues gcv;
   XWindowAttributes xgwa;
 
@@ -391,7 +392,15 @@
     fprintf (stderr, "%s: no font specified.\n", progname);
   st->font = XLoadQueryFont(st->dpy, fontname);
   if (!st->font)
+  {
     fprintf (stderr, "%s: could not load font %s.\n", progname, fontname);
+    if ((st->font = XLoadQueryFont(st->dpy, fontname2)))
+      fprintf (stderr, "%s: selecting alternative font %s.\n", progname, fontname2);
+    else {
+      fprintf (stderr, "Exiting....\n");
+      exit (1);
+    }
+  }
 
   if (!(st->scoreFont = XLoadQueryFont(st->dpy, "-*-times-*-r-*-*-*-180-*-*-*-*-*-*")))
 	 fprintf(stderr, "%s: Can't load Times font.", progname);


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xscreensaver.spec	5 Mar 2008 05:50:27 -0000	1.67
+++ xscreensaver.spec	6 Apr 2008 13:05:04 -0000	1.68
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -33,6 +33,7 @@
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch3:          xscreensaver-5.05-addopts-jwz.patch
 Patch21:         xscreensaver-5.05-webcollage-default-nonet.patch
+Patch22:         xscreensaver-5.05-penetrate-font.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -175,6 +176,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch3 -p1 -b .opts
 %patch21 -p1 -b .nonet
+%patch22 -p1 -b .font
 
 change_option(){
    set +x
@@ -560,6 +562,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Apr  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-3
+- penetrate - fallback to smaller font
+
 * Wed Mar  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-2
 - Replace addopts.patch with the patch from jwz