1 |
commit: c1ba5292f5bf1434770d5aea9abfc80b225a3a62 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 11 21:28:43 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 11 21:28:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ba5292 |
7 |
|
8 |
x11-misc/piedock: Use pkg-config to find freetype. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/655530 |
11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
12 |
|
13 |
.../files/piedock-1.6.9-freetype_pkgconfig.patch | 45 ++++++++++++++++++++++ |
14 |
x11-misc/piedock/piedock-1.6.9.ebuild | 30 +++++++++++---- |
15 |
2 files changed, 67 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/x11-misc/piedock/files/piedock-1.6.9-freetype_pkgconfig.patch b/x11-misc/piedock/files/piedock-1.6.9-freetype_pkgconfig.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..dc6dd41bccb |
20 |
--- /dev/null |
21 |
+++ b/x11-misc/piedock/files/piedock-1.6.9-freetype_pkgconfig.patch |
22 |
@@ -0,0 +1,45 @@ |
23 |
+From 3f37592025333532e98bbe96c2b0903bb881b9c0 Mon Sep 17 00:00:00 2001 |
24 |
+From: Lars Wendler <polynomial-c@g.o> |
25 |
+Date: Fri, 11 May 2018 23:21:33 +0200 |
26 |
+Subject: [PATCH] Use pkg-config to find freetype |
27 |
+ |
28 |
+As of freetype-2.9.1 the freetype-config file no longer gets installed |
29 |
+by default. |
30 |
+--- |
31 |
+ configure.ac | 13 ++++--------- |
32 |
+ 1 file changed, 4 insertions(+), 9 deletions(-) |
33 |
+ |
34 |
+diff --git a/configure.ac b/configure.ac |
35 |
+index 0c452ad..96a51e9 100644 |
36 |
+--- a/configure.ac |
37 |
++++ b/configure.ac |
38 |
+@@ -12,6 +12,7 @@ AC_LANG_CPLUSPLUS |
39 |
+ AC_PROG_CXX |
40 |
+ AC_PROG_CC |
41 |
+ AC_PROG_INSTALL |
42 |
++PKG_PROG_PKG_CONFIG |
43 |
+ |
44 |
+ # Checks for mandatory libraries |
45 |
+ AC_CHECK_LIB([X11], [XOpenDisplay], , AC_MSG_ERROR([libX11 not found])) |
46 |
+@@ -47,15 +48,9 @@ AC_ARG_ENABLE( |
47 |
+ |
48 |
+ # Checks for Freetype |
49 |
+ if test "x$XFT" = "xtrue"; then |
50 |
+- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) |
51 |
+- |
52 |
+- if test x$FREETYPE_CONFIG = xno; then |
53 |
+- AC_MSG_ERROR([*** freetype-config not found]) |
54 |
+- fi |
55 |
+- |
56 |
+- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" |
57 |
+- FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" |
58 |
+- CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
59 |
++ PKG_CHECK_MODULES(FREETYPE, freetype2, [ |
60 |
++ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
61 |
++ ], AC_MSG_ERROR([Cannot find freetype])) |
62 |
+ fi |
63 |
+ |
64 |
+ # Checks for Xrender |
65 |
+-- |
66 |
+2.17.0 |
67 |
+ |
68 |
|
69 |
diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9.ebuild |
70 |
index 01ba6137e9e..8a2ea62a150 100644 |
71 |
--- a/x11-misc/piedock/piedock-1.6.9.ebuild |
72 |
+++ b/x11-misc/piedock/piedock-1.6.9.ebuild |
73 |
@@ -3,6 +3,8 @@ |
74 |
|
75 |
EAPI=6 |
76 |
|
77 |
+inherit autotools |
78 |
+ |
79 |
DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu" |
80 |
HOMEPAGE=" |
81 |
http://markusfisch.de/PieDock |
82 |
@@ -30,19 +32,31 @@ RDEPEND=" |
83 |
x11-libs/gtk+:2 |
84 |
) |
85 |
" |
86 |
-DEPEND="${RDEPEND}" |
87 |
+DEPEND="${RDEPEND} |
88 |
+ virtual/pkgconfig" |
89 |
+ |
90 |
DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS ) |
91 |
+ |
92 |
PATCHES=( |
93 |
"${FILESDIR}"/${PN}-1.6.1-signals.patch |
94 |
+ "${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch |
95 |
) |
96 |
-S=${WORKDIR}/PieDock-${PV} |
97 |
+ |
98 |
+S="${WORKDIR}/PieDock-${PV}" |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ default |
102 |
+ eautoreconf |
103 |
+} |
104 |
|
105 |
src_configure() { |
106 |
- econf \ |
107 |
- $(use_enable gtk) \ |
108 |
- --disable-kde \ |
109 |
- --bindir="${EPREFIX}"/usr/bin \ |
110 |
- --enable-xft \ |
111 |
- --enable-xmu \ |
112 |
+ local myeconfargs=( |
113 |
+ $(use_enable gtk) |
114 |
+ --disable-kde |
115 |
+ --bindir="${EPREFIX}"/usr/bin |
116 |
+ --enable-xft |
117 |
+ --enable-xmu |
118 |
--enable-xrender |
119 |
+ ) |
120 |
+ econf "${myeconfargs[@]}" |
121 |
} |