rpms/xscreensaver/F-8 xscreensaver-5.05-addopts-jwz.patch, NONE, 1.1 xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.61, 1.62 xscreensaver-5.05-addopts.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sun Apr 6 13:07:50 UTC 2008
- Previous message (by thread): rpms/xscreensaver/devel xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.67, 1.68
- Next message (by thread): rpms/xscreensaver/F-7 xscreensaver-5.05-addopts-jwz.patch, NONE, 1.1 xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.50, 1.51 xscreensaver-5.05-addopts.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18627
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.05-addopts-jwz.patch
xscreensaver-5.05-penetrate-font.patch
Removed Files:
xscreensaver-5.05-addopts.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-addopts-jwz.patch:
--- NEW FILE xscreensaver-5.05-addopts-jwz.patch ---
--- xscreensaver-5.05/configure.in.opts 2008-03-02 07:14:30.000000000 +0900
+++ xscreensaver-5.05/configure.in 2008-03-05 14:45:12.000000000 +0900
@@ -389,6 +389,7 @@
ac_cv_gcc_accepts_[$1]=no
else
ac_cv_gcc_accepts_[$1]=yes
+ CC="$CC [$2]"
fi])
ac_gcc_accepts_[$1]="$ac_cv_gcc_accepts_[$1]"
fi
@@ -400,6 +401,11 @@
AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS,
[AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)])
+# Need to disable Objective C extensions in ANSI C on MacOS X to work
+# around an Apple-specific gcc bug.
+#
+AC_DEFUN(AC_NO_OBJECTIVE_C,
+ [AC_CHECK_GCC_ARG(no_cpp_precomp, -no-cpp-precomp)])
###############################################################################
#
@@ -447,7 +453,8 @@
# before they were in the ANSI C 99 spec... (gcc 2.96 permits //
# with -std=gnu89 but not with -std=c89.)
#
- CC="$CC -std=c89 -U__STRICT_ANSI__"
+ # $CC already contains "-std=c89" via AC_GCC_ACCEPTS_STD
+ CC="$CC -U__STRICT_ANSI__"
else
# The old way:
CC="$CC -Wp,-lang-c89"
@@ -458,27 +465,6 @@
###############################################################################
#
-# Function to figure out how to turn off Objective C on MacOS X.
-# (We have to do this to work around an Apple-specific gcc bug.)
-#
-###############################################################################
-
-AC_DEFUN(AC_GCC_ACCEPTS_NO_CPP_PRECOMP,
- [AC_CHECK_GCC_ARG(no_cpp_precomp, -no-cpp-precomp)])
-
-AC_DEFUN(AC_NO_OBJECTIVE_C,
- [if test -n "$GCC"; then
- AC_GCC_ACCEPTS_NO_CPP_PRECOMP
- if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then
- AC_MSG_RESULT(Disabling Objective C extensions in ANSI C code.)
- CC="$CC -no-cpp-precomp"
- fi
- fi
-])
-
-
-###############################################################################
-#
# Function to figure out how to create directory trees.
#
###############################################################################
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/F-8/xscreensaver.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xscreensaver.spec 2 Mar 2008 14:16:50 -0000 1.61
+++ xscreensaver.spec 6 Apr 2008 13:07:08 -0000 1.62
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 1
+%define fedora_rel 3
%define extrarel %{nil}
@@ -31,8 +31,9 @@
Source10: update-xscreensaver-hacks
%endif
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
-Patch3: xscreensaver-5.05-addopts.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,12 @@
%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
+
* Sun Mar 2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-1
- Update to 5.05
--- xscreensaver-5.05-addopts.patch DELETED ---
- Previous message (by thread): rpms/xscreensaver/devel xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.67, 1.68
- Next message (by thread): rpms/xscreensaver/F-7 xscreensaver-5.05-addopts-jwz.patch, NONE, 1.1 xscreensaver-5.05-penetrate-font.patch, NONE, 1.1 xscreensaver.spec, 1.50, 1.51 xscreensaver-5.05-addopts.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list