[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: cc3569c8e3e15c1010057998a0a2384122aded08
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Jun 18 17:58:21 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Jun 18 18:56:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3569c8
x11-misc/xscreensaver: add 6.09
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/xscreensaver-6.09.ebuild | 278 +
2 files changed, 279 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 141e72c223b5..2db8901a2ef2 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -2,3 +2,4 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B
48c2766ff5879b77f521d
DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834
BLAKE2B
57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4
SHA512
6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B
b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221
SHA512
abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B
1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d
SHA512
a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
+DIST xscreensaver-6.09.tar.gz 22026182 BLAKE2B
34e3bf5b3affbfc6ef0aabaf9889c4b76ce27b09974d6c84a9b342b2267a3268fa1558a9bf0e0e487fce84ef218c3152fca4216268e15e40f82fef91021160da
SHA512
6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653
diff --git a/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
new file mode 100644
index ..c2860219b766
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas systemd
xdg-utils
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="
+ https://www.jwz.org/xscreensaver/${P}.tar.gz
+ logind-idle-hint? (
+
https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch
->
+ ${PN}-6.06-logind-idle-hint.patch
+ )
+ systemd? (
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+ )
+"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login
offensive pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+ gles? ( !glx )
+ ?? ( elogind systemd )
+ pam? ( locking )
+ logind-idle-hint? ( || ( elogind systemd ) )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/libxml2-2.4.6
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ >=x11-libs/gtk+-3.0.0:3
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ virtual/glu
+ virtual/opengl
+ pam? ( sys-libs/pam )
+ media-libs/libpng:=
+ systemd? ( >=sys-apps/systemd-221:= )
+ >=x11-libs/libXft-2.1.0
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 34a3b94caa3bf612c61d7602d26a7bed5e6016f8
Author: Petr Vaněk gentoo org>
AuthorDate: Mon May 13 11:32:37 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Mon May 13 11:43:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a3b94c
x11-misc/xscreensaver: Fix indentation
->
Signed-off-by: Petr Vaněk gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-6.08.ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 2134da5a04c9..5c68ad4c01cd 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
${PN}-6.06-logind-idle-hint.patch
)
systemd? (
-
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
)
"
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index a044a8b3bf9b..27af9731dff7 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
${PN}-6.06-logind-idle-hint.patch
)
systemd? (
-
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
)
"
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
index 2134da5a04c9..5c68ad4c01cd 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
${PN}-6.06-logind-idle-hint.patch
)
systemd? (
-
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
)
"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
commit: c7fe6837c7b82a622816002ae1dd4e0ad514a014 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon May 6 16:49:17 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon May 6 18:30:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fe6837 x11-misc/xscreensaver: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../xscreensaver-6.05-configure-exit-codes.patch | 29 -- ...6-service-remove-Alias-org.jwz.xscreensav.patch | 18 -- ...service-start-xscreensaver-with-no-splash.patch | 21 3 files changed, 68 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch deleted file mode 100644 index a8ef464d2db0.. --- a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch +++ /dev/null @@ -1,29 +0,0 @@ -The configure scripts exits on a non zero exit code even with a warning. Even -though for upstream this is just a warning, for portage this means failure and -it will exit. -We therefore alter the exit codes where neccesary. - a/configure.ac -+++ b/configure.ac -@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then - else - warnL "The GTK libraries do not seem to be available; the" - warn2 "\`xscreensaver-settings' program requires them." --CONF_STATUS=1 - # echo '' - # warn2 'You can use Motif or Lesstif instead of GTK (use the' - # warn2 "\`--with-motif' option) but that is NOT recommended." -@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then - warn "GTK is being used, but the GDK-Pixbuf library and/or" - warn2 "headers were not found. That can't be good. Please" - warn2 "install the GDK-Pixbuf development kit and re-configure." -- CONF_STATUS=1 - fi - - if test "$have_motif" = yes -a "$have_lesstif" = yes ; then -@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then - - if test "$png_halfassed" = yes ; then halfassery ; fi - warn2 "Many things aren't going to work right." -- CONF_STATUS=1 - fi diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch deleted file mode 100644 index 454a9a7dd6bf.. --- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch +++ /dev/null @@ -1,18 +0,0 @@ -From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Sat, 29 Jul 2023 11:52:22 +0200 -Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver - -$ systemctl --user enable xscreensaver -Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver. a/driver/xscreensaver.service.in -+++ b/driver/xscreensaver.service.in -@@ -14,5 +14,4 @@ Restart=on-failure - OOMScoreAdjust=-1000 - - [Install] --Alias=org.jwz.xscreensaver - WantedBy=default.target --- -2.41.0 - diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch deleted file mode 100644 index ec4f85d373f9.. --- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Sat, 29 Jul 2023 11:51:45 +0200 -Subject: xscreensaver.service: start xscreensaver with --no-splash - -Prevents the splash screen being shown when the user logs in. - a/driver/xscreensaver.service.in -+++ b/driver/xscreensaver.service.in -@@ -9,7 +9,7 @@ ConditionUser=!@system - Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver org.xfce.ScreenSaver light-locker - - [Service] --ExecStart=/usr/bin/xscreensaver -+ExecStart=/usr/bin/xscreensaver --no-splash - Restart=on-failure - OOMScoreAdjust=-1000 - --- -2.41.0 -
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
commit: dbb5b85606e7b84f798ff349b84b864101f8c1c4
Author: Florian Schmaus gentoo org>
AuthorDate: Sun May 5 09:32:01 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun May 5 09:39:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb5b856
x11-misc/xscreensaver: drop old, add 6.08-r1
Drop a few old xscreensaver release and add 6.08-r1 that re-enables a
bunch of patches that were previously commented out starting with 6.06,
likely by accident in a4ee1e6e498f ("x11-misc/xscreensaver: add 6.06").
Also drop xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch as
it is now fixed upstream.
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/Manifest | 2 -
.../xscreensaver/files/xscreensaver-5.45-gcc.patch | 16 --
...er-6.05-get-dirs-from-gtk3.0-in-configure.patch | 27 ---
x11-misc/xscreensaver/metadata.xml | 1 -
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 243
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 247 -
...-6.06-r2.ebuild => xscreensaver-6.08-r1.ebuild} | 46 ++--
7 files changed, 29 insertions(+), 553 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index da4b46865a29..141e72c223b5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,4 @@
-DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B
48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682
SHA512
fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
-DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B
f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1
SHA512
988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834
BLAKE2B
57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4
SHA512
6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B
b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221
SHA512
abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B
1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d
SHA512
a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
deleted file mode 100644
index b62fd1f309e3..
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/configure.ac
-+++ b/configure.ac
-@@ -468,11 +468,11 @@
-
- AC_DEFUN([AC_CHECK_GCC_ARG],
- [if test -n "$GCC"; then
-- AC_CACHE_CHECK([whether gcc accepts [$2]],
-+ AC_CACHE_CHECK([whether [$CC] accepts [$2]],
- ac_cv_gcc_accepts_[$1],
- [rm -rf conftest.$ac_ext
- touch conftest.$ac_ext
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
- grep unrecognized >/dev/null ); then
-ac_cv_gcc_accepts_[$1]=no
- else
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
deleted file mode 100644
index 4147540e1189..
---
a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
-it still gets its directories from GTK+2 which results in an empty prefix
-when GTK+2 is not installed.
-
-Bug: https://bugs.gentoo.org/878875
-
-Signed-off-by: Pascal Jäger
-
a/configure.ac
-+++ b/configure.ac
-@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
-
- GTK_DATADIR=""
- if test "$have_gtk" = yes; then
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/
commit: b79ffd3a3cfdaf089817f5216ec7ea84ae4cd608
Author: Brahmajit Das gmail com>
AuthorDate: Thu Feb 15 19:42:04 2024 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Fri Feb 16 08:19:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79ffd3a
x11-misc/xscreensaver-app: Fix passing argument from incompatible pointer
And update EAPI 7 -> 8
Closes: https://bugs.gentoo.org/924177
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35353
Signed-off-by: Bernard Cafarelli gentoo.org>
.../xscreensaver-app-2.3-gcc14-build-fix.patch | 12 +
.../xscreensaver-app-2.3-r5.ebuild | 51 ++
2 files changed, 63 insertions(+)
diff --git
a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch
b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch
new file mode 100644
index ..533a72386d8c
--- /dev/null
+++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/924177
+--- a/xscreensaver.app.c
b/xscreensaver.app.c
+@@ -116,7 +116,7 @@ void popConfig()
+
+ int main(int argc, char **argv)
+ {
+- unsigned height, width;
++ unsigned short height, width;
+ char *st_command;
+ int status;
+
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild
b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild
new file mode 100644
index ..fd5b64aef202
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
+HOMEPAGE="https://xscreensaverapp.sourceforge.net/";
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ x11-libs/libdockapp
+ x11-libs/libX11
+"
+DEPEND="
+ ${CDEPEND}
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+RDEPEND="
+ ${CDEPEND}
+ x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3-gcc14-build-fix.patch"
+)
+
+src_prepare() {
+ rm configure.in || die
+ cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
+
+ default
+
+ eautoreconf
+}
+
+src_install() {
+ dobin ${MY_PN}
+ dodoc README NEWS ChangeLog TODO AUTHORS
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 8efd4ec2a89c5ffc14303f3a4ea88e5b9248ccc6 Author: Matoro Mahri matoro tk> AuthorDate: Tue Feb 6 17:47:08 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 7 04:44:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efd4ec2 x11-misc/xscreensaver: Stabilize 6.08 ppc64, #922669 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index c15e3022bb97..c6d1c25ae6e8 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: d623758a7373990be04f5ba9f611f0fbce83380f Author: Matoro Mahri matoro tk> AuthorDate: Tue Feb 6 19:05:22 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 7 04:44:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d623758a x11-misc/xscreensaver: Stabilize 6.08 ppc, #922669 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index c6d1c25ae6e8..9d5469427192 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 8d2b381eb9400f686cfad432e9d1c1eca2500a3b Author: Matoro Mahri matoro tk> AuthorDate: Tue Feb 6 21:03:18 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 7 04:44:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2b381e x11-misc/xscreensaver: Stabilize 6.08 sparc, #922669 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 9d5469427192..2134da5a04c9 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: a356739c21d32af73070eef77d85a1b0769111de Author: Sam James gentoo org> AuthorDate: Tue Jan 23 15:06:02 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 15:06:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a356739c x11-misc/xscreensaver: Stabilize 6.08 arm, #922669 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 7068e456cff5..c15e3022bb97 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 5c894f6486cef43722e47879f6daa6791e3ade82 Author: Sam James gentoo org> AuthorDate: Tue Jan 23 06:13:25 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 06:13:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c894f64 x11-misc/xscreensaver: Stabilize 6.08 x86, #922669 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 0b384b84b199..7068e456cff5 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: ab5d9bb98f240994dbc85fb31dd4d1f1214f80f5 Author: Sam James gentoo org> AuthorDate: Tue Jan 23 04:16:13 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 04:16:13 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5d9bb9 x11-misc/xscreensaver: Stabilize 6.08 arm64, #922669 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 8f30aa05d803..0b384b84b199 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: b1ac756b7996ce7ae9c5f1e9fd259057dffbf9f2 Author: Sam James gentoo org> AuthorDate: Tue Jan 23 04:16:12 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 04:16:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ac756b x11-misc/xscreensaver: Stabilize 6.08 amd64, #922669 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 18aa4d663890..8f30aa05d803 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: a691437fcd53a829bb06387e1cbf4236e2319630 Author: Sam James gentoo org> AuthorDate: Mon Jan 8 09:41:02 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 09:42:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691437f x11-misc/xscreensaver: sys-devel/bc -> app-alternatives/bc All of these will be using app-alternatives/bc anyway as they're not calling bc-reference, so make the dep reflect reality. Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 4 ++-- x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 4 ++-- x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 4 ++-- x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 4 ++-- x11-misc/xscreensaver/xscreensaver-6.08.ebuild| 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild index 8b77e00352a5..a5ae58707410 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -72,7 +72,7 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild index 53580375256b..8d3e14908a05 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,7 +73,7 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index f20125544193..fc7dab387fcf 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -77,7 +77,7 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index 968d85f0377e..2134da5a04c9 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -81,7 +81,7 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild index 29fc6c4aacc4..18aa4d663890 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -81,7 +81,7 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig "
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 0fec239c10cb16ce92a5f54d5fccbac5691082a8
Author: Pascal Jäger leimstift de>
AuthorDate: Wed Dec 13 09:20:34 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Dec 13 09:31:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fec239c
x11-misc/xscreensaver: add 6.08
Signed-off-by: Pascal Jäger leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/34263
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/xscreensaver-6.08.ebuild | 279 +
2 files changed, 280 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 86c43483d88b..da4b46865a29 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,3 +3,4 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B
48c2766ff5879b77f521d
DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B
f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1
SHA512
988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834
BLAKE2B
57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4
SHA512
6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B
b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221
SHA512
abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
+DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B
1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d
SHA512
a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
new file mode 100644
index ..29fc6c4aacc4
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas systemd
xdg-utils
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="
+ https://www.jwz.org/xscreensaver/${P}.tar.gz
+ logind-idle-hint? (
+
https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch
->
+ ${PN}-6.06-logind-idle-hint.patch
+ )
+ systemd? (
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+ )
+"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login
offensive pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+ gles? ( !glx )
+ ?? ( elogind systemd )
+ pam? ( locking )
+ logind-idle-hint? ( || ( elogind systemd ) )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/libxml2-2.4.6
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ >=x11-libs/gtk+-3.0.0:3
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ virtual/glu
+ virtual/opengl
+ pam? ( sys-libs/pam )
+ media-libs/libpng:=
+ systemd? ( >=sys-apps/systemd-221 )
+ >=x11-libs/libXft-2.1.0
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+R
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 1d4477bbaa13466cc95ed2d74cabfcd64236eeeb Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:32:25 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:32:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4477bb x11-misc/xscreensaver: Stabilize 6.06-r2 sparc, #913687 Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index cd307300e15d..f20125544193 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 06160c9d8a55df7c08a09ab8199bee8b1d43b0e2 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:29:26 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:29:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06160c9d x11-misc/xscreensaver: Stabilize 6.06-r2 ppc, #913687 Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index 1b2c0aa45163..cd307300e15d 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 49b2aeac21e130a1eb17b751f355ed2219787a81 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:28:53 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:28:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b2aeac x11-misc/xscreensaver: Stabilize 6.06-r2 arm64, #913687 Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index 0a7b4ce1acb2..1b2c0aa45163 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 12352cb47bdd688d7560070279c14970d9ae2e75 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Oct 18 15:41:40 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Oct 18 15:41:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12352cb4 x11-misc/xscreensaver: Stabilize 6.07-r2 ppc, #915838 Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index 2522539b80ea..7dc1d8dd3d9d 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 9743e0d5cea9cece7be7c563ec3af79e2b60f898 Author: Joonas Niilola gentoo org> AuthorDate: Tue Oct 17 07:19:47 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Oct 17 07:20:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9743e0d5 x11-misc/xscreensaver: Stabilize 6.07-r2 x86, #915838 Signed-off-by: Joonas Niilola gentoo.org> x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index e1310acd839a..2522539b80ea 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 8450d14d94adb9154b0c40e0980926720dac8fdc Author: Sam James gentoo org> AuthorDate: Mon Oct 16 12:42:16 2023 + Commit: Sam James gentoo org> CommitDate: Mon Oct 16 12:42:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8450d14d x11-misc/xscreensaver: Stabilize 6.07-r2 amd64, #915838 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index be31229348f9..e1310acd839a 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 5b09976177331f869e588821f7a746c2457b7a58 Author: Sam James gentoo org> AuthorDate: Mon Oct 16 07:11:55 2023 + Commit: Sam James gentoo org> CommitDate: Mon Oct 16 07:11:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b099761 x11-misc/xscreensaver: Stabilize 6.07-r2 arm64, #915838 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index 29fc6c4aacc4..fdb3987c23fe 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 94d7a478f7aca8222a507f02aa2a9207f46768bb Author: Sam James gentoo org> AuthorDate: Mon Oct 16 07:11:56 2023 + Commit: Sam James gentoo org> CommitDate: Mon Oct 16 07:11:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d7a478 x11-misc/xscreensaver: Stabilize 6.07-r2 arm, #915838 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild index fdb3987c23fe..be31229348f9 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -27,7 +27,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 039ff3c0f69b9c4ab2b4a134ec10619d70d5c717
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Sep 14 16:33:28 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Sep 14 16:35:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039ff3c0
x11-misc/xscreensaver: add correct "start with no splash" patch
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
...reensaver-6.07.ebuild => xscreensaver-6.07-r2.ebuild} | 16
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a615956c98d6..86c43483d88b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1,5 @@
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B
48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682
SHA512
fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B
f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1
SHA512
988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
+DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834
BLAKE2B
57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4
SHA512
6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B
b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221
SHA512
abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
similarity index 93%
rename from x11-misc/xscreensaver/xscreensaver-6.07.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 3865df2da794..29fc6c4aacc4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -13,6 +13,10 @@ SRC_URI="
https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch
->
${PN}-6.06-logind-idle-hint.patch
)
+ systemd? (
+
https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch
->
+
${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+ )
"
# Font license mapping for folder ./hacks/fonts/ as following:
@@ -111,10 +115,14 @@ src_prepare() {
sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
- # Causes "Failed to enable unit: Cannot alias xscreensaver.service as
org.jwz.xscreensaver."
- # after "systemctl --user enable xscreensaver".
- sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
-driver/xscreensaver.service.in || die
+ if use systemd; then
+ # Causes "Failed to enable unit: Cannot alias
xscreensaver.service as org.jwz.xscreensaver."
+ # after "systemctl --user enable xscreensaver".
+ sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
+ driver/xscreensaver.service.in || die
+
+ eapply
"${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch"
+ fi
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: eb509bc20f46141f224c8cacc281fd39b1188dd4
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Sep 14 16:21:37 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Sep 14 16:21:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb509bc2
Revert "x11-misc/xscreensaver: restore patch as sed"
This reverts commit c6fb4d972e18d8896afde8cea1a8a7491245ed01.
I was being stupid. The patch was accepted upstream and is now no longer
required.
Signed-off-by: Florian Schmaus gentoo.org>
.../{xscreensaver-6.07-r1.ebuild => xscreensaver-6.07.ebuild} | 3 ---
1 file changed, 3 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.07.ebuild
index 99be42b610bc..3865df2da794 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -116,9 +116,6 @@ src_prepare() {
sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
driver/xscreensaver.service.in || die
- sed -i -e 's/ --no-splash//' \
-driver/xscreensaver.service.in || die
-
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: c6fb4d972e18d8896afde8cea1a8a7491245ed01
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Sep 14 16:06:37 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Sep 14 16:06:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6fb4d97
x11-misc/xscreensaver: restore patch as sed
Restore the
xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
applied to 6.06 as sed for 6.07 (and onwards).
Signed-off-by: Florian Schmaus gentoo.org>
.../{xscreensaver-6.07.ebuild => xscreensaver-6.07-r1.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.07.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
index 3865df2da794..99be42b610bc 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r1.ebuild
@@ -116,6 +116,9 @@ src_prepare() {
sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
driver/xscreensaver.service.in || die
+ sed -i -e 's/ --no-splash//' \
+driver/xscreensaver.service.in || die
+
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
commit: f73e2ad77fa967a476736c8d42d0a71698ffe347 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Sep 13 12:24:35 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Sep 13 18:42:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73e2ad7 x11-misc/xscreensaver: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32754 Signed-off-by: Conrad Kostecki gentoo.org> ...saver-6.07-service-remove-Alias-org.jwz.xscreensav.patch | 13 - 1 file changed, 13 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch deleted file mode 100644 index 988ab22bff78.. --- a/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch +++ /dev/null @@ -1,13 +0,0 @@ -$ systemctl --user enable xscreensaver -Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver. - -# Pascal Jäger - a/driver/xscreensaver.service.in -+++ b/driver/xscreensaver.service.in -@@ -14,5 +14,4 @@ Restart=on-failure - OOMScoreAdjust=-1000 - - [Install] --Alias=org.jwz.xscreensaver.service - WantedBy=graphical-session.target
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: cd91cebf0dc1cbeeb692e9573f5df56d433cc933
Author: Yixun Lan gentoo org>
AuthorDate: Sat Sep 9 07:19:45 2023 +
Commit: Yixun Lan gentoo org>
CommitDate: Sat Sep 9 07:19:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd91cebf
x11-misc/xscreensaver: fix broken file name
Closes: https://bugs.gentoo.org/913870
Signed-off-by: Yixun Lan gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.07.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
index b70f0a8623b9..3865df2da794 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -221,7 +221,7 @@ src_install() {
if use fonts; then
# Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf} || die
+ rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die
# Do not duplicate font Luxi Mono (of package
media-fonts/font-bh-ttf)
rm -v "${ED}${FONTDIR}"/luximr.ttf || die
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 193ea947caa4cbe902ace8a0b54d91c878d281bb
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Sep 8 12:04:03 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Sep 8 12:04:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193ea947
x11-misc/xscreensaver: fix fonts removal
Closes: https://bugs.gentoo.org/913848
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.07.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
index f163bb2f64b9..b70f0a8623b9 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -221,7 +221,7 @@ src_install() {
if use fonts; then
# Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+ rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf} || die
# Do not duplicate font Luxi Mono (of package
media-fonts/font-bh-ttf)
rm -v "${ED}${FONTDIR}"/luximr.ttf || die
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 1adcb9a24b09d88fb6867c0d3d7d284bc53b9fb8
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Sep 6 10:49:12 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Sep 6 10:50:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1adcb9a2
x11-misc/xscreensaver: restore patch as sed
Restore the the
xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch in form
of sed in xscreensaver's 6.07 ebuild.
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.07.ebuild | 6 ++
1 file changed, 6 insertions(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
index 54e9257d24bc..f163bb2f64b9 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -110,6 +110,12 @@ src_prepare() {
iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die
sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+
+ # Causes "Failed to enable unit: Cannot alias xscreensaver.service as
org.jwz.xscreensaver."
+ # after "systemctl --user enable xscreensaver".
+ sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
+driver/xscreensaver.service.in || die
+
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: b0c684e2e738b135418c214badafa93a7b02ea4c Author: Pascal Jäger leimstift de> AuthorDate: Tue Sep 5 12:29:59 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Sep 6 10:49:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c684e2 x11-misc/xscreensaver: add 6.07 Closes: https://bugs.gentoo.org/894700 Closes: https://bugs.gentoo.org/896440 Closes: https://bugs.gentoo.org/908509 Closes: https://bugs.gentoo.org/912075 Signed-off-by: Pascal Jäger leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/32628 Signed-off-by: Florian Schmaus gentoo.org> x11-misc/xscreensaver/Manifest | 1 + .../files/xscreensaver-6.07-allow-no-pam.patch | 18 ++ .../xscreensaver-6.07-fix-desktop-files.patch | 31 +++ .../xscreensaver/files/xscreensaver-6.07-gcc.patch | 24 ++ ...7-service-remove-Alias-org.jwz.xscreensav.patch | 13 + x11-misc/xscreensaver/xscreensaver-6.07.ebuild | 265 + 6 files changed, 352 insertions(+) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 890c5ea07d5b..a615956c98d6 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,3 +1,4 @@ DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3 DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5 +DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch new file mode 100644 index ..dd2ea676d443 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch @@ -0,0 +1,18 @@ +The use flag combination -pam +locking is not possible with that configure.ac. +Having a pam conf and a /etc/pam.d could be remnants from a previous installation +of pam and don't tell us for sure that the user does not want this. + +Bug: https://bugs.gentoo.org/908509 + +# Pascal Jäger + +--- a/configure.ac b/configure.ac +@@ -4971,7 +4971,6 @@ elif test "$have_pam" = no -a "$enable_locking" = yes ; then + if test -d /etc/pam.d -o -f /etc/pam.conf ; then + warn "Your system seems to have PAM, but PAM is not being used." + warn2 "That is probably not going to work out well." +-CONF_STATUS=1 + fi + fi + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch new file mode 100644 index ..07474aec689b --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch @@ -0,0 +1,31 @@ +* xscreensaver-settings.desktop: error: value item "Screensaver" in key +* "Categories" in group "Desktop Entry" is a reserved category, so a +* "OnlyShowIn" key must be included +* xscreensaver.desktop: error: value item "Screensaver" in key "Categories" +* in group "Desktop Entry" is a reserved category, so a "OnlyShowIn" key +* must be included + +We just remove the category Screensaver then. + +Bug: https://bugs.gentoo.org/894700 + +# Pascal Jäger + +--- a/driver/xscreensaver-settings.desktop.in b/driver/xscreensaver-settings.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver Settings + _Comment=Change screensaver properties + Type=Application +-Categories=Settings;DesktopSettings;Screensaver;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings ++Categories=Settings;DesktopSettings;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings + Terminal=false +--- a/driver/xscreensaver.desktop.in b/driver/xscreensaver.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 7c7ebf2b41f248018cf1e26dee4279edf1fa2b31 Author: Joonas Niilola gentoo org> AuthorDate: Wed Sep 6 07:13:19 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Sep 6 07:13:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7ebf2b x11-misc/xscreensaver: Stabilize 6.06-r2 amd64, #913687 Signed-off-by: Joonas Niilola gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index e545924d3969..0a7b4ce1acb2 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 66446c3a4563b1936985a0f8e9a1329e7a98e31f Author: Sam James gentoo org> AuthorDate: Wed Sep 6 06:46:39 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 6 06:46:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66446c3a x11-misc/xscreensaver: Stabilize 6.06-r2 x86, #913687 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index 2e7af712c3ff..e545924d3969 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: d7cda1622937220177a4485cdfe27996e4def97f Author: Sam James gentoo org> AuthorDate: Wed Sep 6 06:46:38 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 6 06:46:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7cda162 x11-misc/xscreensaver: Stabilize 6.06-r2 arm, #913687 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index b2788972d72c..2e7af712c3ff 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 5345a4572bc9b95ed1f4a7309cecff1f7694f0ba Author: Sam James gentoo org> AuthorDate: Wed Sep 6 06:46:37 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 6 06:46:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5345a457 x11-misc/xscreensaver: Stabilize 6.06-r2 ppc64, #913687 Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild index f8f1164d0bae..b2788972d72c 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: e9e83b4c602ed4ea444f2ba31e13a06c592de57a
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Aug 15 15:51:06 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Aug 15 15:53:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e83b4c
x11-misc/xscreensaver: add logind-idle-hint USE flag
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/xscreensaver/Manifest| 1 +
x11-misc/xscreensaver/metadata.xml| 1 +
x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 15 +--
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ed7fe38af259..890c5ea07d5b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1,3 @@
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
+DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B
48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682
SHA512
fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B
f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1
SHA512
988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
diff --git a/x11-misc/xscreensaver/metadata.xml
b/x11-misc/xscreensaver/metadata.xml
index 11a85b2711e6..9963b899eb86 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -22,6 +22,7 @@
Emulate OpenGL 1.3 in terms of
OpenGL ES 1.x
Use GLX to interface OpenGL and X11
instead of EGL
Compile in support for locking the
display
+ Send the session idle hint to
logind once the screen saver blanks
Enable user switching support using
gdmflexiserver (x11-misc/lightdm)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index a3b38814fc7b..f8f1164d0bae 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -7,7 +7,13 @@ inherit autotools flag-o-matic font optfeature pam
strip-linguas systemd xdg-uti
DESCRIPTION="Modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/";
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+SRC_URI="
+ https://www.jwz.org/xscreensaver/${P}.tar.gz
+ logind-idle-hint? (
+
https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch
->
+ ${PN}-6.06-logind-idle-hint.patch
+ )
+"
# Font license mapping for folder ./hacks/fonts/ as following:
# clacon.ttf -- MIT
@@ -18,11 +24,12 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts gdm gles glx jpeg +locking new-login offensive pam +perl
selinux suid systemd xinerama"
+IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login
offensive pam +perl selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
?? ( elogind systemd )
pam? ( locking )
+ logind-idle-hint? ( || ( elogind systemd ) )
"
COMMON_DEPEND="
@@ -129,6 +136,10 @@ src_prepare() {
eapply
"${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
fi
+ if use logind-idle-hint; then
+ eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch"
+ fi
+
config_rpath_update "${S}"/config.rpath
# Must be eauto*re*conf, to force the rebuild
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
commit: ca9cc379aca25f6026c1592ac1c311d5a85899a9
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Aug 9 08:30:29 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Aug 9 08:30:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9cc379
x11-misc/xscreensaver: xscreensaver.service fixes
Signed-off-by: Florian Schmaus gentoo.org>
...06-service-remove-Alias-org.jwz.xscreensav.patch | 18 ++
...-service-start-xscreensaver-with-no-splash.patch | 21 +
...r-6.06-r1.ebuild => xscreensaver-6.06-r2.ebuild} | 2 ++
3 files changed, 41 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
new file mode 100644
index ..454a9a7dd6bf
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
@@ -0,0 +1,18 @@
+From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus
+Date: Sat, 29 Jul 2023 11:52:22 +0200
+Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver
+
+$ systemctl --user enable xscreensaver
+Failed to enable unit: Cannot alias xscreensaver.service as
org.jwz.xscreensaver.
+--- a/driver/xscreensaver.service.in
b/driver/xscreensaver.service.in
+@@ -14,5 +14,4 @@ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+ [Install]
+-Alias=org.jwz.xscreensaver
+ WantedBy=default.target
+--
+2.41.0
+
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
new file mode 100644
index ..ec4f85d373f9
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
@@ -0,0 +1,21 @@
+From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus
+Date: Sat, 29 Jul 2023 11:51:45 +0200
+Subject: xscreensaver.service: start xscreensaver with --no-splash
+
+Prevents the splash screen being shown when the user logs in.
+
+--- a/driver/xscreensaver.service.in
b/driver/xscreensaver.service.in
+@@ -9,7 +9,7 @@ ConditionUser=!@system
+ Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver
org.xfce.ScreenSaver light-locker
+
+ [Service]
+-ExecStart=/usr/bin/xscreensaver
++ExecStart=/usr/bin/xscreensaver --no-splash
+ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+--
+2.41.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
similarity index 97%
rename from x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index 48ddc842e1b5..a3b38814fc7b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
+ "${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch
+ "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
)
DOCS=( README{,.hacking} )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 19889d36b05fae14f96eb01ea09b609a5ff708e2
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Jul 27 08:26:34 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jul 27 08:27:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19889d36
x11-misc/xscreensaver: install xscreensaver's systemd user unit
Signed-off-by: Florian Schmaus gentoo.org>
.../{xscreensaver-6.06.ebuild => xscreensaver-6.06-r1.ebuild} | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
similarity index 95%
rename from x11-misc/xscreensaver/xscreensaver-6.06.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
index 02ae75c68a51..48ddc842e1b5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools flag-o-matic font optfeature pam strip-linguas xdg-utils
+inherit autotools flag-o-matic font optfeature pam strip-linguas systemd
xdg-utils
DESCRIPTION="Modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/";
@@ -220,10 +220,13 @@ src_install() {
#if ! use gtk; then
# rm "${ED}/usr/bin/xscreensaver-demo" || die
#fi
- # Makefile installs xscreensaver.service regardless of --without-systemd
- if ! use systemd; then
- rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+ if use systemd; then
+ systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
fi
+ # Makefile installs xscreensaver.service regardless of
+ # --without-systemd, and if USE=systemd, we will have installed the
+ # unit file already.
+ rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
# bug #885989
fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/
commit: 1a7e602e9627ef52f3d6b1ed9d61ec0bf8ed55f2
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Jun 8 09:10:31 2023 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Tue Jun 13 14:15:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7e602e
x11-misc/xscreensaver-app: use HTTPS
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
index 702dcdc35505..3c5d21f8d5fc 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ MY_PN=${MY_PN/xs/XS}
MY_PN=${MY_PN/s/S}
DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
-HOMEPAGE="http://xscreensaverapp.sourceforge.net/";
+HOMEPAGE="https://xscreensaverapp.sourceforge.net/";
SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 22193401fc34ccd8ac8556e4e400cd264336de16
Author: Sam James gentoo org>
AuthorDate: Mon May 29 17:21:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 29 18:19:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22193401
x11-misc/xscreensaver: drop dead prefix targets
Half the patch didn't make sense nowadays anyway as sync() was commented out.
Signed-off-by: Sam James gentoo.org>
.../files/xscreensaver-6.01-interix.patch | 30 --
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 3 +--
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 1 -
x11-misc/xscreensaver/xscreensaver-6.06.ebuild | 1 -
4 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
deleted file mode 100644
index 72aa6535f139..
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru a/driver/prefsw.c b/driver/prefsw.c
a/driver/prefsw.c 2021-02-19 02:52:32.0 +0100
-+++ b/driver/prefsw.c 2021-05-07 15:20:09.280321274 +0200
-@@ -798,7 +798,10 @@
-sure that the bits actually land on the disk right away. */
- /* Update 2020: Apparently here in the future, this sometimes takes
- 3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- /* sync(); */
-+#endif
-
- status = 0;/* wrote and renamed successfully! */
- }
-diff -Nru a/driver/setuid.c b/driver/setuid.c
a/driver/setuid.c 2021-02-05 16:16:23.0 +0100
-+++ b/driver/setuid.c 2021-05-07 15:21:05.987949943 +0200
-@@ -104,9 +104,12 @@
- if (uid == (uid_t) -1) uid = (uid_t) -2;
-
- errno = 0;
-+
-+#ifndef __INTERIX
- if (setgroups_needed_p (gid) &&
- setgroups (1, &gid) < 0)
- sgs_errno = errno ? errno : -1;
-+#endif
-
- errno = 0;
- if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index c724289feed1..8b77e00352a5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,7 +77,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 7dbfa69b04f5..53580375256b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
index 4b4247e5340a..02ae75c68a51 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
@@ -75,7 +75,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: a4ee1e6e498fdb7725bbbf9504badc3700a07973
Author: Pascal Jäger leimstift de>
AuthorDate: Mon Feb 27 20:13:40 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu May 18 10:42:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ee1e6e
x11-misc/xscreensaver: add 6.06
Signed-off-by: Pascal Jäger leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/29842
Signed-off-by: Joonas Niilola gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/xscreensaver-6.06.ebuild | 251 +
2 files changed, 252 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 34ec3cfca174..ed7fe38af259 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1 +1,2 @@
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
+DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B
f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1
SHA512
988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
new file mode 100644
index ..4b4247e5340a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas xdg-utils
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts gdm gles glx jpeg +locking new-login offensive pam +perl
selinux suid systemd xinerama"
+REQUIRED_USE="
+ gles? ( !glx )
+ ?? ( elogind systemd )
+ pam? ( locking )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/libxml2-2.4.6
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ >=x11-libs/gtk+-3.0.0:3
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ virtual/glu
+ virtual/opengl
+ pam? ( sys-libs/pam )
+ media-libs/libpng:=
+ systemd? ( >=sys-apps/systemd-221 )
+ >=x11-libs/libXft-2.1.0
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev-lang/perl
+ dev-perl/libwww-perl
+ virtual/perl-Digest-MD5
+ )
+ selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.01-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-6.01-gentoo.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+ "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+ "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
+# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
+)
+
+DOCS=( README{,.hacking} )
+
+# see https://bugs.gentoo.org/898328
+QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow )
+
+src_prepare() {
+ default
+
+ sed -i configure.ac -e '/^
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 1eb743f3e2ec6f4dbc76715ae1f00f5518bece92
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat May 6 09:34:03 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat May 6 09:34:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb743f3
x11-misc/xscreensaver: Stabilize 6.05-r2 sparc, #904317
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index b3e1caa6d378..7dbfa69b04f5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 776540db6c9990172b700ad320aba39e2de27ce3
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat May 6 09:31:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat May 6 09:31:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776540db
x11-misc/xscreensaver: Stabilize 6.05-r2 ppc64, #904317
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 72010b73beac..b3e1caa6d378 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: cb927f60669128d2501b199d1bb7bba592acc17d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat May 6 09:31:21 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat May 6 09:31:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb927f60
x11-misc/xscreensaver: Stabilize 6.05-r2 ppc, #904317
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index a74cc65e9d6d..72010b73beac 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: c4133900287e6a5327f4c827b696db35429da6b7
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat May 6 09:31:19 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat May 6 09:31:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4133900
x11-misc/xscreensaver: Stabilize 6.05-r2 x86, #904317
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index bddae4a49074..a74cc65e9d6d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 5f28193bb26bbd9f9d9e0f5a13e576eab37bd078
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 16 17:10:01 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 16 17:10:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f28193b
x11-misc/xscreensaver: Stabilize 6.05-r2 amd64, #904317
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 3f8a0f6a37b9..bddae4a49074 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 685982ab604b132595fdb8cafe9993775ea0b926
Author: Sam James gentoo org>
AuthorDate: Fri Apr 14 19:33:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 14 19:33:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685982ab
x11-misc/xscreensaver: Stabilize 6.05-r2 arm64, #904317
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index a8c07d03c410..3f8a0f6a37b9 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: dedfd970f095f3775e8fdd87c1384a22344db334
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Dec 22 18:38:07 2022 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sun Dec 25 22:25:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedfd970
x11-misc/xscreensaver: drop 6.01-r4
Signed-off-by: Ulrich Müller gentoo.org>
x11-misc/xscreensaver/Manifest | 1 -
.../files/xscreensaver-6.01-gtk-detection.patch| 25 ---
x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild | 224 -
3 files changed, 250 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4a0d19e2f771..34ec3cfca174 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
deleted file mode 100644
index 1f70ad29dbb1..
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping
-Date: Sat, 17 Jul 2021 23:50:16 +0200
-Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf
-
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4cb3385..bef0d1e 100644
a/configure.ac
-+++ b/configure.ac
-@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then
- pkg_check_versiongtk+-2.0 2.22.0 ;
ac_gtk_version_string="$vers"
- pkg_check_version gmodule-2.0 2.0.0
- pkg_check_version libxml-2.0 2.4.6
-- pkg_check_version gdk-pixbuf-2.0 2.0.0
-- pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0
- have_gtk="$ok"
-
- if test "$have_gtk" = no; then
---
-2.32.0
-
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
deleted file mode 100644
index f09ec976e77c..
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic font multilib optfeature pam
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/";
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
-
-# Font license mapping for folder ./hacks/fonts/ as following:
-# clacon.ttf -- MIT
-# gallant12x22.ttf -- unclear, hence dropped
-# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
-# OCRAStd.otf -- unclear, hence dropped
-# SpecialElite.ttf -- Apache-2.0
-LICENSE="BSD fonts? ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gtk? ( png )
- opengl? ( png )
- elogind? ( !systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- xft? ( x11-libs/libXft )
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- elogind? ( sys-auth/elogind )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- png? ( media-libs/libpng:= )
- systemd? ( >=sys-apps/systemd-221 )
- xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
-RDEPEND="
- ${COMMON_DEPEND}
- media-gfx/fbida
- perl? (
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: b5830b1917e8736c0b09fa726366c33710852b2d
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 21:05:49 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 21:05:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5830b19
x11-misc/xscreensaver: Stabilize 6.05-r1 x86, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 1475b7e27c39..c724289feed1 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: f4662bc9b410044c7f4a2118efb479b1523d591f
Author: Pascal Jäger leimstift de>
AuthorDate: Thu Dec 15 11:25:01 2022 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Fri Dec 16 20:18:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4662bc9
x11-misc/xscreensaver: revbump, fix bugs
Closes: https://bugs.gentoo.org/885441
Closes: https://bugs.gentoo.org/885479
Closes: https://bugs.gentoo.org/885989
Closes: https://github.com/gentoo/gentoo/pull/28671
Signed-off-by: Pascal Jäger leimstift.de>
Signed-off-by: Sebastian Pipping gentoo.org>
...xscreensaver-6.05-r2-configure-exit-codes.patch | 43
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 248 +
2 files changed, 291 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
new file mode 100644
index ..d69e5965ca2f
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
@@ -0,0 +1,43 @@
+The configure scripts exits on a non zero exit code even with a warning. Even
+though for upstream this is just a warning, for portage this means failure and
+it will exit.
+We therefore alter the exit codes where neccesary.
+
+Bug: https://bugs.gentoo.org/885441
+
+Pascal Jäger (2022-12-15)
+
+--- a/configure.ac
b/configure.ac
+@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+-CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ;
then
+ warn "GTK is being used, but the GDK-Pixbuf library and/or"
+ warn2 "headers were not found. That can't be good. Please"
+ warn2 "install the GDK-Pixbuf development kit and re-configure."
+- CONF_STATUS=1
+ fi
+
+ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
+@@ -4714,7 +4712,6 @@ if test "$have_jpeg" = no ; then
+ warn2 "This means that it won't be possible for the image-manipulating"
+ warn2 "display modes to load files from disk; and it also means that"
+ warn2 "the \`webcollage' program will be much slower."
+-CONF_STATUS=1
+ else
+ warn2 "This means the \`webcollage' program will be much slower."
+ fi
+@@ -4733,7 +4730,6 @@ if test "$have_png" = no ; then
+
+ if test "$png_halfassed" = yes ; then halfassery ; fi
+ warn2 "Many things aren't going to work right."
+- CONF_STATUS=1
+ fi
+
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
new file mode 100644
index ..a8c07d03c410
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
+REQUIRED_USE="
+ gles? ( !glx )
+ ?? ( elogind systemd )
+ gtk? ( gdk-pixbuf )
+ pam? ( locking )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/libxml2-2.4.6
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( >=x11-libs/gtk+-2.22.0:3 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ virtual/glu
+ virtual/opengl
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ >=x11-libs/libXft-2.1.0
+ xinera
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 4cfeb4ce411f847d6d08a8cda6ace7d5390e1531
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 09:13:36 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 09:13:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cfeb4ce
x11-misc/xscreensaver: Stabilize 6.05-r1 sparc, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 41ae2fb3bd1d..1475b7e27c39 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 0d1a10ce2aaf79d6821deda05f664c175aaaef18
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 09:13:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 09:13:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1a10ce
x11-misc/xscreensaver: Stabilize 6.05-r1 amd64, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 3d8d035f7bce..41ae2fb3bd1d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 60b90c0108f4a8674f1851edd77485333480c8c9
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 09:13:22 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 09:13:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b90c01
x11-misc/xscreensaver: Stabilize 6.05-r1 ppc64, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 4edfde9cbb75..2b367eae5411 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 349a341f506ac04e11b94bf48d9a5a38a880ceb5
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 09:13:30 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 09:13:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349a341f
x11-misc/xscreensaver: Stabilize 6.05-r1 arm64, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index ecc01d1c18e1..3d8d035f7bce 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 205e38da04a815da7cbcda59d65e31dede43b90c
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 09:13:24 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 09:13:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205e38da
x11-misc/xscreensaver: Stabilize 6.05-r1 ppc, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 2b367eae5411..ecc01d1c18e1 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 337ef9405441f8833224e949aea4643548812627
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 08:59:51 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 08:59:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337ef940
x11-misc/xscreensaver: Stabilize 6.05-r1 arm, #885103
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index b751510dba2d..4edfde9cbb75 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
gles? ( !glx )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
commit: 012c205505f0ca5f5ba70149f71b3ab762b7f8b2 Author: Pascal Jäger leimstift de> AuthorDate: Tue Nov 1 09:15:46 2022 + Commit: Sam James gentoo org> CommitDate: Wed Nov 2 00:47:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012c2055 x11-misc/xscreensaver: get install dirs from GTK3 instead of GTK2 in configure.ac Closes: https://bugs.gentoo.org/878979 Bug: https://bugs.gentoo.org/878875 Signed-off-by: Pascal Jäger leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/28068 Signed-off-by: Sam James gentoo.org> .../xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch index c624c8046026..4147540e1189 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch @@ -6,9 +6,9 @@ Bug: https://bugs.gentoo.org/878875 Signed-off-by: Pascal Jäger a/configure -+++ b/configure -@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; } +--- a/configure.ac b/configure.ac +@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then GTK_DATADIR="" if test "$have_gtk" = yes; then @@ -17,7 +17,7 @@ Signed-off-by: Pascal Jäger GTK_DATADIR="$GTK_DATADIR/share" fi -@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; } +@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory]) if test -n "$GTK_DATADIR" ; then PO_DATADIR="$GTK_DATADIR" elif test "$have_gtk" = yes; then
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
commit: 964a1629b70ecd13442bf87c7db23ac3b5752c17
Author: Pascal Jäger leimstift de>
AuthorDate: Mon Oct 31 16:31:22 2022 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Oct 31 17:32:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964a1629
x11-misc/xscreensaver: revbump, get install dirs from GTK3 instead of GTK2
Closes: https://bugs.gentoo.org/878875
Signed-off-by: Pascal Jäger leimstift.de>
Signed-off-by: Ulrich Müller gentoo.org>
...er-6.05-get-dirs-from-gtk3.0-in-configure.patch | 27 ++
...ver-6.05.ebuild => xscreensaver-6.05-r1.ebuild} | 1 +
2 files changed, 28 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
new file mode 100644
index ..c624c8046026
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
@@ -0,0 +1,27 @@
+Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
+it still gets its directories from GTK+2 which results in an empty prefix
+when GTK+2 is not installed.
+
+Bug: https://bugs.gentoo.org/878875
+
+Signed-off-by: Pascal Jäger
+
+--- a/configure
b/configure
+@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; }
+
+ GTK_DATADIR=""
+ if test "$have_gtk" = yes; then
+-GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ GTK_DATADIR="$GTK_DATADIR/share"
+ fi
+
+@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; }
+ if test -n "$GTK_DATADIR" ; then
+ PO_DATADIR="$GTK_DATADIR"
+ elif test "$have_gtk" = yes; then
+- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ PO_DATADIR="$PO_DATADIR/share"
+ fi
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.05.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 9a1a99c055ec..b751510dba2d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
"${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
)
DOCS=( README{,.hacking} )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 81d422e579e350c81d08dd50b1e1b63d6783fae1
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Oct 31 09:23:10 2022 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Oct 31 09:23:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d422e5
x11-misc/xscreensaver: Fix path for removal of xscreensaver.service
Closes: https://bugs.gentoo.org/878823
Signed-off-by: Ulrich Müller gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.05.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
index 5e6910a7f3ff..9a1a99c055ec 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
@@ -221,7 +221,7 @@ src_install() {
fi
# Makefile installs xscreensaver.service regardless of --without-systemd
if ! use systemd; then
- rm "${ED}/usr/share/xscreensaver.service" || die
+ rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 79d3bbef1b508c36bf1f88481a9d791098b438cd Author: Pascal Jäger leimstift de> AuthorDate: Sun Oct 16 17:14:35 2022 + Commit: Sam James gentoo org> CommitDate: Sun Oct 30 09:37:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d3bbef x11-misc/xscreensaver: version bump to 6.05 * New patch for handsys manners * Building with USE="-opengl" is not supported anymore * Also added a patch for -gtk builds, set GTK_SHAREDIR because when build with USE="-gtk" it is not set and then installs .service file into / * Building with USE="-xft" is not supported anymore * Delete .service file when USE="-systemd" Closes: https://bugs.gentoo.org/869218 Closes: https://bugs.gentoo.org/851057 Closes: https://bugs.gentoo.org/834593 Closes: https://bugs.gentoo.org/851834 Closes: https://bugs.gentoo.org/830777 Signed-off-by: Pascal Jäger leimstift.de> Signed-off-by: Sam James gentoo.org> x11-misc/xscreensaver/Manifest | 1 + .../xscreensaver-6.05-configure-exit-codes.patch | 29 +++ ...screensaver-6.05-remove-update-icon-cache.patch | 13 ++ ...creensaver-6.05-teach-handsy-some-manners.patch | 42 x11-misc/xscreensaver/metadata.xml | 9 +- x11-misc/xscreensaver/xscreensaver-6.05.ebuild | 243 + 6 files changed, 336 insertions(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index cb133020e650..fd4388280ff6 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -2,3 +2,4 @@ DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156 DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630 DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b SHA512 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071 +DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch new file mode 100644 index ..a8ef464d2db0 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch @@ -0,0 +1,29 @@ +The configure scripts exits on a non zero exit code even with a warning. Even +though for upstream this is just a warning, for portage this means failure and +it will exit. +We therefore alter the exit codes where neccesary. + +--- a/configure.ac b/configure.ac +@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +-CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then + warn "GTK is being used, but the GDK-Pixbuf library and/or" + warn2 "headers were not found. That can't be good. Please" + warn2 "install the GDK-Pixbuf development kit and re-configure." +- CONF_STATUS=1 + fi + + if test "$have_motif" = yes -a "$have_lesstif" = yes ; then +@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then + + if test "$png_halfassed" = yes ; then halfassery ; fi + warn2 "Many things aren't going to work right." +- CONF_STATUS=1 + fi diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch new file mode 100644 index ..7d9ffdfae4d7 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch @@ -0,0 +1,13 @@ +Remove update icon cache as it is a sandbox access violation. +We do this in the ebuild by ourselves instead. + +--- a/driver/Makefile.in b/driver/Makefile.in +@@ -564,7 +564,6 @@
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, profiles/base/
commit: 04d2168265f0c2cbd77529e53cb4d1860a7ab28b
Author: Pascal Jäger leimstift de>
AuthorDate: Sun Oct 16 23:23:15 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 30 09:38:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d21682
x11-misc/xscreensaver: drop old unstable versions
Last stable version 6.01 will be kept around until 6.05 is stabilized
Signed-off-by: Pascal Jäger leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/27807
Signed-off-by: Sam James gentoo.org>
profiles/base/package.use.force | 4 -
x11-misc/xscreensaver/Manifest| 3 -
x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild | 239 -
x11-misc/xscreensaver/xscreensaver-6.03.ebuild| 247 --
x11-misc/xscreensaver/xscreensaver-6.04.ebuild| 247 --
5 files changed, 740 deletions(-)
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 7393b9660566..f19dbdaf80c5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -21,10 +21,6 @@ sys-devel/clang pie
dev-java/openjdk:11 system-bootstrap
dev-java/openjdk:17 system-bootstrap
-# Joonas Niilola (2022-01-08)
-# -xft broken, investigate in bug #830777
-~x11-misc/xscreensaver-6.02 xft
-
# Michał Górny (2021-11-04)
# Enable all LLVM targets unconditionally. Unfortunately, disabling
# targets tend to break reverse dependencies (e.g. Rust) and we are yet
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index fd4388280ff6..4a0d19e2f771 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,5 +1,2 @@
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
-DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B
2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801
SHA512
2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
-DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B
1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce
SHA512
4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
-DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B
42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b
SHA512
7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B
97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3
SHA512
c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
deleted file mode 100644
index b7f191412b75..
--- a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic font optfeature pam strip-linguas
-
-DESCRIPTION="Modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/";
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
-
-# Font license mapping for folder ./hacks/fonts/ as following:
-# clacon.ttf -- MIT
-# gallant12x22.ttf -- unclear, hence dropped
-# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
-# OCRAStd.otf -- unclear, hence dropped
-# SpecialElite.ttf -- Apache-2.0
-LICENSE="BSD fonts? ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gles? ( !glx opengl )
- glx? ( opengl )
- gtk? ( png )
- opengl? ( png )
- ?? ( elogind systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- elogind? ( sys-auth/elogind
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 3213e6cf6f996c1760507d74ffb32a3e194ee54b
Author: WANG Xuerui gentoo org>
AuthorDate: Sun Aug 28 03:53:25 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sun Aug 28 05:05:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3213e6cf
x11-misc/xscreensaver: keyword 6.04 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
index 36935a41808b..300a5d4c25c8 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 40f40f85ca43ec85befde4b0c4154f72405ba7cd
Author: Yixun Lan gentoo org>
AuthorDate: Sat Jul 30 05:20:50 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Sat Jul 30 05:21:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f40f85
x11-misc/xscreensaver: keyword 6.04 for ~riscv
Signed-off-by: Yixun Lan gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
index 630db4ff3676..36935a41808b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 9dc2fca5832c9bac665bc3d0eeb9e6383eabf958
Author: Sam James gentoo org>
AuthorDate: Tue May 31 03:25:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue May 31 03:29:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc2fca5
x11-misc/xscreensaver: add 6.04
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/xscreensaver-6.04.ebuild | 247 +
2 files changed, 248 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index bf490a517284..cb133020e650 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,4 @@
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B
2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801
SHA512
2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B
1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce
SHA512
4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
+DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B
42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b
SHA512
7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
new file mode 100644
index ..630db4ff3676
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ gles? ( !glx opengl )
+ glx? ( opengl )
+ gtk? ( png )
+ opengl? ( png )
+ ?? ( elogind systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ xft? ( x11-libs/libXft )
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev-lang/perl
+ dev-perl/libwww-perl
+ virtual/perl-Digest-MD5
+ )
+ selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.01-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-6.01-gentoo.patch
+ "${FILESDIR}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 6566d4988d100cbbfb4fec194576e69bc53d7386
Author: Hank Leininger korelogic com>
AuthorDate: Fri Mar 4 18:34:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 12 00:09:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6566d498
x11-misc/xscreensaver: fix configure with USE=-opengl
Deliberately disabling opengl became a fatal error in configure.
Signed-off-by: Hank Leininger korelogic.com>
Closes: https://bugs.gentoo.org/834582
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24404
Signed-off-by: Sam James gentoo.org>
.../files/xscreensaver-6.03-without-gl-configure.patch| 11 +++
x11-misc/xscreensaver/xscreensaver-6.03.ebuild| 1 +
2 files changed, 12 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
new file mode 100644
index ..9d741072f4e1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
@@ -0,0 +1,11 @@
+diff -urP xscreensaver-6.03.orig/configure.ac xscreensaver-6.03/configure.ac
+--- xscreensaver-6.03.orig/configure.ac2022-03-04 11:23:24.415172769
-0700
xscreensaver-6.03/configure.ac 2022-03-04 11:27:40.419205257 -0700
+@@ -4737,7 +4737,6 @@
+ CONF_STATUS=1
+ elif test "$with_gl_req" = no ; then
+ noteL 'The OpenGL 3D library is not being used.'
+-CONF_STATUS=1
+ else
+ noteL 'The OpenGL 3D library was not found.'
+ CONF_STATUS=1
diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
index 815313c79b32..c56932d1468c 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+ "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
)
DOCS=( README{,.hacking} )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
commit: 4ee76047540b02174ea9e096e1aaded1d285e8cd Author: Sam James gentoo org> AuthorDate: Sat Mar 12 00:10:26 2022 + Commit: Sam James gentoo org> CommitDate: Sat Mar 12 00:10:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee76047 x11-misc/xscreensaver: add USE=-opengl patch annotation Signed-off-by: Sam James gentoo.org> .../xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch index 9d741072f4e1..e1996291bd3a 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch @@ -1,4 +1,5 @@ -diff -urP xscreensaver-6.03.orig/configure.ac xscreensaver-6.03/configure.ac +Upstream don't support this anymore (https://github.com/gentoo/gentoo/pull/24404#issuecomment-1061128526) +but it's a trivial patch so let's keep it going for now. --- xscreensaver-6.03.orig/configure.ac2022-03-04 11:23:24.415172769 -0700 +++ xscreensaver-6.03/configure.ac 2022-03-04 11:27:40.419205257 -0700 @@ -4737,7 +4737,6 @@
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: b887ea634405c3eb4c1b1eafca48da5c3b220c5b
Author: Sam James gentoo org>
AuthorDate: Wed Mar 2 00:07:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 2 02:19:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b887ea63
x11-misc/xscreensaver: add 6.03
Closes: https://bugs.gentoo.org/830914
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/xscreensaver-6.03.ebuild | 246 +
2 files changed, 247 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 696909ec57ea..bf490a517284 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1,3 @@
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B
2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801
SHA512
2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
+DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B
1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce
SHA512
4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
new file mode 100644
index ..815313c79b32
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ gles? ( !glx opengl )
+ glx? ( opengl )
+ gtk? ( png )
+ opengl? ( png )
+ ?? ( elogind systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( virtual/jpeg:0 )
+ locking? ( virtual/libcrypt:= )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ xft? ( x11-libs/libXft )
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev-lang/perl
+ dev-perl/libwww-perl
+ virtual/perl-Digest-MD5
+ )
+ selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.01-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-6.01-gentoo.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+ "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+ "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+ "${FILESDIR}"/${PN}-6.01-configu
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/
commit: 3595f8f712cb02259982bdb886e1a8b77a29ea7b Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Feb 24 23:42:19 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Feb 24 23:42:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3595f8f7 x11-misc/xscreensaver-app: add myself as maintainer This is a Window Maker dockapp, adding to the list of dockapps I maintain Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> x11-misc/xscreensaver-app/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml index 1ee12ef30cb1..b411a863a98f 100644 --- a/x11-misc/xscreensaver-app/metadata.xml +++ b/x11-misc/xscreensaver-app/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + voyag...@gentoo.org + Bernard Cafarelli + xscreensaverapp
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/
commit: e62c30f5fc775313a4584b771696b38c6ac66e5a
Author: Jonas Stein gentoo org>
AuthorDate: Sun Feb 20 22:16:10 2022 +
Commit: Jonas Stein gentoo org>
CommitDate: Sun Feb 20 22:16:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62c30f5
x11-misc/xscreensaver-app: drop unused eclass: toolchain-funcs
drop unused eclass: toolchain-funcs
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Stein gentoo.org>
x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
index 9b0667e303b8..702dcdc35505 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools toolchain-funcs
+inherit autotools
MY_PN=${PN/-a/.A}
MY_PN=${MY_PN/xs/XS}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/
commit: 42f6d1c2f1c78c87e1a8400aa50884caa051c813 Author: Jonas Stein gentoo org> AuthorDate: Sun Feb 20 22:17:03 2022 + Commit: Jonas Stein gentoo org> CommitDate: Sun Feb 20 22:17:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f6d1c2 x11-misc/xscreensaver-app: drop project desktop-misc Drop project desktop-misc from the list of maintainers. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jonas Stein gentoo.org> x11-misc/xscreensaver-app/metadata.xml | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml index 1e8fc45040d0..1ee12ef30cb1 100644 --- a/x11-misc/xscreensaver-app/metadata.xml +++ b/x11-misc/xscreensaver-app/metadata.xml @@ -1,11 +1,8 @@ https://www.gentoo.org/dtd/metadata.dtd";> - -desktop-m...@gentoo.org -Gentoo Desktop Miscellaneous Project - - -xscreensaverapp - + + + xscreensaverapp +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: d4b8c8885e18ab7471ea5a16dd1ae6ce7aef1dfa
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jan 24 04:18:43 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 24 04:18:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b8c888
x11-misc/xscreensaver: remove trailing whitespace
Signed-off-by: Mike Gilbert gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
index 797fa923703d..b7f191412b75 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
@@ -140,7 +140,7 @@ src_configure() {
unset BC_ENV_ARGS #24568
- # Works similarly to -Werror,
+ # Works similarly to -Werror,
#
https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
filter-flags -pedantic-errors
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: a7f8b8253accff6b2734c7e81bf182ae18c5f336
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jan 24 04:10:06 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 24 04:15:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f8b825
x11-misc/xscreensaver: depend on virtual/libcrypt when USE="locking"
Closes: https://bugs.gentoo.org/830815
Signed-off-by: Mike Gilbert gentoo.org>
.../{xscreensaver-6.02.ebuild => xscreensaver-6.02-r1.ebuild}| 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.02.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
index 575d1cd4c43f..797fa923703d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
@@ -45,6 +45,7 @@ COMMON_DEPEND="
)
gtk? ( x11-libs/gtk+:2 )
jpeg? ( virtual/jpeg:0 )
+ locking? ( virtual/libcrypt:= )
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 107fa148a3aa88d8ecf85236c1c526e18ec5938e
Author: Anna Vyalkova sysrq in>
AuthorDate: Sat Jan 8 12:41:01 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Jan 8 12:49:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107fa148
x11-misc/xscreensaver: add 6.02
Closes: https://bugs.gentoo.org/822372
Closes: https://bugs.gentoo.org/828869
Closes: https://bugs.gentoo.org/811885
Closes: https://bugs.gentoo.org/809599
Signed-off-by: Anna Vyalkova sysrq.in>
Signed-off-by: Joonas Niilola gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
x11-misc/xscreensaver/metadata.xml | 2 +
x11-misc/xscreensaver/xscreensaver-6.02.ebuild | 238 +
3 files changed, 241 insertions(+)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b90a0a6ec0d8..696909ec57ea 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1 +1,2 @@
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
+DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B
2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801
SHA512
2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
diff --git a/x11-misc/xscreensaver/metadata.xml
b/x11-misc/xscreensaver/metadata.xml
index 41a55d69ca62..e6446e8ce0e8 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -12,6 +12,8 @@
Install the fonts shipped with XScreenSaver
that have clear licensing
Include support for the
x11-libs/gdk-pixbuf library in some demos, which will make it
possible for them to read GIF, JPEG, and PNG files as well
Use gdmflexiserver from
gnome-base/gdm instead of x11-misc/lightdm
+ Emulate OpenGL 1.3 in terms of
OpenGL ES 1.x
+ Use GLX to interface OpenGL and X11
instead of EGL
Compile in support for locking the
display
Enable user switching support using
gdmflexiserver (x11-misc/lightdm)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
new file mode 100644
index ..c32955e7c5e9
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login
offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ gles? ( !glx opengl )
+ glx? ( opengl )
+ gtk? ( png )
+ opengl? ( png )
+ elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ virtual/libcrypt:=
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ xft? ( x11-libs/libXft )
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( virtual/jpeg:0 )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 8edede1542bc3b4c4d40470e5caf92461587fe71
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Jan 8 12:41:37 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Jan 8 12:49:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edede15
x11-misc/xscreensaver: 6.02 ebuild enhancements
- remove old cruft, modernise, update deps.
Signed-off-by: Joonas Niilola gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.02.ebuild | 28 +-
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
index c32955e7c5e9..575d1cd4c43f 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools flag-o-matic font multilib optfeature pam
+inherit autotools flag-o-matic font optfeature pam strip-linguas
-DESCRIPTION="modular screen saver and locker for the X Window System"
+DESCRIPTION="Modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/";
SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
@@ -25,20 +25,16 @@ REQUIRED_USE="
glx? ( opengl )
gtk? ( png )
opengl? ( png )
- elogind? ( !systemd )
+ ?? ( elogind systemd )
"
COMMON_DEPEND="
dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
x11-libs/libXext
- xft? ( x11-libs/libXft )
x11-libs/libXi
- x11-libs/libXmu
x11-libs/libXrandr
x11-libs/libXt
x11-libs/libXxf86vm
@@ -52,7 +48,7 @@ COMMON_DEPEND="
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
+ )
opengl? (
virtual/glu
virtual/opengl
@@ -60,6 +56,7 @@ COMMON_DEPEND="
pam? ( sys-libs/pam )
png? ( media-libs/libpng:= )
systemd? ( >=sys-apps/systemd-221 )
+ xft? ( x11-libs/libXft )
xinerama? ( x11-libs/libXinerama )
"
# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
@@ -75,11 +72,13 @@ RDEPEND="
"
DEPEND="
${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
dev-util/intltool
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
- x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-6.01-interix.patch
@@ -140,6 +139,10 @@ src_configure() {
unset BC_ENV_ARGS #24568
+ # Works similarly to -Werror,
+ #
https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
+ filter-flags -pedantic-errors
+
# WARNING: This is NOT a normal autoconf script
# Some of the --with options are NOT standard, and expect "--with-X=no"
rather than "--without-X"
ECONF_OPTS=(
@@ -207,17 +210,14 @@ src_install() {
einstalldocs
if use pam; then
- rm -f "${ED}/etc/pam.d/xscreensaver" # install our version
instead
fperms 755 /usr/bin/${PN}
pamd_mimic_system ${PN} auth
fi
# bugs #809599, #828869
if ! use gtk; then
- rm -f "${ED}/usr/bin/xscreensaver-demo"
+ rm "${ED}/usr/bin/xscreensaver-demo" || die
fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: e79eb8610ca7d5eb37a5759fbdf86181a802ed57
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Sep 10 20:39:00 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Sep 10 20:53:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79eb861
x11-misc/xscreensaver: remove empty font directory
Font cache regen will attempt to create fonts/xscreensaver/.uuid
even if there is no fonts installed leading to sandbox violations
in other packages.
Revbump to ensure directory is removed if someone still hasn't
done a cache update.
Closes: https://bugs.gentoo.org/812473
Signed-off-by: Ionen Wolkens gentoo.org>
.../{xscreensaver-6.01-r3.ebuild => xscreensaver-6.01-r4.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
index 8c8130dd18d..f09ec976e77 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
@@ -197,6 +197,7 @@ src_install() {
font_xfont_config
else
rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+ rmdir -v "${ED}${FONTDIR}" || die #812473
fi
dodoc README{,.hacking}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 39272b109329f6eb7dc4b1bd217cfcccdcda8b96
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Sep 5 05:14:32 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Sep 5 05:14:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39272b10
x11-misc/xscreensaver: Remove old 5.45
Bug: https://bugs.gentoo.org/810679
Signed-off-by: Jakov Smolić gentoo.org>
x11-misc/xscreensaver/Manifest | 1 -
.../xscreensaver-5.44-blurb-hndl-test-passwd.patch | 10 --
.../files/xscreensaver-5.44-gentoo.patch | 47 --
.../xscreensaver-5.45-configure.ac-sandbox.patch | 146 --
.../files/xscreensaver-5.45-cve-2021-34557.patch | 40 -
.../files/xscreensaver-5.45-interix.patch | 32
...xscreensaver-5.45-remove-libXxf86misc-dep.patch | 49 --
x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild | 169 -
8 files changed, 494 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 237089b7aff..b90a0a6ec0d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B
132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880
SHA512
1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B
b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052
SHA512
3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
deleted file mode 100644
index cf95cf105b0..000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -69,6 +69,7 @@
- char *timestring (time_t when) { return ""; }
-
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
-
- void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
deleted file mode 100644
index 279a19cf638..000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:random
- *timeout: 0:10:00
- *cycle: 0:10:00
--*lockTimeout: 0:00:00
-+*lockTimeout: 0:30:00
- *passwdTimeout: 0:00:30
--*dpmsEnabled: False
-+*dpmsEnabled: True
- *dpmsQuickoffEnabled: False
- *dpmsStandby: 2:00:00
- *dpmsSuspend: 2:00:00
- *dpmsOff: 4:00:00
--*grabDesktopImages: True
-+*grabDesktopImages: False
- *grabVideoFrames: False
- *chooseRandomImages: @DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
- *nice:10
- *memoryLimit: 0
--*lock:False
-+*lock:True
- *verbose: False
- *timestamp: True
- *fade:True
-@@ -63,7 +63,7 @@
- *textLiteral: XScreenSaver
- *textFile:@DEFAULT_TEXT_FILE@
- *textProgram: fortune
--*textURL:
https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL: https://planet.gentoo.org/rss20.xml
-
- ! When a saver writes an error message to stdout/stderr, it can be printed
- ! on the screen.
-@@ -124,7 +124,8 @@
-
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat: %d-%b-%y (%a); %I:%M %p
-+!*dateFormat: %d-%b-%y (%a); %I:%M %p
-+*dateFormat: %x %X
- ! For day month date:
- ! *dateFormat:%a %b %d, %I:%M %p
- ! To show the time only:
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
deleted file mode 100644
index cee3a30897f..000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping
-Date: Tue, 16 Mar 2021 00:55:54 +0100
-Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
- Gentoo
-
- c
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 9162ea91a95b5a3509823a67a2fc0c561d494c1f
Author: Sam James gentoo org>
AuthorDate: Wed Sep 1 18:29:27 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 1 18:31:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9162ea91
x11-misc/xscreensaver: Stabilize 6.01-r3 arm, #810679
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 7f884228e1a..fe0306db965 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: a5a9eb0e35829afa4d4c22a7f8e981791a90a489
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Aug 28 09:28:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 29 17:52:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a9eb0e
x11-misc/xscreensaver: stable 6.01-r3 for sparc, bug #810679
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index e48fcffa120..7f884228e1a 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 3187b6a6c34956b1bd454c99df9dfcadd66de14e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Aug 29 10:02:29 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Aug 29 10:02:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3187b6a6
x11-misc/xscreensaver: x86 stable wrt bug #810679
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 4c651e4fcb4..e48fcffa120 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 3ab3b775d4f97af4f862d432cc41c32f3ab8128c
Author: Jakov Smolić gentoo org>
AuthorDate: Sat Aug 28 21:00:58 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat Aug 28 21:00:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab3b775
x11-misc/xscreensaver: Remove redundant 5.45 and 6.01 revisions
Signed-off-by: Jakov Smolić gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild | 169 --
x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild | 173 --
x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild | 200 -
x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild | 202 --
4 files changed, 744 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
deleted file mode 100644
index 5f2c0843d64..000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib optfeature pam strip-linguas
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/";
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- caps? ( sys-libs/libcap )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
-RDEPEND="
- ${COMMON_DEPEND}
- media-gfx/fbida
- perl? (
- dev-lang/perl
- dev-perl/libwww-perl
- virtual/perl-Digest-MD5
- )
- selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
- "${FILESDIR}"/${PN}-5.45-interix.patch
- "${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
- "${FILESDIR}"/${PN}-5.44-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.patch
- "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
- "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
-)
-
-src_prepare() {
- sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
- strip-linguas -i po/
- export ALL_LINGUAS="${LINGUAS}"
-
- if use new-login && ! use gdm; then #392967
- sed -i \
- -e "/default_l.*1/s:gdmflexiserver
-ls:${EPREFIX}/usr/libexec/lightdm/&:" \
- configure{,.ac} || die
- fi
-
- default
-
- if ! use offensive; then
- sed -i \
- -e
'/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
- hacks/barcode.c || die
- sed -i \
- -e 's|erect penis|shuffle board|g' \
- -e 's|flaccid penis|flaccid anchor|g' \
- -e 's|vagina|engagement ring|g' \
- -e 's|Penis|Shuttle|g' \
- hacks/glx/glsnake.c || break
- fi
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
- export RPM_PACKAGE_VERSION=no #368025
-
- econf \
- $(use_enable locking) \
- $(use_with caps setcap-hacks) \
- $(use_with gdk-pixbuf pixbuf) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(use_with n
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: afa0d7becea0283492f9cff78123801a1274d1d7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Aug 28 05:36:49 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Aug 28 05:36:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa0d7be
x11-misc/xscreensaver: amd64 stable wrt bug #810679
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index d9c731cc569..4c651e4fcb4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: ac7622186d651f0f3b05a488862feda2eb26d74d
Author: Sam James gentoo org>
AuthorDate: Fri Aug 27 20:04:12 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 27 20:04:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac762218
x11-misc/xscreensaver: Stabilize 6.01-r3 ppc, #810679
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 1a1440fe0c8..d9c731cc569 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 7a2a5ab77029dc89381d3e3119be2da580970d74
Author: Sam James gentoo org>
AuthorDate: Fri Aug 27 20:03:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 27 20:03:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2a5ab7
x11-misc/xscreensaver: Stabilize 6.01-r3 ppc64, #810679
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 609e6c132c7..1a1440fe0c8 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 4bc0d6dbbda9ba1edb52d90a5320f83ef8d61a68
Author: Ulrich Müller gentoo org>
AuthorDate: Sun Jul 25 07:07:51 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sun Jul 25 07:07:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc0d6db
x11-misc/xscreensaver: Replace src_prepare weirdness
Add an AM_PROG_INSTALL_SH line to configure.ac instead.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller gentoo.org>
.../files/xscreensaver-6.01-configure-install_sh.patch | 12
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 14 ++
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
new file mode 100644
index 000..490e32f6817
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/803479
+
+--- a/configure.ac
b/configure.ac
+@@ -1062,6 +1062,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_INSTALL_DIRS
+ AC_PROG_MAKE_SET
++AM_PROG_INSTALL_SH
+
+ # By default, autoconf sets INSTALL_SCRIPT to '${INSTALL_PROGRAM}'.
+ # That's wrong: it should be set to '${INSTALL}', so that one can
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index fc75283e450..609e6c132c7 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic font multilib optfeature pam
DESCRIPTION="modular screen saver and locker for the X Window System"
@@ -87,6 +88,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+ "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
)
src_prepare() {
@@ -125,19 +127,7 @@ src_prepare() {
eapply_user
# Must be eauto*re*conf, to force the rebuild
- # it is NOT an entirely normal autoconf so there is weirdness!
eautoreconf
- eautoheader
-
- # Afterwards, fix the linguas
- # doesn't populate @install_sh@ properly
- # https://bugs.gentoo.org/803479
- # requires LINGUAS to trigger
- sed -i.orig \
- -e "/^install_sh = /s!=.*!= ${S}/install-sh!g" \
- "${S}/po/Makefile.in.in" || die
- grep -e install_sh \
- "${S}/po/Makefile.in.in" || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: f84c3871f3cc3e57f4267ee7bd2208af1c82789f
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Jul 25 05:42:22 2021 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Jul 25 05:42:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84c3871
x11-misc/xscreensaver: packaging fix for LINGUAS & pam.d false positive error
Closes: https://bugs.gentoo.org/803479
Signed-off-by: Robin H. Johnson gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 10eae1bbfe2..fc75283e450 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -125,8 +125,19 @@ src_prepare() {
eapply_user
# Must be eauto*re*conf, to force the rebuild
+ # it is NOT an entirely normal autoconf so there is weirdness!
eautoreconf
eautoheader
+
+ # Afterwards, fix the linguas
+ # doesn't populate @install_sh@ properly
+ # https://bugs.gentoo.org/803479
+ # requires LINGUAS to trigger
+ sed -i.orig \
+ -e "/^install_sh = /s!=.*!= ${S}/install-sh!g" \
+ "${S}/po/Makefile.in.in" || die
+ grep -e install_sh \
+ "${S}/po/Makefile.in.in" || die
}
src_configure() {
@@ -183,7 +194,8 @@ src_compile() {
}
src_install() {
- emake install_prefix="${D}" install
+ use pam && dodir /etc/pam.d/
+ emake install_prefix="${D}" DESTDIR="${D}" install
if use fonts; then
# Do not install fonts with unclear licensing
@@ -200,6 +212,7 @@ src_install() {
dodoc README{,.hacking}
if use pam; then
+ rm -f "${ED}/etc/pam.d/xscreensaver" # install our version
instead
fperms 755 /usr/bin/${PN}
pamd_mimic_system ${PN} auth
fi
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: e8f5f6d4d8baffa3918706dc7ce520cb0b32a3c9
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Jul 23 06:07:36 2021 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Jul 23 06:26:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f5f6d4
x11-misc/xscreensaver: fix compile & automagic build issues
- The RPM configure.ac change was not effective because configure was
not being regenerated.
- Enable /proc OOM Killer detection which might not always build
otherwise.
- Fix automagic linking against: libpng, xft, jpeg because the upstream
configure script isn't pure autoconf:
- USE='-gdk-pixbuf -gtk -png -jpeg -opengl -xft' is now a valid
extremely minimal build!
Signed-off-by: Robin H. Johnson gentoo.org>
x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 220 ++
1 file changed, 220 insertions(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
new file mode 100644
index 000..10eae1bbfe2
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ gtk? ( png )
+ opengl? ( png )
+ elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ virtual/libcrypt:=
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ xft? ( x11-libs/libXft )
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ elogind? ( sys-auth/elogind )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( virtual/jpeg:0 )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ png? ( media-libs/libpng:= )
+ systemd? ( >=sys-apps/systemd-221 )
+ xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep
'::'`
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-gfx/fbida
+ perl? (
+ dev-lang/perl
+ dev-perl/libwww-perl
+ virtual/perl-Digest-MD5
+ )
+ selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.01-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-6.01-gentoo.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+ "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+ "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+ sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+ strip-linguas -i po/
+ export ALL_LINGUAS="${LINGUAS}"
+
+ if use new-login && ! use gdm; then #392967
+ sed -i \
+ -e "/default_l.*1/s:gdmflexiserver
-ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+ configure{,.ac} || die
+ fi
+
+ default
+
+ # We are patching driver/XScreenSaver.ad.in, so let's delete the
+ # header generated from it so that it gets back in sync during build:
+ rm driver/XScreenSaver_ad.h || die
+
+ if ! use offensive; then
+ sed -i \
+ -e
'/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+ hacks/barcode.c || die
+ sed -i \
+ -e 's|erect penis|shuffle board|g' \
+
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: 4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75
Author: Sebastian Pipping gentoo org>
AuthorDate: Sat Jul 17 22:01:27 2021 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Sat Jul 17 22:17:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f17f639
x11-misc/xscreensaver: Fix USE="-gtk" and USE="-gdk-pixbuf"
Closes: https://bugs.gentoo.org/796992
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
.../files/xscreensaver-6.01-gtk-detection.patch| 25 +++
.../files/xscreensaver-6.01-non-gtk-install.patch | 56 ++
x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild | 202 +
3 files changed, 283 insertions(+)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
new file mode 100644
index 000..1f70ad29dbb
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
@@ -0,0 +1,25 @@
+From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Sat, 17 Jul 2021 23:50:16 +0200
+Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf
+
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4cb3385..bef0d1e 100644
+--- a/configure.ac
b/configure.ac
+@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then
+ pkg_check_versiongtk+-2.0 2.22.0 ;
ac_gtk_version_string="$vers"
+ pkg_check_version gmodule-2.0 2.0.0
+ pkg_check_version libxml-2.0 2.4.6
+- pkg_check_version gdk-pixbuf-2.0 2.0.0
+- pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0
+ have_gtk="$ok"
+
+ if test "$have_gtk" = no; then
+--
+2.32.0
+
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
new file mode 100644
index 000..cb8b6e45db2
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
@@ -0,0 +1,56 @@
+From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Sat, 17 Jul 2021 23:44:44 +0200
+Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk
+
+Related to https://bugs.gentoo.org/796992
+---
+ configure.ac | 4
+ driver/Makefile.in | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eaea28..4cb3385 100644
+--- a/configure.ac
b/configure.ac
+@@ -4148,13 +4148,16 @@ fi
+
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
++SETTINGS_PROGRAM_OR_NOT=
+ if test "$have_motif" = yes; then
+ PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm
+ ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ if test "$have_gtk" = yes; then
+ PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk
+ ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+
+
+@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES)
+
+ AC_SUBST(PREFERRED_DEMO_PROGRAM)
+ AC_SUBST(ALL_DEMO_PROGRAMS)
++AC_SUBST(SETTINGS_PROGRAM_OR_NOT)
+ AC_SUBST(SAVER_LIBS)
+ AC_SUBST(MOTIF_LIBS)
+ AC_SUBST(GTK_LIBS)
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index 0e986a9..1877d8a 100644
+--- a/driver/Makefile.in
b/driver/Makefile.in
+@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uidtest-xdpms
test-grab \
+ xdpyinfo test-screenstest-yarandom test-xinput \
+ test-xkb
+
+-EXES = xscreensaver xscreensaver-command xscreensaver-settings
++EXES = xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@
+ UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES = xscreensaver-auth
+ DEMO_EXES = @ALL_DEMO_PROGRAMS@
+--
+2.32.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
new file mode 100644
index 000..628041e77c8
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/";
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+# clacon.ttf -- MIT
+# gallant12x22.ttf -- unclear, hence dropped
+# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
+# OCRAStd.otf -- unclear, hence dropped
+# SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 81207f8a872e28d2fcfcff94499f569b0b070ea1 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jun 28 10:07:21 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Wed Jun 30 10:15:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81207f8a x11-misc/xscreensaver: Update inherit from l10n to strip-linguas Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild | 2 +- x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild | 2 +- x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild index 24e8b6708e0..2b7ec105703 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic l10n multilib optfeature pam +inherit autotools flag-o-matic multilib optfeature pam strip-linguas DESCRIPTION="modular screen saver and locker for the X Window System" HOMEPAGE="https://www.jwz.org/xscreensaver/"; diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild index f1c8ce5b5ec..5f2c0843d64 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic l10n multilib optfeature pam +inherit autotools flag-o-matic multilib optfeature pam strip-linguas DESCRIPTION="modular screen saver and locker for the X Window System" HOMEPAGE="https://www.jwz.org/xscreensaver/"; diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild index a5261c59d14..55cef225034 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic l10n multilib optfeature pam +inherit autotools flag-o-matic multilib optfeature pam strip-linguas DESCRIPTION="modular screen saver and locker for the X Window System" HOMEPAGE="https://www.jwz.org/xscreensaver/";
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: e4689ae7a447c89260df2da4405f5553badb6449
Author: Sam James gentoo org>
AuthorDate: Tue Jun 22 22:00:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 22 22:29:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4689ae7
x11-misc/xscreensaver: add virtual/libcrypt dependency
Needed for upcoming libcrypt migration.
Acked-by: David Seifert gentoo.org>
Reported-by: Ulrich Müller gentoo.org>
Signed-off-by: Sam James gentoo.org>
.../{xscreensaver-5.45-r1.ebuild => xscreensaver-5.45-r4.ebuild} | 1 +
.../{xscreensaver-5.45-r2.ebuild => xscreensaver-5.45-r5.ebuild} | 1 +
.../{xscreensaver-5.45-r3.ebuild => xscreensaver-5.45-r6.ebuild} | 1 +
.../{xscreensaver-6.01.ebuild => xscreensaver-6.01-r1.ebuild}| 1 +
4 files changed, 4 insertions(+)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
index 661463a8b2b..24e8b6708e0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
@@ -20,6 +20,7 @@ COMMON_DEPEND="
>=gnome-base/libglade-2
dev-libs/libxml2
media-libs/netpbm
+ virtual/libcrypt:=
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
index 06ba699be3f..f1c8ce5b5ec 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
@@ -19,6 +19,7 @@ REQUIRED_USE="
COMMON_DEPEND="
dev-libs/libxml2
media-libs/netpbm
+ virtual/libcrypt:=
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild
index 1f4dbf6c5ac..a5261c59d14 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild
@@ -19,6 +19,7 @@ REQUIRED_USE="
COMMON_DEPEND="
dev-libs/libxml2
media-libs/netpbm
+ virtual/libcrypt:=
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild
similarity index 99%
rename from x11-misc/xscreensaver/xscreensaver-6.01.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild
index cd553c08d17..dc3965228e8 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild
@@ -26,6 +26,7 @@ REQUIRED_USE="
COMMON_DEPEND="
dev-libs/libxml2
media-libs/netpbm
+ virtual/libcrypt:=
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: d526e35e80280ba89263a29608788ffcbef0b00a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jun 19 15:28:42 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jun 19 15:29:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d526e35e
x11-misc/xscreensaver: keyworded 5.45-r2 for ia64
keyworded wrt bug #790599
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-6.01.ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
index 22af82cbaec..06ba699be3f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
index 584b0e0ec50..1f4dbf6c5ac 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
index a3c8734ec8e..cd553c08d17 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive
opengl pam +perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
commit: f98fd90d3276407a021879491e05d53b43827c3c
Author: Sebastian Pipping gentoo org>
AuthorDate: Mon Jun 14 10:16:57 2021 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Mon Jun 14 10:18:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98fd90d
x11-misc/xscreensaver: Fix compilation for USE=-opengl
Closes: https://bugs.gentoo.org/795891
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
.../xscreensaver-6.01-without-gl-makefile.patch| 28 ++
x11-misc/xscreensaver/xscreensaver-6.01.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
new file mode 100644
index 000..c98d5297e9b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ $(INSTALL_PROGRAM) $$program $$idir/$$program ; \
+ done ; \
+ \
+- exes="$(SUID_EXES)" ;\
++ exes="@SUID_EXES@" ; \
+ if [ @SETUID_HACKS@ = yes ]; then\
+sinst="$(INSTALL_SETUID)" ;\
+ else \
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
index 98a77ac0e73..a3c8734ec8e 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
commit: 57a31e4b1f4d63318c13dc98cb9dfa8d5e3e5594 Author: Sebastian Pipping gentoo org> AuthorDate: Mon Jun 14 00:42:55 2021 + Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jun 14 00:50:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a31e4b x11-misc/xscreensaver: 6.01 Thanks to José María Fernández González for his help! Closes: https://bugs.gentoo.org/788865 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3 x11-misc/xscreensaver/Manifest | 1 + .../xscreensaver-6.01-configure.ac-sandbox.patch | 120 + .../files/xscreensaver-6.01-gentoo.patch | 47 + .../files/xscreensaver-6.01-interix.patch | 30 x11-misc/xscreensaver/metadata.xml | 1 + x11-misc/xscreensaver/xscreensaver-6.01.ebuild | 198 + 6 files changed, 397 insertions(+) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 2a8cc3823af..237089b7aff 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1 +1,2 @@ DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 +DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch new file mode 100644 index 000..fe56f927e20 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch @@ -0,0 +1,120 @@ +From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 13 Jun 2021 23:41:42 +0200 +Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on + Gentoo + +--- + configure.ac | 96 + 1 file changed, 96 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9b8641e..2eaea28 100644 +--- a/configure.ac b/configure.ac +@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do + done + + +-# Warn if there's a previous RPM package installed. +- +-rpm_vers= +-if test -z "$RPM_PACKAGE_VERSION" ; then +- # Don't bother with this test if we are currently *building* an RPM. +- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras +-xscreensaver-data xscreensaver-data-extra" +- +- # M4 sucks!! +- changequote(X,Y) +- pkg_vers=`(rpm -qv $rpmnames) 2>&- | \ +-sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1` +- rpm_vers="$pkg_vers" +- changequote([,]) +-fi +- +-if test \! -z "$rpm_vers" ; then +- +- # M4 sucks!! +- changequote(A,B) +- pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'` +- pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` +- pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` +- pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` +- +- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi +- changequote([,]) +-fi +- +- +-# Warn if there's a previous Debian package installed. +-# +-deb_vers= +-if test -z "$pkg_vers" ; then +- debnames="xscreensaver xscreensaver-data xscreensaver-data-extra" +- pkg_vers='' +- for dpkg in $debnames ; do +-if test -z "$pkg_vers"; then +- pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'` +- deb_vers="$pkg_vers" +-fi +- done +-fi +- +-if test \! -z "$deb_vers" ; then +- +- # M4 sucks!! +- changequote(A,B) +- pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'` +- pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` +- pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` +- pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'` +- changequote([,]) +- +- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi +-fi +- +-bindir_err= +-hackdir_err= +-confdir_err= +-fontdir_err= +-addi
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
commit: 170a0da988ad903d730ef5ca147570b9d096da90 Author: Sebastian Pipping gentoo org> AuthorDate: Mon Jun 14 00:48:43 2021 + Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jun 14 00:50:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170a0da9 x11-misc/xscreensaver: Drop unused patch Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3 .../xscreensaver-remove-libXxf86misc-dep.patch | 49 -- 1 file changed, 49 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch deleted file mode 100644 index 79ffcd7098c..000 --- a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch +++ /dev/null @@ -1,49 +0,0 @@ -libXxf86misc is the client-side code of an X extension that has not been -supported by the Xserver in more than 10 years. Since xscreensaver's dependency -on it is automagic, we have to patch configure.in to safely remove it. - -https://bugs.gentoo.org/720158 - -diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in xscreensaver.orig/configure.in 2020-05-02 18:09:23.169324761 -0700 -+++ xscreensaver/configure.in 2020-05-02 18:09:52.578233240 -0700 -@@ -104,12 +104,6 @@ - (It's available if the file /usr/include/X11/extensions/XInput.h - exists.)]) - --AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE], -- [Define this if you have the XF86MiscSetGrabKeysState function -- (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key -- sequences to be temporarily disabled. Sadly, it doesn't affect -- Ctrl-Alt-BS or Ctrl-Alt-F1.)]) -- - AH_TEMPLATE([HAVE_RANDR], - [Define this if you have the Resize and Rotate extension. - This is standard on sufficiently-recent XFree86 systems, and -@@ -1888,25 +1882,6 @@ - fi - - --### --# --# Check for XF86MiscSetGrabKeysState (but only bother if we are already --# using other XF86 stuff.) --# --### -- --have_xf86miscsetgrabkeysstate=no --if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then -- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState, --[have_xf86miscsetgrabkeysstate=yes], --[true], -lXext -lX11) -- if test "$have_xf86miscsetgrabkeysstate" = yes ; then --SAVER_LIBS="$SAVER_LIBS -lXxf86misc" --AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE) -- fi --fi -- -- - ### - # - # Check for HP XHPDisableReset and XHPEnableReset. -
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
commit: b2d720ae5fc226fac1e8ce032c4126984b8c377e
Author: Sebastian Pipping gentoo org>
AuthorDate: Sun Jun 13 11:42:23 2021 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Sun Jun 13 11:42:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d720ae
x11-misc/xscreensaver: Drop vulnerable
Bug: https://bugs.gentoo.org/794475
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
x11-misc/xscreensaver/Manifest | 1 -
.../files/xscreensaver-5.05-interix.patch | 32
.../xscreensaver/files/xscreensaver-5.44-gcc.patch | 16 --
x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild | 160
x11-misc/xscreensaver/xscreensaver-5.45.ebuild | 167 -
5 files changed, 376 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f3efd33ba39..2a8cc3823af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B
102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3
SHA512
9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B
132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880
SHA512
1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
deleted file mode 100644
index 2a5eead4879..000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200
-+++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100
-@@ -951,9 +951,12 @@
- {
- p->init_file_date = write_date;
-
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- /* Since the .xscreensaver file is used for IPC, let's try and make
-sure that the bits actually land on the disk right away. */
- sync ();
-+#endif
-
- status = 0;/* wrote and renamed successfully! */
- }
-diff -ru xscreensaver-5.05.orig/driver/setuid.c
xscreensaver-5.05/driver/setuid.c
xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100
-+++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100
-@@ -136,9 +136,12 @@
- if (uid == (uid_t) -1) uid = (uid_t) -2;
-
- errno = 0;
-+
-+#ifndef __INTERIX
- if (setgroups_needed_p (gid) &&
- setgroups (1, &gid) < 0)
- sgs_errno = errno ? errno : -1;
-+#endif
-
- errno = 0;
- if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
deleted file mode 100644
index 16493e1fd1d..000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/configure.in
-+++ b/configure.in
-@@ -468,11 +468,11 @@
-
- AC_DEFUN([AC_CHECK_GCC_ARG],
- [if test -n "$GCC"; then
-- AC_CACHE_CHECK([whether gcc accepts [$2]],
-+ AC_CACHE_CHECK([whether [$CC] accepts [$2]],
- ac_cv_gcc_accepts_[$1],
- [rm -rf conftest.$ac_ext
- touch conftest.$ac_ext
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
- grep unrecognized >/dev/null ); then
-ac_cv_gcc_accepts_[$1]=no
- else
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
deleted file mode 100644
index 12806ff149d..000
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic l10n multilib pam
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/";
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
- >=gnome-base/libglade-2
- dev-libs/libxml2
- media-libs/netpbm
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x1
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 33fb63e5588b764cb2a1d942db58c5d97cbcb860
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jun 13 06:30:15 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jun 13 06:30:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fb63e5
x11-misc/xscreensaver: sparc stable wrt bug #794475
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 190ee871db9..661463a8b2b 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 50c2a5b00eb50bec0c75eaea083014b14ed9e8eb
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jun 13 06:29:07 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jun 13 06:29:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c2a5b0
x11-misc/xscreensaver: ppc64 stable wrt bug #794475
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index f4c5bee8e16..190ee871db9 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: e0a6cd614c641ae46415bb8d8e2fef1b7b666b2b
Author: Sam James gentoo org>
AuthorDate: Sat Jun 12 17:13:35 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 12 17:13:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a6cd61
x11-misc/xscreensaver: Keyword 5.45-r2 arm64, #790599
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
index 2a50c408c54..22af82cbaec 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: d2db6e76954031c626fd6bac054bd6de232037a3
Author: Sam James gentoo org>
AuthorDate: Sat Jun 12 17:13:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 12 17:13:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2db6e76
x11-misc/xscreensaver: Keyword 5.45-r3 arm64, #790599
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
index 28eed4a4ada..584b0e0ec50 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 2fa1096235a5880a0df71b61bcaa60670b572824
Author: Sam James gentoo org>
AuthorDate: Sat Jun 12 16:29:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 12 16:32:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa10962
x11-misc/xscreensaver: Stabilize 5.45-r1 ppc, #794475
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 9e4b229558a..f4c5bee8e16 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: 03abf97d105cd49979377103c28b593737b48b39
Author: Sam James gentoo org>
AuthorDate: Sat Jun 12 16:27:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 12 16:32:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03abf97d
x11-misc/xscreensaver: Stabilize 5.45-r1 x86, #794475
Signed-off-by: Sam James gentoo.org>
x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 2745da3408c..9e4b229558a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux"
IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam
+perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
commit: ce54dffe86110cdbe7304fd464075b562d15a55a Author: Sebastian Pipping gentoo org> AuthorDate: Sat Jun 12 14:47:06 2021 + Commit: Sebastian Pipping gentoo org> CommitDate: Sat Jun 12 14:47:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce54dffe x11-misc/xscreensaver: Drop Glade dependency Closes: https://bugs.gentoo.org/787812 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3 x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild | 1 - x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild index 87f3f15a9cc..2a50c408c54 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild @@ -17,7 +17,6 @@ REQUIRED_USE=" " COMMON_DEPEND=" - >=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild index 0553c002d76..28eed4a4ada 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild @@ -17,7 +17,6 @@ REQUIRED_USE=" " COMMON_DEPEND=" - >=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres
