Gentoo Archives: gentoo-commits

From: Daniel Pielmeier <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
Date: Fri, 19 Feb 2016 16:56:26
Message-Id: 1455900908.ba6473341f414f64c355302901890f5b3d9d752d.billie@gentoo
1 commit: ba6473341f414f64c355302901890f5b3d9d752d
2 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 19 16:55:08 2016 +0000
4 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 19 16:55:08 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba647334
7
8 app-admin/conky: Add patch to build with wifi support.
9
10 This fixes bug #573502. Thanks to Stanislav Nikitin for the report
11 and Till Schäfer for testing the patch.
12
13 Package-Manager: portage-2.2.26
14
15 app-admin/conky/conky-1.10.1.ebuild | 2 ++
16 app-admin/conky/files/conky-1.10.1-includewlan.patch | 13 +++++++++++++
17 2 files changed, 15 insertions(+)
18
19 diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
20 index 86a87b8..be3ce3f 100644
21 --- a/app-admin/conky/conky-1.10.1.ebuild
22 +++ b/app-admin/conky/conky-1.10.1.ebuild
23 @@ -76,6 +76,8 @@ pkg_setup() {
24 }
25
26 src_prepare() {
27 + epatch "${FILESDIR}/${P}-includewlan.patch"
28 +
29 # Allow user patches #478482
30 epatch_user
31 }
32
33 diff --git a/app-admin/conky/files/conky-1.10.1-includewlan.patch b/app-admin/conky/files/conky-1.10.1-includewlan.patch
34 new file mode 100644
35 index 0000000..82b09a7
36 --- /dev/null
37 +++ b/app-admin/conky/files/conky-1.10.1-includewlan.patch
38 @@ -0,0 +1,13 @@
39 +diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
40 +--- a/cmake/ConkyPlatformChecks.cmake 2015-11-18 20:47:45.000000000 +0500
41 ++++ b/cmake/ConkyPlatformChecks.cmake 2016-01-31 20:04:58.036144590 +0500
42 +@@ -141,7 +141,8 @@
43 + endif(BUILD_MYSQL)
44 +
45 + if(BUILD_WLAN)
46 +- check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE)
47 ++ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
48 ++ check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE)
49 + if(NOT IWLIB_H)
50 + message(FATAL_ERROR "Unable to find iwlib.h")
51 + endif(NOT IWLIB_H)