rpms/xscreensaver/devel xscreensaver-5.05-addopts-jwz.patch, NONE, 1.1 xscreensaver.spec, 1.66, 1.67 xscreensaver-5.05-addopts.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed Mar 5 05:51:10 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20993
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.05-addopts-jwz.patch
Removed Files:
xscreensaver-5.05-addopts.patch
Log Message:
* 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
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.
#
###############################################################################
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- xscreensaver.spec 2 Mar 2008 14:16:58 -0000 1.66
+++ xscreensaver.spec 5 Mar 2008 05:50:27 -0000 1.67
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 1
+%define fedora_rel 2
%define extrarel %{nil}
@@ -31,7 +31,7 @@
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
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -560,6 +560,9 @@
%defattr(-,root,root,-)
%changelog
+* 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 ---
More information about the fedora-extras-commits
mailing list