From 90f3322dec3e94cf4034a07448cebeeaf3a97bbc Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 7 Jun 2020 15:39:51 +0200 Subject: [PATCH 01/23] remove dependency onto gnome-screensaver and some cleanup --- rss-glx-matrixview.conf | 48 ++++++++++ rss-glx.conf | 48 ++++++++++ rss-glx.spec | 199 +++++----------------------------------- 3 files changed, 117 insertions(+), 178 deletions(-) create mode 100644 rss-glx-matrixview.conf create mode 100644 rss-glx.conf diff --git a/rss-glx-matrixview.conf b/rss-glx-matrixview.conf new file mode 100644 index 0000000..33f631c --- /dev/null +++ b/rss-glx-matrixview.conf @@ -0,0 +1,48 @@ +GL: "BioF" \ + rss-glx-biof -r \n\ +GL: "Busy Spheres" \ + rss-glx-busyspheres -r \n\ +GL: "Colorfire" \ + rss-glx-colorfire -r \n\ +GL: "Cyclone" \ + rss-glx-cyclone -r \n\ +GL: "Drempels" \ + rss-glx-drempels -r \n\ +GL: "Euphoria" \ + rss-glx-euphoria -r \n\ +GL: "Feedback" \ + rss-glx-feedback -r \n\ +GL: "Fieldlines" \ + rss-glx-fieldlines -r \n\ +GL: "Flocks" \ + rss-glx-flocks -r \n\ +GL: "Flux" \ + rss-glx-flux -r \n\ +GL: "Helios" \ + rss-glx-helios -r \n\ +GL: "Hufo's Smoke" \ + rss-glx-hufo_smoke -r \n\ +GL: "Hufo's Tunnel" \ + rss-glx-hufo_tunnel -r \n\ +GL: "Hyperspace" \ + rss-glx-hyperspace -r \n\ +GL: "Lattice" \ + rss-glx-lattice -r \n\ +GL: "Lorenz" \ + rss-glx-lorenz -r \n\ +GL: "Pixel City" \ + rss-glx-pixelcity -r \n\ +GL: "Plasma" \ + rss-glx-plasma -r \n\ +GL: "Skyrocket (silent)" \ + rss-glx-skyrocket -v 0 -r \n\ +GL: "Skyrocket" \ + rss-glx-skyrocket -r \n\ +GL: "Solarwinds" \ + rss-glx-solarwinds -r \n\ +GL: "SpirographX" \ + rss-glx-spirographx -r \n\ +GL: "Sundancer2" \ + rss-glx-sundancer2 -r \n\ +GL: "Matrix" \ + rss-glx-matrixview -r \n\ diff --git a/rss-glx.conf b/rss-glx.conf new file mode 100644 index 0000000..33f631c --- /dev/null +++ b/rss-glx.conf @@ -0,0 +1,48 @@ +GL: "BioF" \ + rss-glx-biof -r \n\ +GL: "Busy Spheres" \ + rss-glx-busyspheres -r \n\ +GL: "Colorfire" \ + rss-glx-colorfire -r \n\ +GL: "Cyclone" \ + rss-glx-cyclone -r \n\ +GL: "Drempels" \ + rss-glx-drempels -r \n\ +GL: "Euphoria" \ + rss-glx-euphoria -r \n\ +GL: "Feedback" \ + rss-glx-feedback -r \n\ +GL: "Fieldlines" \ + rss-glx-fieldlines -r \n\ +GL: "Flocks" \ + rss-glx-flocks -r \n\ +GL: "Flux" \ + rss-glx-flux -r \n\ +GL: "Helios" \ + rss-glx-helios -r \n\ +GL: "Hufo's Smoke" \ + rss-glx-hufo_smoke -r \n\ +GL: "Hufo's Tunnel" \ + rss-glx-hufo_tunnel -r \n\ +GL: "Hyperspace" \ + rss-glx-hyperspace -r \n\ +GL: "Lattice" \ + rss-glx-lattice -r \n\ +GL: "Lorenz" \ + rss-glx-lorenz -r \n\ +GL: "Pixel City" \ + rss-glx-pixelcity -r \n\ +GL: "Plasma" \ + rss-glx-plasma -r \n\ +GL: "Skyrocket (silent)" \ + rss-glx-skyrocket -v 0 -r \n\ +GL: "Skyrocket" \ + rss-glx-skyrocket -r \n\ +GL: "Solarwinds" \ + rss-glx-solarwinds -r \n\ +GL: "SpirographX" \ + rss-glx-spirographx -r \n\ +GL: "Sundancer2" \ + rss-glx-sundancer2 -r \n\ +GL: "Matrix" \ + rss-glx-matrixview -r \n\ diff --git a/rss-glx.spec b/rss-glx.spec index 0b3f94d..27b0735 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -1,42 +1,14 @@ %if 0%{?fedora} -%if %{fedora} <= 4 -%bcond_with modular_x -%bcond_with gss -%global _gssconfigdir %{nil}%{?gssconfigdir} -%else %bcond_without modular_x -%bcond_without gss -%if %{fedora} <= 5 -%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir} -%else -%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir} -%endif -%if %{fedora} >= 7 %bcond_without modular_xss %else +%bcond_with modular_x %bcond_with modular_xss %endif -%if %{fedora} >= 8 -# KDE4 -%bcond_without kde4 -%else -# KDE3 -%bcond_with kde4 -%endif -%endif -%else -%bcond_without modular_x -%bcond_without modular_xss -%bcond_without gss -%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir} -%endif - -%global kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers} %global xssconfigdir %{_datadir}/xscreensaver/config %global xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d %global xssbindir %{_libexecdir}/xscreensaver -%global gssbindir %{_libexecdir}/gnome-screensaver %bcond_with matrixview %global patchext %{nil}%{!?with_matrixview:.p} @@ -44,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 42%{?dist} +Release: 43%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -55,6 +27,8 @@ Source1: README.fedora # The following two strip matrixview from the package and build a new tarball Source2: rss-glx-rm-matrixview.sh Source3: rss-glx-0.9.1-0.9.1.p.diff +Source4: rss-glx-matrixview.conf +Source5: rss-glx.conf # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003 Patch0: rss-glx-0.9.0.p-optflags.patch Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2 @@ -80,9 +54,6 @@ BuildRequires: bzip2-devel BuildRequires: freealut-devel BuildRequires: gawk BuildRequires: sed -%if 0%{?fedora} >= 22 -Obsoletes: %{name}-kde < 0.9.1.p-23 -%endif %description A port of the Really Slick Screensavers to GLX. Provides several visually @@ -111,35 +82,6 @@ impressive and graphically intensive screensavers. This package contains files needed to use the hacks with xscreensaver. -%if %{with gss} -%package gnome-screensaver -Summary: Really Slick Screensavers -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: gnome-screensaver - -%description gnome-screensaver -A port of the Really Slick Screensavers to GLX. Provides several visually -impressive and graphically intensive screensavers. - -This package contains files needed to use the hacks with gnome-screensaver. -%endif - -%package kde -Summary: Really Slick Screensavers -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5 -Requires: kdeartwork-extras -%else -Requires: kdeartwork-kxs -%endif - -%description kde -A port of the Really Slick Screensavers to GLX. Provides several visually -impressive and graphically intensive screensavers. - -This package contains files needed to use the hacks with KDE. - %prep cat << EOF @@ -149,12 +91,6 @@ Build settings: %else - with monolithic X %endif -%if %{with gss} -- with gnome-screensaver support, - theme directory: %{_gssconfigdir} -%else -- without gnome-screensaver support -%endif %if %{with matrixview} - with matrixview hack %else @@ -166,14 +102,10 @@ Build settings: - without modular xscreensaver support %endif %if 0%{?fedora} < 22 -%if %{with kde4} -- with KDE4 support in: %kdessconfigdir -%else -- with KDE3 support in: %kdessconfigdir -%endif %endif EOF + %setup -q -n rss-glx_%{version} %patch0 -p1 -b .optflags %patch10 -p1 -b .autoreconf @@ -183,114 +115,33 @@ EOF %build %configure \ --with-configdir=%{xssconfigdir} \ - --with-kdessconfigdir=%{kdessconfigdir} \ --program-prefix=rss-glx- make %{?_smp_mflags} %install -generate_fix_desktop_files_links () { - local line name trycmd cmd desc - while read line; do -%if %{with gss} - # generate GNOME screensaver desktop files - eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; desktopfilename=\"rss-glx-" $2 ".desktop\"; cmd=\"rss-glx-" $3 "\"; desc=\"" $4 "\""}') - trycmd="${cmd%%%% *}" - origtrycmd="${trycmd#rss-glx-}" - cat << EOF > %{buildroot}%{_gssconfigdir}/${desktopfilename} - -[Desktop Entry] -Name=${name} -Comment=${desc} -TryExec=${trycmd} -Exec=${cmd} -r -StartupNotify=false -Terminal=false -Type=Application -Categories=GNOME;Screensaver; -EOF - ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/${trycmd}" -%endif - # fix KDE screensaver desktop files - pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null - if [ ! -f "${trycmd}.desktop" ]; then - awk ' -{ - if ($0 ~ "^Actions=") { - print "Actions=InWindow;Root;Setup;"; - print "X-KDE-Category=Really Slick Screensavers"; - print "X-KDE-Type=OpenGL"; - } else { - if ($0 ~ "^Type=") { - print "Type=Service"; - print "X-KDE-ServiceTypes=ScreenSaver"; - } else { - if ($0 !~ "^Encoding=") { - print; - } - } - } -}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop" - rm -f "${origtrycmd}.desktop" - fi - popd >& /dev/null - # external hacks description and symlinks for XScreenSaver - cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf -GL: "${name}" \\ - ${cmd} -r \\n\\ -EOF - ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}" - done -} - -rm -rf %buildroot install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" . make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/lib*.{,l}a rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl -%if %{with gss} -mkdir -p %{buildroot}%{_gssconfigdir} -mkdir -p %{buildroot}%{gssbindir} + mkdir -p %{buildroot}%{xssbindir} mkdir -p %{buildroot}%{xssexthacksconfdir} -%endif -cat << EOF | generate_fix_desktop_files_links -BioF§biof§biof§This is an attempt to recreate some of the work of William Latham. -Busy Spheres§busyspheres§busyspheres§Spheres made of dancing particles. -Colorfire§colorfire§colorfire§Burning colors. -Cyclone§cyclone§cyclone§A cyclone made of particles. -Drempels§drempels§drempels§A hallucinatory desktop enhancer. -Euphoria§euphoria§euphoria§Psychedelic shapes. -Feedback§feedback§feedback§Stirring colors with a jiggling warp. -Fieldlines§fieldlines§fieldlines§A simulation of the electric field lines between charged particles. -Flocks§flocks§flocks§Floating wisps. -Flux§flux§flux§Flux fields and stuff. -Helios§helios§helios§Attraction/repulsion particle effects and some smooth surfaces. -Hufo's Smoke§hufo_smoke§hufo_smoke§Particle smoke effect. -Hufo's Tunnel§hufo_tunnel§hufo_tunnel§Inside a tunnel. -Hyperspace§hyperspace§hyperspace§Flying through hyper space. -Lattice§lattice§lattice§Fly through an endless world of linked rings. -Lorenz§lorenz§lorenz§A visualization of the Lorenz Attractor fractal. %if %{with matrixview} -MatrixView§matrixview§matrixview§The Matrix. +install -m 0644 "%SOURCE4" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf +%else +install -m 0644 "%SOURCE5" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf %endif -Pixel City§pixelcity§pixelcity§Procedural city fly through. -Plasma§plasma§plasma§Oozing plasma. -Skyrocket (silent)§skyrocket-silent§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version. -Skyrocket§skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound. -Solarwinds§solarwinds§solarwinds§This is a very mesmerizing particle effects saver. -SpirographX§spirographx§spirographx§Spirograph-like screensaver. -Sundancer2§sundancer2§sundancer2§Rotating stack of quads. -EOF + +cd %buildroot/%{_bindir}/ +for file in rss-glx*; do + ln -snf "%{_bindir}/${file}" "%{buildroot}%{xssbindir}/${file}" +done cd %buildroot/%{xssconfigdir}/ for file in *.xml; do - mv -f $file rss-glx-$file + mv -f ${file} rss-glx-${file} done -%if 0%{?fedora} >= 22 -rm -rf %buildroot%{kdessconfigdir} -%endif - %if %{with modular_xss} %post xscreensaver if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then @@ -316,21 +167,13 @@ fi %dir %{xssbindir} %{xssbindir}/* -%if %{with gss} -%files gnome-screensaver -%dir %{_gssconfigdir} -%{_gssconfigdir}/*.desktop -%dir %{gssbindir} -%{gssbindir}/* -%endif - -%if 0%{?fedora} < 22 -%files kde -%dir %{kdessconfigdir} -%{kdessconfigdir}/*.desktop -%endif - %changelog +* Sat Jun 06 2020 josef radinger - 0.9.1.p-43 +- we no longer have gnome-screensaver +- and we have no kde-packages for long times, too +- specfile-cleanup + + * Sat May 16 2020 josef radinger - 0.9.1.p-42 - fix pixelcity rss-glx-0.9.1.p-pixelcity.patch From 96db1e85f44ba851027a73af4044e694b6f01856 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 7 Jun 2020 15:55:36 +0200 Subject: [PATCH 02/23] fix #rhbz1841249 --- rss-glx.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rss-glx.spec b/rss-glx.spec index 27b0735..fdf7eb6 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 43%{?dist} +Release: 44%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -55,6 +55,10 @@ BuildRequires: freealut-devel BuildRequires: gawk BuildRequires: sed +%if 0%{?fedora} >= 33 +Obsoletes: %{name}-gnome-screensaver < 0.9.1.p-43 +%endif + %description A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. @@ -72,9 +76,7 @@ Requires(postun): xscreensaver-base >= 1:5.03-3 %else Requires: xscreensaver-base < 1:5.03-3 %endif -%if 0%{?fedora} >= 7 Requires: xscreensaver-gl-base -%endif %description xscreensaver A port of the Really Slick Screensavers to GLX. Provides several visually @@ -101,9 +103,6 @@ Build settings: %else - without modular xscreensaver support %endif -%if 0%{?fedora} < 22 -%endif - EOF %setup -q -n rss-glx_%{version} @@ -168,6 +167,10 @@ fi %{xssbindir}/* %changelog +* Sun Jun 07 2020 josef radinger - 0.9.1.p-44 +- obsolete rss-glx-gnome-screensaver +- further cleanup + * Sat Jun 06 2020 josef radinger - 0.9.1.p-43 - we no longer have gnome-screensaver - and we have no kde-packages for long times, too From 8e916c05b571fa9329767ac0642bbfa7ac4baa12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:58:02 +0000 Subject: [PATCH 03/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index fdf7eb6..a88995d 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 44%{?dist} +Release: 45%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -167,6 +167,9 @@ fi %{xssbindir}/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.1.p-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 josef radinger - 0.9.1.p-44 - obsolete rss-glx-gnome-screensaver - further cleanup From 4fecbf7e3ad810e858cb3601cd2d1c48ae9d58a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 08:02:45 +0000 Subject: [PATCH 04/23] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index a88995d..34947e2 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 45%{?dist} +Release: 46%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -167,6 +167,10 @@ fi %{xssbindir}/* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.9.1.p-46 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.1.p-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a1be5ecd5b3f9d16cf75840c5e166ce912c09a75 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Sep 2020 11:53:02 -0600 Subject: [PATCH 05/23] Fix missing include of cstddef for gcc-11 --- rss-glx-gcc11.patch | 12 ++++++++++++ rss-glx.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 rss-glx-gcc11.patch diff --git a/rss-glx-gcc11.patch b/rss-glx-gcc11.patch new file mode 100644 index 0000000..53ad7d2 --- /dev/null +++ b/rss-glx-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/src/Implicit/impSurface.h b/src/Implicit/impSurface.h +index 41fab81..ecb692a 100644 +--- a/src/Implicit/impSurface.h ++++ b/src/Implicit/impSurface.h +@@ -27,6 +27,7 @@ + #endif + #include + #include ++#include + + + class impSurface{ diff --git a/rss-glx.spec b/rss-glx.spec index 34947e2..de0cdea 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 46%{?dist} +Release: 47%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -34,6 +34,7 @@ Patch0: rss-glx-0.9.0.p-optflags.patch Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2 Patch11: rss-glx-0.9.1.p-linker.patch Patch12: rss-glx-0.9.1.p-pixelcity.patch +Patch13: rss-glx-gcc11.patch BuildRequires: gcc-c++ BuildRequires: gcc @@ -110,6 +111,7 @@ EOF %patch10 -p1 -b .autoreconf %patch11 -p1 -b .linker %patch12 -p1 -b .pixelcity +%patch13 -p1 -b .gcc11 %build %configure \ @@ -167,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Tue Sep 15 2020 Jeff Law - 0.9.1.p-47 +- Fix missing include of cstddef for gcc-11 + * Sat Aug 01 2020 Fedora Release Engineering - 0.9.1.p-46 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 944f8bef14b80a34f4e64916d18bc193ee1e00c1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:55:47 +0000 Subject: [PATCH 06/23] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- rss-glx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rss-glx.spec b/rss-glx.spec index de0cdea..bd83e33 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -36,6 +36,7 @@ Patch11: rss-glx-0.9.1.p-linker.patch Patch12: rss-glx-0.9.1.p-pixelcity.patch Patch13: rss-glx-gcc11.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: libGL-devel From 7cb2cf564e16ffc1dea1fcb6471d51532147c214 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:29:50 +0000 Subject: [PATCH 07/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index bd83e33..647b491 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 47%{?dist} +Release: 48%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.1.p-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 15 2020 Jeff Law - 0.9.1.p-47 - Fix missing include of cstddef for gcc-11 From 164129e648638db0ea578dc512b7db656deda57f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:39:16 +0000 Subject: [PATCH 08/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 647b491..9321ccb 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 48%{?dist} +Release: 49%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.1.p-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.9.1.p-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a32eb63ed5b022999405e100658fa5404c7fee23 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Oct 2021 15:58:13 +0900 Subject: [PATCH 09/23] Rebuild against new ImageMagick --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 9321ccb..3d2ab11 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 49%{?dist} +Release: 50%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Sun Oct 17 2021 Mamoru TASAKA - 0.9.1.p-50 +- Rebuild against new ImageMagick + * Fri Jul 23 2021 Fedora Release Engineering - 0.9.1.p-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7b9a464fd40585c27dd3e6a77e47a396874ee347 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:05:49 +0000 Subject: [PATCH 10/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 3d2ab11..4c1ec8e 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 50%{?dist} +Release: 51%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.9.1.p-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Oct 17 2021 Mamoru TASAKA - 0.9.1.p-50 - Rebuild against new ImageMagick From 52d0f85a46a96748fd28eb3ad658cbde03f63f79 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 21:07:29 -0700 Subject: [PATCH 11/23] Rebuild for glew 2.2 --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 4c1ec8e..03fa822 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 51%{?dist} +Release: 52%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Thu Feb 10 2022 Orion Poplawski - 0.9.1.p-52 +- Rebuild for glew 2.2 + * Fri Jan 21 2022 Fedora Release Engineering - 0.9.1.p-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From db63a0ded36b05eacd0f76c972b5675d29da9489 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:05:36 +0000 Subject: [PATCH 12/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 03fa822..c779520 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 52%{?dist} +Release: 53%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.1.p-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Feb 10 2022 Orion Poplawski - 0.9.1.p-52 - Rebuild for glew 2.2 From 8e334bd6353b485ced7b12684d6f4d54db9ad148 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 4 Dec 2022 16:47:47 -0500 Subject: [PATCH 13/23] Add patch for ImageMagick 7 compatibility --- rss-glx-ImageMagick7.patch | 52 ++++++++++++++++++++++++++++++++++++++ rss-glx.spec | 16 ++++++------ 2 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 rss-glx-ImageMagick7.patch diff --git a/rss-glx-ImageMagick7.patch b/rss-glx-ImageMagick7.patch new file mode 100644 index 0000000..cdb7ec8 --- /dev/null +++ b/rss-glx-ImageMagick7.patch @@ -0,0 +1,52 @@ +Index: rss-glx_0.9.1/configure.in +=================================================================== +--- rss-glx_0.9.1.orig/configure.in 2017-03-27 13:34:31.042941813 +0200 ++++ rss-glx_0.9.1/configure.in 2017-03-27 13:34:31.050941977 +0200 +@@ -75,7 +75,7 @@ fi + AC_CHECK_FUNCS(random_r nrand48) + + # Check for ImageMagick. +-PKG_CHECK_MODULES(Wand, Wand >= 6.4) ++PKG_CHECK_MODULES(MagickWand, MagickWand >= 6.4) + + if test -d src/skyrocket_sounds ; then + AC_ARG_ENABLE(sound, [ --disable-sound Don't compile with sound.]) +Index: rss-glx_0.9.1/src/Makefile.am +=================================================================== +--- rss-glx_0.9.1.orig/src/Makefile.am 2010-01-04 01:44:04.000000000 +0100 ++++ rss-glx_0.9.1/src/Makefile.am 2017-03-27 13:36:06.468859903 +0200 +@@ -12,8 +12,8 @@ colorfire_LDADD = @BZIP2@ + cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h + cyclone_LDADD = -LrsMath -lrsMath + drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c +-drempels_CXXFLAGS = @Wand_CFLAGS@ +-drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@ ++drempels_CXXFLAGS = @MagickWand_CFLAGS@ ++drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@ + euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp + euphoria_LDADD = -LrsMath -lrsMath @BZIP2@ + feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp +Index: rss-glx_0.9.1/src/TexMgr.cpp +=================================================================== +--- rss-glx_0.9.1.orig/src/TexMgr.cpp 2009-05-19 20:10:43.000000000 +0200 ++++ rss-glx_0.9.1/src/TexMgr.cpp 2017-03-27 13:34:31.050941977 +0200 +@@ -25,8 +25,8 @@ + #endif + #include + +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -258,7 +258,7 @@ void TexMgr::loadNextImageFromDisk() { + ExceptionInfo exception; + int dirLoop = 0; + +- GetExceptionInfo (&exception); ++ ClearMagickException (&exception); + + int imageLoaded = 0; + do { diff --git a/rss-glx.spec b/rss-glx.spec index c779520..c6aae64 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 53%{?dist} +Release: 54%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -35,6 +35,8 @@ Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2 Patch11: rss-glx-0.9.1.p-linker.patch Patch12: rss-glx-0.9.1.p-pixelcity.patch Patch13: rss-glx-gcc11.patch +# Modified version from openSUSE: https://build.opensuse.org/package/view_file/X11:Utilities/rss-glx/rss-glx-ImageMagick7.patch?expand=1 +Patch14: rss-glx-ImageMagick7.patch BuildRequires: make BuildRequires: gcc-c++ @@ -107,18 +109,13 @@ Build settings: %endif EOF -%setup -q -n rss-glx_%{version} -%patch0 -p1 -b .optflags -%patch10 -p1 -b .autoreconf -%patch11 -p1 -b .linker -%patch12 -p1 -b .pixelcity -%patch13 -p1 -b .gcc11 +%autosetup -p1 -n rss-glx_%{version} %build %configure \ --with-configdir=%{xssconfigdir} \ --program-prefix=rss-glx- -make %{?_smp_mflags} +%make_build %install install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" . @@ -170,6 +167,9 @@ fi %{xssbindir}/* %changelog +* Sun Dec 04 2022 Neal Gompa - 0.9.1.p-54 +- Add patch for ImageMagick 7 compatibility + * Sat Jul 23 2022 Fedora Release Engineering - 0.9.1.p-53 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0c107fe8eb41d82597865de0835418adb2671285 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 4 Dec 2022 20:06:08 -0500 Subject: [PATCH 14/23] Patch pregenerated configure script since regeneration fails --- rss-glx-ImageMagick7-configure.patch | 230 +++++++++++++++++++++++++++ rss-glx.spec | 7 +- 2 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 rss-glx-ImageMagick7-configure.patch diff --git a/rss-glx-ImageMagick7-configure.patch b/rss-glx-ImageMagick7-configure.patch new file mode 100644 index 0000000..aa6ad18 --- /dev/null +++ b/rss-glx-ImageMagick7-configure.patch @@ -0,0 +1,230 @@ +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/configure rss-glx_0.9.1.p/configure +--- rss-glx_0.9.1.p-orig/configure 2022-12-04 19:48:00.239307236 -0500 ++++ rss-glx_0.9.1.p/configure 2022-12-04 19:51:49.287547331 -0500 +@@ -621,8 +621,8 @@ freealut_LIBS + freealut_CFLAGS + WITHSOUND_FALSE + WITHSOUND_TRUE +-Wand_LIBS +-Wand_CFLAGS ++MagickWand_LIBS ++MagickWand_CFLAGS + PKG_CONFIG_LIBDIR + PKG_CONFIG_PATH + PKG_CONFIG +@@ -777,8 +777,8 @@ XMKMF + PKG_CONFIG + PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR +-Wand_CFLAGS +-Wand_LIBS ++MagickWand_CFLAGS ++MagickWand_LIBS + freealut_CFLAGS + freealut_LIBS + quesoglc_CFLAGS +@@ -1443,8 +1443,8 @@ Some influential environment variables: + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path +- Wand_CFLAGS C compiler flags for Wand, overriding pkg-config +- Wand_LIBS linker flags for Wand, overriding pkg-config ++ MagickWand_CFLAGS C compiler flags for MagickWand, overriding pkg-config ++ MagickWand_LIBS linker flags for MagickWand, overriding pkg-config + freealut_CFLAGS + C compiler flags for freealut, overriding pkg-config + freealut_LIBS +@@ -16124,35 +16124,35 @@ $as_echo "no" >&6; } + fi + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wand" >&5 +-$as_echo_n "checking for Wand... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MagickWand" >&5 ++$as_echo_n "checking for MagickWand... " >&6; } + +-if test -n "$Wand_CFLAGS"; then +- pkg_cv_Wand_CFLAGS="$Wand_CFLAGS" ++if test -n "$MagickWand_CFLAGS"; then ++ pkg_cv_MagickWand_CFLAGS="$MagickWand_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_Wand_CFLAGS=`$PKG_CONFIG --cflags "Wand >= 6.4" 2>/dev/null` ++ pkg_cv_MagickWand_CFLAGS=`$PKG_CONFIG --cflags "MagickWand >= 6.4" 2>/dev/null` + else + pkg_failed=yes + fi + else + pkg_failed=untried + fi +-if test -n "$Wand_LIBS"; then +- pkg_cv_Wand_LIBS="$Wand_LIBS" ++if test -n "$MagickWand_LIBS"; then ++ pkg_cv_MagickWand_LIBS="$MagickWand_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_Wand_LIBS=`$PKG_CONFIG --libs "Wand >= 6.4" 2>/dev/null` ++ pkg_cv_MagickWand_LIBS=`$PKG_CONFIG --libs "MagickWand >= 6.4" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -16172,22 +16172,22 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- Wand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Wand >= 6.4" 2>&1` ++ MagickWand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "MagickWand >= 6.4" 2>&1` + else +- Wand_PKG_ERRORS=`$PKG_CONFIG --print-errors "Wand >= 6.4" 2>&1` ++ MagickWand_PKG_ERRORS=`$PKG_CONFIG --print-errors "MagickWand >= 6.4" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$Wand_PKG_ERRORS" >&5 ++ echo "$MagickWand_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (Wand >= 6.4) were not met: ++ as_fn_error $? "Package requirements (MagickWand >= 6.4) were not met: + +-$Wand_PKG_ERRORS ++$MagickWand_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively, you may set the environment variables Wand_CFLAGS +-and Wand_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables MagickWand_CFLAGS ++and MagickWand_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 + + elif test $pkg_failed = untried; then +@@ -16199,16 +16199,16 @@ as_fn_error $? "The pkg-config script co + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively, you may set the environment variables Wand_CFLAGS +-and Wand_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables MagickWand_CFLAGS ++and MagickWand_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details" "$LINENO" 5; } + + else +- Wand_CFLAGS=$pkg_cv_Wand_CFLAGS +- Wand_LIBS=$pkg_cv_Wand_LIBS ++ MagickWand_CFLAGS=$pkg_cv_MagickWand_CFLAGS ++ MagickWand_LIBS=$pkg_cv_MagickWand_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/Makefile.in rss-glx_0.9.1.p/Makefile.in +--- rss-glx_0.9.1.p-orig/Makefile.in 2022-12-04 19:48:00.246307213 -0500 ++++ rss-glx_0.9.1.p/Makefile.in 2022-12-04 19:57:46.709369115 -0500 +@@ -171,8 +171,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in rss-glx_0.9.1.p/src/Implicit/Makefile.in +--- rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in 2022-12-04 19:48:00.246307213 -0500 ++++ rss-glx_0.9.1.p/src/Implicit/Makefile.in 2022-12-04 19:56:27.070631528 -0500 +@@ -159,8 +159,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in +--- rss-glx_0.9.1.p-orig/src/Makefile.in 2022-12-04 19:48:00.258307174 -0500 ++++ rss-glx_0.9.1.p/src/Makefile.in 2022-12-04 19:55:53.893740843 -0500 +@@ -348,8 +348,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ +@@ -423,8 +423,8 @@ colorfire_LDADD = @BZIP2@ + cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h + cyclone_LDADD = -LrsMath -lrsMath + drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c +-drempels_CXXFLAGS = @Wand_CFLAGS@ +-drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@ ++drempels_CXXFLAGS = @MagickWand_CFLAGS@ ++drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@ + euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp + euphoria_LDADD = -LrsMath -lrsMath @BZIP2@ + feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in rss-glx_0.9.1.p/src/PixelCity/Makefile.in +--- rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in 2022-12-04 19:48:00.248307207 -0500 ++++ rss-glx_0.9.1.p/src/PixelCity/Makefile.in 2022-12-04 19:57:07.414498596 -0500 +@@ -169,8 +169,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in rss-glx_0.9.1.p/src/rsMath/Makefile.in +--- rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in 2022-12-04 19:48:00.248307207 -0500 ++++ rss-glx_0.9.1.p/src/rsMath/Makefile.in 2022-12-04 19:56:10.994684496 -0500 +@@ -167,8 +167,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ +diff '--color=auto' -rup rss-glx_0.9.1.p-orig/utils/Makefile.in rss-glx_0.9.1.p/utils/Makefile.in +--- rss-glx_0.9.1.p-orig/utils/Makefile.in 2022-12-04 19:48:00.248307207 -0500 ++++ rss-glx_0.9.1.p/utils/Makefile.in 2022-12-04 19:57:23.374446007 -0500 +@@ -139,8 +139,8 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-Wand_CFLAGS = @Wand_CFLAGS@ +-Wand_LIBS = @Wand_LIBS@ ++MagickWand_CFLAGS = @MagickWand_CFLAGS@ ++MagickWand_LIBS = @MagickWand_LIBS@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff --git a/rss-glx.spec b/rss-glx.spec index c6aae64..d10bf7b 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 54%{?dist} +Release: 55%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -37,6 +37,8 @@ Patch12: rss-glx-0.9.1.p-pixelcity.patch Patch13: rss-glx-gcc11.patch # Modified version from openSUSE: https://build.opensuse.org/package/view_file/X11:Utilities/rss-glx/rss-glx-ImageMagick7.patch?expand=1 Patch14: rss-glx-ImageMagick7.patch +# Autotools regeneration doesn't work +Patch15: rss-glx-ImageMagick7-configure.patch BuildRequires: make BuildRequires: gcc-c++ @@ -167,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Mon Dec 05 2022 Neal Gompa - 0.9.1.p-55 +- Patch pregenerated configure script since regeneration fails + * Sun Dec 04 2022 Neal Gompa - 0.9.1.p-54 - Add patch for ImageMagick 7 compatibility From a04a12cf4742047face01803729c3a77c09907a2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 5 Jan 2023 06:56:11 -0500 Subject: [PATCH 15/23] Rebuild for ImageMagick 7 --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index d10bf7b..cdade1f 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 55%{?dist} +Release: 56%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Thu Jan 05 2023 Neal Gompa - 0.9.1.p-56 +- Rebuild for ImageMagick 7 + * Mon Dec 05 2022 Neal Gompa - 0.9.1.p-55 - Patch pregenerated configure script since regeneration fails From 8297af6211f6f331d0ee20320715e83f6e72a204 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:00:41 +0000 Subject: [PATCH 16/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index cdade1f..cbf8ac0 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 56%{?dist} +Release: 57%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 0.9.1.p-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jan 05 2023 Neal Gompa - 0.9.1.p-56 - Rebuild for ImageMagick 7 From 67f06bd2b40391c3fff74b9ba4bf28f7cac9f76a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:09:14 +0000 Subject: [PATCH 17/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index cbf8ac0..95f5101 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 57%{?dist} +Release: 58%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.9.1.p-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 0.9.1.p-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b0eb3ee47dde64d9790ab331fbf8e828900a62ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:06:50 +0000 Subject: [PATCH 18/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 95f5101..1cd3cc3 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 58%{?dist} +Release: 59%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.9.1.p-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 0.9.1.p-58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cf1543e84b6d5f99f809864aa250d494b08bd091 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:24:54 +0000 Subject: [PATCH 19/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index 1cd3cc3..eb1558e 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 59%{?dist} +Release: 60%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.9.1.p-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.9.1.p-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d8bb79f55f5ff5e3e930e44297bbb21ea70d1b68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:53:20 +0000 Subject: [PATCH 20/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index eb1558e..73fc16c 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 60%{?dist} +Release: 61%{?dist} License: GPLv2 URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. @@ -169,6 +169,9 @@ fi %{xssbindir}/* %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.9.1.p-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 0.9.1.p-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 27062a47cffe6330134166654cf647fafe2f970f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:08:44 +0200 Subject: [PATCH 21/23] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- rss-glx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rss-glx.spec b/rss-glx.spec index 73fc16c..ba4fa3e 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,8 +16,9 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 61%{?dist} -License: GPLv2 +Release: 62%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://rss-glx.sourceforge.net/ # We ship a tarball with one questionable hack patched out. # The original URL is the following without %%patchext: @@ -169,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Mon Jul 29 2024 Miroslav Suchý - 0.9.1.p-62 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 0.9.1.p-61 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 947eb392a7ede519718c9c8e8a8da0a66ae70e46 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 17 Jan 2025 14:32:45 +0100 Subject: [PATCH 22/23] rebuild --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index ba4fa3e..bdf9fd9 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 62%{?dist} +Release: 63%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://rss-glx.sourceforge.net/ @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Fri Jan 17 2025 josef radinger - 0.9.1.p-63 +- rebuild for broken dependency on libMagickWand + * Mon Jul 29 2024 Miroslav Suchý - 0.9.1.p-62 - convert license to SPDX From 4173833943ffc13370b1605f53b09323f08825e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:09:08 +0000 Subject: [PATCH 23/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rss-glx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss-glx.spec b/rss-glx.spec index bdf9fd9..ed2add2 100644 --- a/rss-glx.spec +++ b/rss-glx.spec @@ -16,7 +16,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.9.1%{patchext} -Release: 63%{?dist} +Release: 64%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://rss-glx.sourceforge.net/ @@ -170,6 +170,9 @@ fi %{xssbindir}/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.1.p-64 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 josef radinger - 0.9.1.p-63 - rebuild for broken dependency on libMagickWand