rpms/xscreensaver/F-9 xscreensaver-5.08-randr-ncrtc-from-gentoo.patch, NONE, 1.1 xscreensaver.spec, 1.78, 1.79
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Jun 11 14:45:17 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20875/F-9
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
Log Message:
* Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-10
- Fix crash on startup when randr reports no rroi->ncrtc
(bug 504912), patch from gentoo
xscreensaver-5.08-randr-ncrtc-from-gentoo.patch:
--- NEW FILE xscreensaver-5.08-randr-ncrtc-from-gentoo.patch ---
--- driver/screens.c.orig 2009-04-30 17:59:02.000000000 -0700
+++ driver/screens.c 2009-04-30 18:01:32.000000000 -0700
@@ -436,7 +436,7 @@
XRROutputInfo *rroi = XRRGetOutputInfo (dpy, res,
res->outputs[k]);
RRCrtc crtc = (rroi->crtc ? rroi->crtc :
- rroi->crtcs ? rroi->crtcs[0] : 0);
+ rroi->ncrtc ? rroi->crtcs[0] : 0);
XRRCrtcInfo *crtci = (crtc ? XRRGetCrtcInfo(dpy, res, crtc) : 0);
monitors[j] = m;
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- xscreensaver.spec 22 Jan 2009 14:02:44 -0000 1.78
+++ xscreensaver.spec 11 Jun 2009 14:44:47 -0000 1.79
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 5
+%define fedora_rel 10
%define extrarel %{nil}
@@ -31,10 +31,22 @@ Source0: http://www.jwz.org/xscr
%if %{modular_conf}
Source10: update-xscreensaver-hacks
%endif
+# bug 129335
+# sanitize the names of modes in barcode
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
+# Change webcollage not to access to net
+# Also see bug 472061
Patch21: xscreensaver-5.07-webcollage-default-nonet.patch
+# Reported from upstream, sent upstream
+# pot file is not regenerated correctly
Patch50: xscreensaver-5.08-po-recreate.patch
+# bug 481146, sent upstream
+# phosphor crashes when resizing window
Patch51: xscreensaver-5.08-phosphor-segv.patch
+# bug 504912, must be reported to upstream
+# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
+# xscreensaver crashes when randr reportes 0 rroi->ncrtc
+Patch52: xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -189,6 +201,7 @@ This package contains some test programs
%patch21 -p1 -b .nonet
%patch50 -p1 -b .po
%patch51 -p1 -b .phosphor
+%patch52 -p0 -b .randr_ncrtc
change_option(){
set +x
@@ -236,7 +249,8 @@ for f in \
mv $f.tmp $f
done
-# change some options
+# Change some options
+# For grabDesktopImages, lock, see bug 126809
change_option driver/XScreenSaver.ad.in \
captureStderr=False \
passwdTimeout=0:00:15 \
@@ -246,11 +260,12 @@ change_option driver/XScreenSaver.ad.in
ignoreUninstalledPrograms=True \
textProgram=fortune\ -s
-# silence the following hacks by default
+# Disable the following hacks by default
+# (disable, not remove)
silence_hack driver/XScreenSaver.ad.in \
bsod flag
-# record time, version
+# Record time, EVR
eval sed -i.ver \
-e \'s\|version \[45\]\.\[0-9a-z\]\[0-9a-z\]\*\|version %{version}-`echo \
%{release} | sed -e '/IGNORE THIS/s|\.[a-z][a-z0-9].*$||'`\|\' \
@@ -268,18 +283,18 @@ eval sed -i.ver \
sed -e '/IGNORE THIS/s|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
utils/version.h
-# move man entry to 6x.
+# Move man entry to 6x (bug 197741)
for f in `find hacks -name Makefile.in` ; do
sed -i.mansuf \
-e '/^mansuffix/s|6|6x|'\
$f
done
-# search first 6x entry, next 1 entry for man pages
+# Search first 6x entry, next 1 entry for man pages
sed -i.manentry -e 's at man %%s at man 6x %%s 2>/dev/null || man 1 %%s @' \
driver/XScreenSaver.ad.in
-# suppress rpmlint booing.
+# Suppress rpmlint warnings.
# suppress about pam config (although this is
# not the fault of xscreensaver.pam ......).
sed -i.rpmlint -n -e '1,5p' driver/xscreensaver.pam
@@ -289,7 +304,7 @@ if [ -x %{_datadir}/libtool/config.guess
cp -p %{_datadir}/libtool/config.{sub,guess} .
fi
-# fix for desktop-file-utils 0.14+
+# Fix for desktop-file-utils 0.14+
%if 0%{?fedora} >= 9
sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \
driver/screensaver-properties.desktop.in
@@ -343,12 +358,12 @@ make %{?_smp_mflags} -k \
GMSGFMT="msgfmt --statistics"
%if %{modular_conf}
-# Make XScreenSavar.ad modular
+# Make XScreenSavar.ad modular (bug 200881)
CONFD=xscreensaver
rm -rf $CONFD
mkdir $CONFD
-# preserve the original adfile
+# Preserve the original adfile
cp -p driver/XScreenSaver.ad $CONFD
# First split XScreenSaver.ad into 3 parts
@@ -383,9 +398,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/p
make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
+# Kill OnlyShowIn=GNOME; on F-11+ (bug 483495)
desktop-file-install --vendor "" --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} < 11
--add-only-show-in GNOME \
+%endif
--add-category DesktopSettings \
%if 0
--add-category X-Red-Hat-Base \
@@ -436,12 +454,12 @@ sed -i -e 's|^\(%{_mandir}.*\)$|\1*|' $d
%endif
%if %{modular_conf}
-# install update script
+# Install update script
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
-# make hack conf modular
+# Make hack conf modular
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
cp -p xscreensaver/XScreenSaver.ad* \
@@ -459,7 +477,7 @@ echo "%{_sysconfdir}/xscreensaver/XScree
echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
>> $dd/base.files
-# check symlink
+# Check symlink
rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
@@ -476,14 +494,14 @@ ln -sf ../../../..%{_sysconfdir}/xscreen
%endif
-# add documents
+# Add documents
pushd $dd &> /dev/null
for f in README* ; do
echo "%%doc $f" >> $dd/base.files
done
popd
-# add directory
+# Add directory
pushd $RPM_BUILD_ROOT
for dir in `find . -type d | grep xscreensaver` ; do
echo "%%dir ${dir#.}" >> $dd/base.files
@@ -493,7 +511,7 @@ popd
%find_lang %{name}
cat %{name}.lang | uniq >> $dd/base.files
-# suppress rpmlint booing
+# Suppress rpmlint warnings
# sanitize path in script file
for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \
${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \
@@ -514,15 +532,16 @@ done
cd ..
%endif
-# create desktop entry for gnome-screensaver
+# Create desktop entry for gnome-screensaver
+# bug 204944, 208560
create_desktop(){
COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
ARG=`cat $1 | sed -n -e 's|^.*<command arg=\"\([^ ][^ ]*\)\".*$|\1|p'`
- ARG=`echo $ARG`
+ ARG=$(echo "$ARG" | while read line ; do echo -n "$line " ; done)
COMMENT="`cat $1 | sed -e '1,/_description/d' | \
sed -e '/_description/q' | sed -e '/_description/d'`"
- COMMENT=`echo $COMMENT`
+ COMMENT=$(echo "$COMMENT" | while read line ; do echo -n "$line " ; done)
# webcollage treatment
## changed to create wrapper script
@@ -633,6 +652,22 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-10
+- Fix crash on startup when randr reports no rroi->ncrtc
+ (bug 504912), patch from gentoo
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-9
+- F-11: Mass rebuild
+
+* Sun Feb 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-8
+- Fix the difference of creation of desktop files for gss between
+ different archs (detected by Florian Festi)
+
+* Mon Feb 2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-7
+- Remove OnlyShowIn=GNOME on F-11+ (to make happy with XFCE):
+ bug 483495
+- Add more comments about bug reference
+
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
- Fix phosphor segv when changing window size (bug 481146)
More information about the fedora-extras-commits
mailing list