From 011ffb5214a6813d36a062d20d84514eb441865a Mon Sep 17 00:00:00 2001 From: Sergey-V Markov Date: Sun, 11 Dec 2022 17:02:01 +0300 Subject: [PATCH] init commit --- .gear/predownloaded-development/.keep | 0 .gear/rules | 3 + .gitmodules | 3 + lightdm-webkit2-greeter-3.5.1-basedir.patch | 12 ++ lightdm-webkit2-greeter-3.5.1-makefile.patch | 12 ++ lightdm-webkit2-greeter-3.5.1-opt.patch | 11 ++ lightdm-webkit2-greeter.conf | 35 ++++++ lightdm-webkit2-greeter.spec | 124 +++++++++++++++++++ web-greeter | 1 + 9 files changed, 201 insertions(+) create mode 100644 .gear/predownloaded-development/.keep create mode 100644 .gear/rules create mode 100644 .gitmodules create mode 100644 lightdm-webkit2-greeter-3.5.1-basedir.patch create mode 100644 lightdm-webkit2-greeter-3.5.1-makefile.patch create mode 100644 lightdm-webkit2-greeter-3.5.1-opt.patch create mode 100644 lightdm-webkit2-greeter.conf create mode 100644 lightdm-webkit2-greeter.spec create mode 160000 web-greeter diff --git a/.gear/predownloaded-development/.keep b/.gear/predownloaded-development/.keep new file mode 100644 index 0000000..e69de29 diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..998bbe1 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +tar: .gear/predownloaded-development name=@name@-@version@ base= +copy: *.patch +copy: *.conf diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6034a51 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "web-greeter"] + path = web-greeter + url = https://github.com/JezerM/web-greeter.git diff --git a/lightdm-webkit2-greeter-3.5.1-basedir.patch b/lightdm-webkit2-greeter-3.5.1-basedir.patch new file mode 100644 index 0000000..ed7d640 --- /dev/null +++ b/lightdm-webkit2-greeter-3.5.1-basedir.patch @@ -0,0 +1,12 @@ +diff -uNbBw lightdm-webkit2-greeter-3.5.1/Makefile lightdm-webkit2-greeter-3.5.1-new/Makefile +--- lightdm-webkit2-greeter-3.5.1/Makefile 2022-05-13 18:23:53.182802761 +0000 ++++ lightdm-webkit2-greeter-3.5.1-new/Makefile 2022-05-13 18:22:25.572716017 +0000 +@@ -226,7 +226,7 @@ + $(bin_local/web-greeter): build_install_root $(resources.py) $(bin/screensaver.so) + @rm -rf "${INSTALL_PREFIX}/lib/web-greeter/*" + @cp -R "${BUILD_DIR}/web-greeter"/* "${INSTALL_PREFIX}/lib/web-greeter" +- @printf "#!/usr/bin/env bash\npython3 ${DESTDIR_PREFIX}/lib/web-greeter \$$@" > \ ++ @printf "#!/usr/bin/env bash\npython3 /usr/lib/web-greeter \$$@" > \ + "${bin_local/web-greeter}" + @chmod +x "${bin_local/web-greeter}" + @echo "✔ web-greeter binary copied" diff --git a/lightdm-webkit2-greeter-3.5.1-makefile.patch b/lightdm-webkit2-greeter-3.5.1-makefile.patch new file mode 100644 index 0000000..3fdad6b --- /dev/null +++ b/lightdm-webkit2-greeter-3.5.1-makefile.patch @@ -0,0 +1,12 @@ +diff -uNBbwp lightdm-webkit2-greeter-3.5.1/Makefile lightdm-webkit2-greeter-3.5.1-new/Makefile +--- lightdm-webkit2-greeter-3.5.1/Makefile 2022-04-11 22:18:38.000000000 +0000 ++++ lightdm-webkit2-greeter-3.5.1-new/Makefile 2022-05-10 10:22:31.989055367 +0000 +@@ -219,7 +219,7 @@ bin/screensaver.so := ${BUILD_DIR}/web-g + bin/screensaver.c := ${BUILD_DIR}/web-greeter/bindings/screensaver.c + + $(bin/screensaver.so): $(build/web-greeter) +- @gcc ${bin/screensaver.c} -o ${bin/screensaver.so} -shared -lX11 -lxcb ++ @gcc ${bin/screensaver.c} -o ${bin/screensaver.so} -shared -fpic -lX11 -lxcb + @cp ${bin/screensaver.so} src/bindings/ + @echo "✔ Screensaver.so compiled" + diff --git a/lightdm-webkit2-greeter-3.5.1-opt.patch b/lightdm-webkit2-greeter-3.5.1-opt.patch new file mode 100644 index 0000000..841ba46 --- /dev/null +++ b/lightdm-webkit2-greeter-3.5.1-opt.patch @@ -0,0 +1,11 @@ +diff -uNrBbwp lightdm-webkit2-greeter-3.5.1/dist/web-greeter.desktop lightdm-webkit2-greeter-3.5.1-new/dist/web-greeter.desktop +--- lightdm-webkit2-greeter-3.5.1/dist/web-greeter.desktop 2022-04-11 22:18:38.000000000 +0000 ++++ lightdm-webkit2-greeter-3.5.1-new/dist/web-greeter.desktop 2022-05-14 10:38:14.893467344 +0000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Name=web-greeter +-Exec=/opt/web-greeter/web-greeter %U ++Exec=/usr/bin/web-greeter %U + Terminal=false + Type=Application + StartupWMClass=web-greeter diff --git a/lightdm-webkit2-greeter.conf b/lightdm-webkit2-greeter.conf new file mode 100644 index 0000000..88c2a0a --- /dev/null +++ b/lightdm-webkit2-greeter.conf @@ -0,0 +1,35 @@ +# +# [greeter] +# debug_mode = Greeter theme debug mode. +# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected. +# screensaver_timeout = Blank the screen after this many seconds of inactivity. +# secure_mode = Don't allow themes to make remote http requests. +# time_format = A moment.js format string so the greeter can generate localized time for display. +# time_language = Language to use when displaying the time or "auto" to use the system's language. +# webkit_theme = Webkit theme to use. +# +# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/ +# + +[greeter] +debug_mode = false +detect_theme_errors = true +screensaver_timeout = 300 +secure_mode = true +time_format = LT +time_language = auto +webkit_theme = antergos + +# +# [branding] +# background_images = Path to directory that contains background images for use by themes. +# logo = Path to logo image for use by greeter themes. +# user_image = Default user image/avatar. This is used by themes for users that have no .face image. +# +# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home) +# + +[branding] +background_images = /usr/share/backgrounds +#logo = /usr/share/lightdm-webkit/themes/antergos/img/antergos.png +#user_image = /usr/share/lightdm-webkit/themes/antergos/img/antergos-logo-user.png diff --git a/lightdm-webkit2-greeter.spec b/lightdm-webkit2-greeter.spec new file mode 100644 index 0000000..1383520 --- /dev/null +++ b/lightdm-webkit2-greeter.spec @@ -0,0 +1,124 @@ +Name: lightdm-webkit2-greeter +Version: 3.5.1 +Release: alt1 + +Summary: A modern, visually appealing greeter for LightDM. +License: GPL-3.0 +Group: Graphical desktop/Other +Url: https://github.com/JezerM/web-greeter + +Packager: Sergey Markov + +ExcludeArch: ppc64le + +Requires: lightdm +Provides: lightdm-greeter + +Requires: python3-module-ruamel-yaml python3-module-PyQt5 python3-module-PyQtWebEngine python3-module-pygobject3 liblightdm-gobject +Requires: accountsservice + +Source: %name-%version.tar +Source1: %name.conf + +Patch: lightdm-webkit2-greeter-3.5.1-makefile.patch +Patch1: lightdm-webkit2-greeter-3.5.1-basedir.patch +Patch2: lightdm-webkit2-greeter-3.5.1-opt.patch + + +%add_python3_path %_libdir/web-greeter +%add_python3_req_skip gi.repository.GLib + +BuildRequires(pre): rpm-build-python3 rpm-build-gir + + +# Automatically added by buildreq on Mon May 16 2022 +# optimized out: libgpg-error libqt5-core libqt5-xml libxcb-devel pkg-config python3 python3-base python3-module-PyQt5 python3-module-PyQt5-sip sh4 xorg-proto-devel +BuildRequires: libX11-devel python3-module-PyQt5-devel rsync zsh + +BuildRequires: python3-module-pygobject3-devel python3-module-PyQtWebEngine python3-module-ruamel-yaml +BuildRequires: python3-module-pyinotify qt5-webengine-devel gem-gobject-introspection-devel libxcb-devel +BuildRequires: liblightdm-gobject lightdm-gir-devel lightdm-devel +BuildRequires: bash-completion zsh-completions + + +BuildRequires: /usr/bin/python3 + + +%description +A modern, visually appealing greeter for LightDM, that allows to create web based themes with HTML, CSS and JavaScript. +This is a fork of the Antergos web-greeter that tries to fix and improve this project for a modern and current use. Due to this, some API changes are needed, which implies that current themes would need to do changes to work correctly. +Also, check out nody-greeter, a greeter made in Node.js with Electron! (Actually, faster than Web Greeter) + +%prep +%setup +sed -i 's|\(#\!/usr/bin/env python\)$|\13|' src/bridge/*.py + +%make clean +%patch -p1 +%patch1 -p1 +%patch2 -p1 + + +subst 's,\,%_lib,g' Makefile + + + +%build +#configure +%make + +%install +%makeinstall_std + +install -m 644 %SOURCE1 %buildroot%_sysconfdir/lightdm/ + +#check +#make check + +%files + +%config(noreplace) %_sysconfdir/lightdm/%name.conf + +%_sysconfdir/lightdm/Xgreeter +%_sysconfdir/lightdm/web-greeter.yml +%config(noreplace) %_sysconfdir/xdg/lightdm/lightdm.conf.d/90-greeter-wrapper.conf + +%_bindir/web-greeter + +%dir %_libdir/web-greeter/ +%_libdir/web-greeter/* + +%_datadir/applications/* +%_datadir/bash-completion/* +%_datadir/metainfo/* +%_datadir/web-greeter/* +%_datadir/xgreeters/* +%_datadir/zsh/site-functions/* + +%_docdir/web-greeter/* + +%_man1dir/* +%doc *.md + +%changelog +* Sun Dec 11 2022 Sergey Markov 3.5.1-alt1 +- New version + +* Mon May 16 2022 Hihin Ruslan 3.4.1-alt5 +- Add Requres accountsservice, thanks zerg@ + +* Sun May 15 2022 Hihin Ruslan 3.4.1-alt4 +- Added Spec fix by aris@, thanks to him + +* Sat May 14 2022 Hihin Ruslan 3.4.1-alt3 +- Add lightdm-webkit2-greeter.conf +- Add lightdm-webkit2-greeter-3.4.1-opt.patch + +* Fri May 13 2022 Hihin Ruslan 3.4.1-alt2 +- Add lightdm-webkit2-greeter-3.4.1-basedir.patch + +* Tue May 10 2022 Hihin Ruslan 3.4.1-alt1.3 +- add add_find(prov/req)_skiplist + +* Mon May 09 2022 Hihin Ruslan 3.4.1-alt1 +- Initial build for Sisyphus diff --git a/web-greeter b/web-greeter new file mode 160000 index 0000000..7a7b4a5 --- /dev/null +++ b/web-greeter @@ -0,0 +1 @@ +Subproject commit 7a7b4a56ed770d53163bf55524bad6bf3f5f1998