From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-admin/hardinfo/files: hardinfo-0.5.2_pre20120527-clang.patch |
Date: | Mon, 31 Dec 2012 14:19:01 |
Message-Id: | 20121231141836.954FC2171D@flycatcher.gentoo.org |
1 | hasufell 12/12/31 14:18:36 |
2 | |
3 | Added: hardinfo-0.5.2_pre20120527-clang.patch |
4 | Log: |
5 | fix compilation with clang |
6 | |
7 | (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
8 | |
9 | Revision Changes Path |
10 | 1.1 app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: hardinfo-0.5.2_pre20120527-clang.patch |
16 | =================================================================== |
17 | https://github.com/lpereira/hardinfo/pull/6 |
18 | |
19 | --- hardinfo-0.5.2_pre20120527/hardinfo/util.c |
20 | +++ hardinfo-0.5.2_pre20120527/hardinfo/util.c |
21 | @@ -1368,7 +1368,7 @@ |
22 | { |
23 | if (G_UNLIKELY(!_moreinfo)) { |
24 | DEBUG("moreinfo not initialized"); |
25 | - return; |
26 | + return 0; |
27 | } |
28 | |
29 | if (prefix) { |
30 | --- hardinfo-0.5.2_pre20120527/CMakeLists.txt |
31 | +++ hardinfo-0.5.2_pre20120527/CMakeLists.txt |
32 | @@ -43,6 +43,8 @@ |
33 | |
34 | message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}") |
35 | |
36 | +add_definitions("-std=gnu89") |
37 | + |
38 | include(FindPkgConfig) |
39 | pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) |
40 | pkg_check_modules(LIBSOUP libsoup-2.4>=2.24) |