1 |
commit: e6973b8fd536b1d7e872265869026f5d6bb46ce3 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 17 12:10:36 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 17 12:10:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6973b8f |
7 |
|
8 |
x11-misc/wdm: Use pkg-config instead of get-wings-flags |
9 |
|
10 |
Fixes: https://bugs.gentoo.org/659652 |
11 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
x11-misc/wdm/files/wdm-1.28-pkg_config.patch | 30 +++++++++++++++ |
15 |
x11-misc/wdm/wdm-1.28-r5.ebuild | 56 ++++++++++++++++++++++++++++ |
16 |
2 files changed, 86 insertions(+) |
17 |
|
18 |
diff --git a/x11-misc/wdm/files/wdm-1.28-pkg_config.patch b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..3670830bf86 |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch |
23 |
@@ -0,0 +1,30 @@ |
24 |
+--- a/configure.ac |
25 |
++++ b/configure.ac |
26 |
+@@ -7,6 +7,7 @@ |
27 |
+ AC_PROG_INSTALL |
28 |
+ AC_PROG_CC |
29 |
+ AC_PROG_RANLIB |
30 |
++PKG_PROG_PKG_CONFIG |
31 |
+ |
32 |
+ AC_ARG_VAR(XRDB_PATH, [Path to xrdb program from X]) |
33 |
+ AC_PATH_PROG(XRDB_PATH, xrdb) |
34 |
+@@ -153,15 +154,11 @@ |
35 |
+ ],,[$XLDFLAGS $XLIBS]) |
36 |
+ fi |
37 |
+ |
38 |
+-dnl WINGs support |
39 |
+-AC_CHECK_PROG(GETWINGSFLAGS,get-wings-flags,get-wings-flags,,[$PATH]) |
40 |
+-if test -z "$GETWINGSFLAGS"; then |
41 |
+- AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.]) |
42 |
+-fi |
43 |
++PKG_CHECK_MODULES(WINGS, WINGs,,[AC_MSG_ERROR([WINGs not found])]) |
44 |
+ |
45 |
+-WCFLAGS=`get-wings-flags --cflags` |
46 |
+-WLDFLAGS=`get-wings-flags --ldflags` |
47 |
+-WLIBS=`get-wings-flags --libs` |
48 |
++WCFLAGS="$WINGS_CFLAGS" |
49 |
++WLDFLAGS="$WINGS_LDFLAGS" |
50 |
++WLIBS="$WINGS_LIBS" |
51 |
+ |
52 |
+ AC_SUBST(XLIBS) |
53 |
+ AC_SUBST(XCFLAGS) |
54 |
|
55 |
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..a5fe21ae25c |
58 |
--- /dev/null |
59 |
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild |
60 |
@@ -0,0 +1,56 @@ |
61 |
+# Copyright 1999-2019 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=7 |
65 |
+inherit autotools pam toolchain-funcs |
66 |
+ |
67 |
+DESCRIPTION="WINGs Display Manager" |
68 |
+HOMEPAGE="https://github.com/voins/wdm" |
69 |
+SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2" |
70 |
+ |
71 |
+LICENSE="GPL-2" |
72 |
+SLOT="0" |
73 |
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
74 |
+IUSE="pam selinux truetype" |
75 |
+ |
76 |
+COMMON_DEPEND=" |
77 |
+ >=x11-wm/windowmaker-0.70.0 |
78 |
+ x11-libs/libXmu |
79 |
+ x11-libs/libXpm |
80 |
+ x11-libs/libXt |
81 |
+ pam? ( virtual/pam ) |
82 |
+ truetype? ( x11-libs/libXft ) |
83 |
+" |
84 |
+DEPEND=" |
85 |
+ ${COMMON_DEPEND} |
86 |
+ sys-devel/gettext |
87 |
+ virtual/pkgconfig |
88 |
+" |
89 |
+RDEPEND=" |
90 |
+ ${COMMON_DEPEND} |
91 |
+ pam? ( >=sys-auth/pambase-20080219.1 ) |
92 |
+" |
93 |
+PATCHES=( |
94 |
+ "${FILESDIR}"/${P}-terminateServer.patch |
95 |
+ "${FILESDIR}"/${P}-remove-fakehome.patch |
96 |
+ "${FILESDIR}"/${P}-pkg_config.patch |
97 |
+) |
98 |
+ |
99 |
+src_prepare() { |
100 |
+ default |
101 |
+ eautoreconf |
102 |
+} |
103 |
+src_configure() { |
104 |
+ tc-export AR |
105 |
+ econf \ |
106 |
+ --with-wdmdir="${EPREFIX}"/etc/X11/wdm \ |
107 |
+ $(use_enable pam) \ |
108 |
+ $(use_enable selinux) |
109 |
+} |
110 |
+ |
111 |
+src_install() { |
112 |
+ default |
113 |
+ |
114 |
+ rm -f "${ED%/}"/etc/pam.d/wdm || die |
115 |
+ pamd_mimic system-local-login wdm auth account password session |
116 |
+} |