1 |
commit: 855ec577710c09d97a80fad38c066b41e2eea9fa |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 00:03:14 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 00:03:59 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855ec577 |
7 |
|
8 |
x11-misc/xscreensaver: Version 5.41 |
9 |
|
10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
x11-misc/xscreensaver/Manifest | 1 + |
14 |
.../files/xscreensaver-5.41-comments.patch | 14 ++ |
15 |
x11-misc/xscreensaver/xscreensaver-5.41.ebuild | 142 +++++++++++++++++++++ |
16 |
3 files changed, 157 insertions(+) |
17 |
|
18 |
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest |
19 |
index ba253477cf4..98b087be036 100644 |
20 |
--- a/x11-misc/xscreensaver/Manifest |
21 |
+++ b/x11-misc/xscreensaver/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561 |
24 |
DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7 |
25 |
DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d |
26 |
+DIST xscreensaver-5.41.tar.gz 26903096 BLAKE2B 0a574355cff23d5210c8506844ce3549130fc66e5d0482bdeb618015e92d286ee3b183dd04988e8b8b67b9338e5e1bcd156212b0b37b5176bca72bb8b38dc4f3 SHA512 4be399a70dc3938e1edf9c1d533e082268f43e08a0812a0c639bee63ae07e99cfaefefe4a61acfaa96bb5a57606f910e5793c2c52d8946ea36f00555f8721aa2 |
27 |
|
28 |
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..8cef848ac7b |
31 |
--- /dev/null |
32 |
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch |
33 |
@@ -0,0 +1,14 @@ |
34 |
+--- a/hacks/fontglide.c |
35 |
++++ b/hacks/fontglide.c |
36 |
+@@ -2421,8 +2421,9 @@ |
37 |
+ |
38 |
+ textclient_close (s->tc); |
39 |
+ |
40 |
+-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); |
41 |
+-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); |
42 |
++/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); |
43 |
++/ if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); |
44 |
++*/ |
45 |
+ XFreeGC (dpy, s->bg_gc); |
46 |
+ if (s->charset) free (s->charset); |
47 |
+ if (s->font_override) free (s->font_override); |
48 |
|
49 |
diff --git a/x11-misc/xscreensaver/xscreensaver-5.41.ebuild b/x11-misc/xscreensaver/xscreensaver-5.41.ebuild |
50 |
new file mode 100644 |
51 |
index 00000000000..941a5d01d77 |
52 |
--- /dev/null |
53 |
+++ b/x11-misc/xscreensaver/xscreensaver-5.41.ebuild |
54 |
@@ -0,0 +1,142 @@ |
55 |
+# Copyright 1999-2018 Gentoo Authors |
56 |
+# Distributed under the terms of the GNU General Public License v2 |
57 |
+ |
58 |
+EAPI=7 |
59 |
+inherit autotools desktop flag-o-matic multilib pam |
60 |
+ |
61 |
+DESCRIPTION="A modular screen saver and locker for the X Window System" |
62 |
+HOMEPAGE="https://www.jwz.org/xscreensaver/" |
63 |
+SRC_URI=" |
64 |
+ ${HOMEPAGE}${P}.tar.gz |
65 |
+" |
66 |
+ |
67 |
+LICENSE="BSD" |
68 |
+SLOT="0" |
69 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
70 |
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama" |
71 |
+ |
72 |
+COMMON_DEPEND=" |
73 |
+ >=gnome-base/libglade-2 |
74 |
+ dev-libs/libxml2 |
75 |
+ media-libs/netpbm |
76 |
+ x11-apps/appres |
77 |
+ x11-apps/xwininfo |
78 |
+ x11-libs/gdk-pixbuf:2[X] |
79 |
+ x11-libs/gtk+:2 |
80 |
+ x11-libs/libX11 |
81 |
+ x11-libs/libXext |
82 |
+ x11-libs/libXft |
83 |
+ x11-libs/libXi |
84 |
+ x11-libs/libXmu |
85 |
+ x11-libs/libXrandr |
86 |
+ x11-libs/libXt |
87 |
+ x11-libs/libXxf86misc |
88 |
+ x11-libs/libXxf86vm |
89 |
+ jpeg? ( virtual/jpeg:0 ) |
90 |
+ new-login? ( |
91 |
+ gdm? ( gnome-base/gdm ) |
92 |
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) |
93 |
+ ) |
94 |
+ opengl? ( |
95 |
+ virtual/glu |
96 |
+ virtual/opengl |
97 |
+ ) |
98 |
+ pam? ( virtual/pam ) |
99 |
+ xinerama? ( x11-libs/libXinerama ) |
100 |
+" |
101 |
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` |
102 |
+RDEPEND=" |
103 |
+ ${COMMON_DEPEND} |
104 |
+ perl? ( |
105 |
+ dev-lang/perl |
106 |
+ dev-perl/libwww-perl |
107 |
+ virtual/perl-Digest-MD5 |
108 |
+ ) |
109 |
+ selinux? ( sec-policy/selinux-xscreensaver ) |
110 |
+" |
111 |
+DEPEND=" |
112 |
+ ${COMMON_DEPEND} |
113 |
+ dev-util/intltool |
114 |
+ sys-devel/bc |
115 |
+ sys-devel/gettext |
116 |
+ virtual/pkgconfig |
117 |
+ x11-base/xorg-proto |
118 |
+" |
119 |
+PATCHES=( |
120 |
+ "${FILESDIR}"/${PN}-5.05-interix.patch |
121 |
+ "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch |
122 |
+ "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch |
123 |
+ "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch |
124 |
+ "${FILESDIR}"/${PN}-5.31-pragma.patch |
125 |
+ "${FILESDIR}"/${PN}-5.35-gentoo.patch |
126 |
+ "${FILESDIR}"/${PN}-5.41-comments.patch |
127 |
+) |
128 |
+ |
129 |
+src_prepare() { |
130 |
+ sed -i configure.in -e '/^ALL_LINGUAS=/d' || die |
131 |
+ strip-linguas -i po/ |
132 |
+ export ALL_LINGUAS="${LINGUAS}" |
133 |
+ |
134 |
+ if use new-login && ! use gdm; then #392967 |
135 |
+ sed -i \ |
136 |
+ -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ |
137 |
+ configure{,.in} || die |
138 |
+ fi |
139 |
+ |
140 |
+ default |
141 |
+ |
142 |
+ use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch |
143 |
+ |
144 |
+ eapply_user |
145 |
+ |
146 |
+ eautoconf |
147 |
+ eautoheader |
148 |
+} |
149 |
+ |
150 |
+src_configure() { |
151 |
+ if use ppc || use ppc64; then |
152 |
+ filter-flags -maltivec -mabi=altivec |
153 |
+ append-flags -U__VEC__ |
154 |
+ fi |
155 |
+ |
156 |
+ unset BC_ENV_ARGS #24568 |
157 |
+ export RPM_PACKAGE_VERSION=no #368025 |
158 |
+ |
159 |
+ econf \ |
160 |
+ $(use_with jpeg) \ |
161 |
+ $(use_with new-login login-manager) \ |
162 |
+ $(use_with opengl gl) \ |
163 |
+ $(use_with pam) \ |
164 |
+ $(use_with suid setuid-hacks) \ |
165 |
+ $(use_with xinerama xinerama-ext) \ |
166 |
+ --enable-locking \ |
167 |
+ --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ |
168 |
+ --with-dpms-ext \ |
169 |
+ --with-gtk \ |
170 |
+ --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ |
171 |
+ --with-pixbuf \ |
172 |
+ --with-proc-interrupts \ |
173 |
+ --with-randr-ext \ |
174 |
+ --with-text-file="${EPREFIX}"/etc/gentoo-release \ |
175 |
+ --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ |
176 |
+ --with-xdbe-ext \ |
177 |
+ --with-xf86gamma-ext \ |
178 |
+ --with-xf86vmode-ext \ |
179 |
+ --with-xinput-ext \ |
180 |
+ --with-xshm-ext \ |
181 |
+ --without-gle \ |
182 |
+ --without-kerberos \ |
183 |
+ --x-includes="${EPREFIX}"/usr/include \ |
184 |
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
185 |
+} |
186 |
+ |
187 |
+src_install() { |
188 |
+ emake install_prefix="${D}" install |
189 |
+ |
190 |
+ dodoc README{,.hacking} |
191 |
+ |
192 |
+ use pam && fperms 755 /usr/bin/${PN} |
193 |
+ pamd_mimic_system ${PN} auth |
194 |
+ |
195 |
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml |
196 |
+} |