patch for xscreensaver 6.06 to accept e.g. --root argument in addition to -root [release 1.1.20211231git-2mamba;Mon Mar 27 2023]

This commit is contained in:
Silvan Calarco 2024-01-05 23:09:30 +01:00
parent 7905961159
commit b5300a2eb5
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
--- gluqlo-1.1.20211231git/gluqlo.c.orig 2023-03-27 22:18:56.210217168 +0200
+++ gluqlo-1.1.20211231git/gluqlo.c 2023-03-27 22:21:17.335465207 +0200
@@ -347,15 +347,15 @@
printf(" -r\t\tCustom resolution in WxH format\n");
printf(" -s\t\tCustom display scale factor\n");
return 0;
- } else if(strcmp("-root", argv[i]) == 0 || strcmp("-f", argv[i]) == 0 || strcmp("--fullscreen", argv[i]) == 0) {
+ } else if(strcmp("-root", argv[i]) == 0 || strcmp("--root", argv[i]) == 0 || strcmp("-f", argv[i]) == 0 || strcmp("--fullscreen", argv[i]) == 0) {
fullscreen = true;
- } else if(strcmp("-noflip", argv[i]) == 0) {
+ } else if(strcmp("-noflip", argv[i]) == 0 || strcmp("--noflip", argv[i]) == 0) {
animate = false;
- } else if(strcmp("-anykeyclose", argv[i]) == 0) {
+ } else if(strcmp("-anykeyclose", argv[i]) == 0 || strcmp("--anykeyclose", argv[i]) == 0) {
anykeyclose = true;
- } else if(strcmp("-ampm", argv[i]) == 0) {
+ } else if(strcmp("-ampm", argv[i]) == 0 || strcmp("--ampm", argv[i]) == 0) {
twentyfourh = false;
- } else if(strcmp("-leadingzero", argv[i]) == 0) {
+ } else if(strcmp("-leadingzero", argv[i]) == 0 || strcmp("--leadingzero", argv[i]) == 0) {
leadingzero = true;
} else if(strcmp("-r", argv[i]) == 0 || strcmp("--resolution", argv[i]) == 0) {
char *resolution = argv[i+1];
@@ -373,7 +373,7 @@
} else if(strcmp("-s", argv[i]) == 0) {
display_scale_factor = atof(argv[i+1]);
i++;
- } else if(strcmp("-window-id", argv[i]) == 0) {
+ } else if(strcmp("-window-id", argv[i]) == 0 || strcmp("--window-id", argv[i]) == 0) {
wid = strtol(argv[i+1], (char **) NULL, 0);
i++;
} else {

View File

@ -1,6 +1,6 @@
Name: gluqlo Name: gluqlo
Version: 1.1.20211231git Version: 1.1.20211231git
Release: 1mamba Release: 2mamba
Summary: A SDL remake of well-known awesome Fliqlo screensaver Summary: A SDL remake of well-known awesome Fliqlo screensaver
Group: Graphical Desktop/Look 'n' feel/Screensavers Group: Graphical Desktop/Look 'n' feel/Screensavers
Vendor: openmamba Vendor: openmamba
@ -8,6 +8,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/alexanderk23/gluqlo URL: https://github.com/alexanderk23/gluqlo
Source: https://github.com/alexanderk23/gluqlo.git/master/gluqlo-%{version}.tar.bz2 Source: https://github.com/alexanderk23/gluqlo.git/master/gluqlo-%{version}.tar.bz2
Patch0: gluqlo-1.1.20211231git-xscreensaver-6.06.patch
License: ISC License: ISC
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -35,6 +36,7 @@ Gluqlo (or Глюкало, if you prefer) is a SDL remake of well-known awesome
%prep %prep
%setup -q %setup -q
%patch 0 -p1
sed -i "s|-o root||" Makefile sed -i "s|-o root||" Makefile
sed -i "s|/usr/share/xscreensaver/config|%{_sysconfdir}/xscreensaver|" Makefile sed -i "s|/usr/share/xscreensaver/config|%{_sysconfdir}/xscreensaver|" Makefile
sed -i "s|/usr/lib|%{_libexecdir}|" Makefile gluqlo.desktop sed -i "s|/usr/lib|%{_libexecdir}|" Makefile gluqlo.desktop
@ -60,6 +62,9 @@ sed -i "/strip gluqlo/d" Makefile
%doc LICENSE %doc LICENSE
%changelog %changelog
* Mon Mar 27 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.20211231git-2mamba
- patch for xscreensaver 6.06 to accept e.g. --root argument in addition to -root
* Fri Dec 31 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.20211231git-1mamba * Fri Dec 31 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.20211231git-1mamba
- update to 1.1.20211231git - update to 1.1.20211231git