1 |
commit: 3b752bb3b98259c17d5bebb9e59b23ce99214a29 |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 27 21:30:42 2016 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 27 21:31:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=3b752bb3 |
7 |
|
8 |
mate-extra/mate-screensaver: Patch configure.ac systemd, resolves #585446 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
...screensaver-1.10-fix-systemd-configure.ac.patch | 33 ++++++ |
13 |
.../mate-screensaver-1.10.2-r2.ebuild | 125 +++++++++++++++++++++ |
14 |
2 files changed, 158 insertions(+) |
15 |
|
16 |
diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch |
17 |
new file mode 100644 |
18 |
index 0000000..a5cf836 |
19 |
--- /dev/null |
20 |
+++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch |
21 |
@@ -0,0 +1,33 @@ |
22 |
+From 95b8f96ad66ab555c763dafebac8a49b9c6f3d51 Mon Sep 17 00:00:00 2001 |
23 |
+From: Monsta <monsta@×××××.ru> |
24 |
+Date: Thu, 1 Oct 2015 11:20:49 +0300 |
25 |
+Subject: [PATCH] configure.ac: add support for new libsystemd library |
26 |
+ |
27 |
+From 6d4a81780e3598435b565569e8e16f1410cb5761 Mon Sep 17 00:00:00 2001 |
28 |
+From: Monsta <monsta@×××××.ru> |
29 |
+Date: Mon, 5 Oct 2015 16:30:14 +0300 |
30 |
+Subject: [PATCH] fix build w/o systemd support |
31 |
+ |
32 |
+fixes https://github.com/mate-desktop/mate-screensaver/issues/83 |
33 |
+ |
34 |
+--- |
35 |
+ configure.ac | 6 +++--- |
36 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
37 |
+ |
38 |
+diff --git a/configure.ac b/configure.ac |
39 |
+index 379f9b1..87ab770 100644 |
40 |
+--- a/configure.ac |
41 |
++++ b/configure.ac |
42 |
+@@ -934,9 +934,9 @@ AC_ARG_WITH(systemd, |
43 |
+ [Add systemd support]), |
44 |
+ [with_systemd=$withval], [with_systemd=auto]) |
45 |
+ |
46 |
+-PKG_CHECK_MODULES(SYSTEMD, |
47 |
+- [libsystemd-login], |
48 |
+- [have_systemd=yes], [have_systemd=no]) |
49 |
++PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], |
50 |
++ [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login], |
51 |
++ [have_systemd=yes], [have_systemd=no])]) |
52 |
+ |
53 |
+ if test "x$with_systemd" = "xauto" ; then |
54 |
+ if test x$have_systemd = xno ; then |
55 |
|
56 |
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild |
57 |
new file mode 100644 |
58 |
index 0000000..9469fdb |
59 |
--- /dev/null |
60 |
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild |
61 |
@@ -0,0 +1,125 @@ |
62 |
+# Copyright 1999-2016 Gentoo Foundation |
63 |
+# Distributed under the terms of the GNU General Public License v2 |
64 |
+# $Id$ |
65 |
+ |
66 |
+EAPI="5" |
67 |
+GCONF_DEBUG="yes" |
68 |
+ |
69 |
+inherit gnome2 multilib autotools readme.gentoo versionator |
70 |
+ |
71 |
+MATE_BRANCH="$(get_version_component_range 1-2)" |
72 |
+ |
73 |
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" |
74 |
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" |
75 |
+HOMEPAGE="http://mate-desktop.org" |
76 |
+ |
77 |
+LICENSE="GPL-2" |
78 |
+SLOT="0" |
79 |
+KEYWORDS="~amd64 ~arm ~x86" |
80 |
+ |
81 |
+IUSE="X consolekit kernel_linux libnotify opengl pam systemd" |
82 |
+ |
83 |
+DOC_CONTENTS=" |
84 |
+ Information for converting screensavers is located in |
85 |
+ /usr/share/doc/${PF}/xss-conversion.txt* |
86 |
+" |
87 |
+ |
88 |
+RDEPEND=" |
89 |
+ >=dev-libs/dbus-glib-0.71:0 |
90 |
+ >=dev-libs/glib-2.36:2 |
91 |
+ gnome-base/dconf:0 |
92 |
+ >=mate-base/libmatekbd-1.10:0 |
93 |
+ >=mate-base/mate-desktop-1.10:0 |
94 |
+ >=mate-base/mate-menus-1.10:0 |
95 |
+ >=mate-base/mate-session-manager-1.10:0 |
96 |
+ >=sys-apps/dbus-0.30:0 |
97 |
+ >=x11-libs/gdk-pixbuf-2.14:2 |
98 |
+ >=x11-libs/gtk+-2.24:2 |
99 |
+ >=x11-libs/libX11-1:0 |
100 |
+ x11-libs/cairo:0 |
101 |
+ x11-libs/libXext:0 |
102 |
+ x11-libs/libXrandr:0 |
103 |
+ x11-libs/libXScrnSaver:0 |
104 |
+ x11-libs/libXxf86misc:0 |
105 |
+ x11-libs/libXxf86vm:0 |
106 |
+ x11-libs/libxklavier:0 |
107 |
+ x11-libs/pango:0 |
108 |
+ virtual/libintl:0 |
109 |
+ consolekit? ( sys-auth/consolekit:0 ) |
110 |
+ libnotify? ( >=x11-libs/libnotify-0.7:0 ) |
111 |
+ opengl? ( virtual/opengl:0 ) |
112 |
+ pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) |
113 |
+ !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) |
114 |
+ systemd? ( sys-apps/systemd:0= ) |
115 |
+ !!<gnome-extra/gnome-screensaver-3:0" |
116 |
+ |
117 |
+DEPEND="${RDEPEND} |
118 |
+ >=dev-util/intltool-0.35:* |
119 |
+ >=mate-base/mate-common-1.10:0 |
120 |
+ sys-devel/gettext:* |
121 |
+ x11-proto/randrproto:0 |
122 |
+ x11-proto/scrnsaverproto:0 |
123 |
+ x11-proto/xextproto:0 |
124 |
+ x11-proto/xf86miscproto:0 |
125 |
+ virtual/pkgconfig:*" |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ gnome2_src_prepare |
129 |
+ epatch "${FILESDIR}/mate-screensaver-1.10-fix-systemd-configure.ac.patch" |
130 |
+ eautoreconf |
131 |
+} |
132 |
+ |
133 |
+src_configure() { |
134 |
+ gnome2_src_configure \ |
135 |
+ $(use_with consolekit console-kit) \ |
136 |
+ $(use_enable debug) \ |
137 |
+ $(use_with libnotify) \ |
138 |
+ $(use_with opengl libgl) \ |
139 |
+ $(use_enable pam) \ |
140 |
+ $(use_with systemd) \ |
141 |
+ $(use_with X x) \ |
142 |
+ --enable-locking \ |
143 |
+ --with-kbd-layout-indicator \ |
144 |
+ --with-xf86gamma-ext \ |
145 |
+ --with-xscreensaverdir=/usr/share/xscreensaver/config \ |
146 |
+ --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver |
147 |
+} |
148 |
+ |
149 |
+src_install() { |
150 |
+ gnome2_src_install |
151 |
+ |
152 |
+ # Install the conversion script in the documentation. |
153 |
+ dodoc "${S}"/data/migrate-xscreensaver-config.sh |
154 |
+ dodoc "${S}"/data/xscreensaver-config.xsl |
155 |
+ dodoc "${FILESDIR}"/xss-conversion.txt |
156 |
+ |
157 |
+ # Non PAM users will need this suid to read the password hashes. |
158 |
+ # OpenPAM users will probably need this too when |
159 |
+ # http://bugzilla.gnome.org/show_bug.cgi?id=370847 |
160 |
+ # is fixed. |
161 |
+ if ! use pam ; then |
162 |
+ fperms u+s /usr/libexec/mate-screensaver-dialog |
163 |
+ fi |
164 |
+ |
165 |
+ readme.gentoo_create_doc |
166 |
+} |
167 |
+ |
168 |
+pkg_postinst() { |
169 |
+ gnome2_pkg_postinst |
170 |
+ |
171 |
+ if has_version "<x11-base/xorg-server-1.5.3-r4" ; then |
172 |
+ ewarn "You have a too old xorg-server installation. This will cause" |
173 |
+ ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." |
174 |
+ echo |
175 |
+ fi |
176 |
+ |
177 |
+ if has_version "<x11-misc/xscreensaver-4.22-r2" ; then |
178 |
+ ewarn "You have xscreensaver installed, you probably want to disable it." |
179 |
+ ewarn "To prevent a duplicate screensaver entry in the menu, you need to" |
180 |
+ ewarn "build xscreensaver with -gnome in the USE flags." |
181 |
+ ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" |
182 |
+ echo |
183 |
+ fi |
184 |
+ |
185 |
+ readme.gentoo_print_elog |
186 |
+} |