Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libdbusmenu-qt/files: libdbusmenu-qt-0.3.2-cmake.patch
Date: Tue, 27 Apr 2010 13:47:56
Message-Id: 20100427134749.3847B2C043@corvid.gentoo.org
1 reavertm 10/04/27 13:47:49
2
3 Added: libdbusmenu-qt-0.3.2-cmake.patch
4 Log:
5 Version bump 0.3.2, fix bug 317389, restrict test, bug 315215
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch?rev=1.1&content-type=text/plain
13
14 Index: libdbusmenu-qt-0.3.2-cmake.patch
15 ===================================================================
16 Only in .: build
17 diff -ru ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake ./cmake/modules/FindQJSON.cmake
18 --- ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake 2010-04-27 15:20:49.187784398 +0200
19 +++ ./cmake/modules/FindQJSON.cmake 2010-04-27 15:21:06.515858660 +0200
20 @@ -17,14 +17,14 @@
21 # use pkg-config to get the values of QJSON_INCLUDE_DIRS
22 # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
23 include (FindPkgConfig)
24 - pkg_check_modules (QJSON QJson>=0.5)
25 + pkg_check_modules (PC_QJSON QJson>=0.5)
26 endif (NOT WIN32)
27
28 find_library (QJSON_LIBRARIES
29 NAMES
30 qjson
31 PATHS
32 - ${QJSON_LIBRARY_DIRS}
33 + ${PC_QJSON_LIBRARY_DIRS}
34 ${LIB_INSTALL_DIR}
35 ${KDE4_LIB_DIR}
36 )
37 @@ -35,7 +35,7 @@
38 PATH_SUFFIXES
39 qjson
40 PATHS
41 - ${QJSON_INCLUDE_DIRS}
42 + ${PC_QJSON_INCLUDE_DIRS}
43 ${INCLUDE_INSTALL_DIR}
44 ${KDE4_INCLUDE_DIR}
45 )