diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-04-27 15:37:34 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-04-27 15:37:34 +0200 |
| commit | a13cccf300727d9adc6dfed562cd7e4ffc279e90 (patch) | |
| tree | 8d73335089bdae05863a1331b75d72ae6faa34be /dev-libs/libdbusmenu-qt/files | |
| parent | 3ef19aab7011717ccf6014d97af44b5584f07e62 (diff) | |
| download | kde-a13cccf300727d9adc6dfed562cd7e4ffc279e90.tar.gz kde-a13cccf300727d9adc6dfed562cd7e4ffc279e90.tar.bz2 kde-a13cccf300727d9adc6dfed562cd7e4ffc279e90.zip | |
[dev-libs/libdbusmenu-qt] Synced with portage
Diffstat (limited to 'dev-libs/libdbusmenu-qt/files')
| -rw-r--r-- | dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch | 30 | ||||
| -rw-r--r-- | dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch | 13 |
2 files changed, 30 insertions, 13 deletions
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch new file mode 100644 index 00000000000..e8e13c480bf --- /dev/null +++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch @@ -0,0 +1,30 @@ +Only in .: build +diff -ru ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake ./cmake/modules/FindQJSON.cmake +--- ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake 2010-04-27 15:20:49.187784398 +0200 ++++ ./cmake/modules/FindQJSON.cmake 2010-04-27 15:21:06.515858660 +0200 +@@ -17,14 +17,14 @@ + # use pkg-config to get the values of QJSON_INCLUDE_DIRS + # and QJSON_LIBRARY_DIRS to add as hints to the find commands. + include (FindPkgConfig) +- pkg_check_modules (QJSON QJson>=0.5) ++ pkg_check_modules (PC_QJSON QJson>=0.5) + endif (NOT WIN32) + + find_library (QJSON_LIBRARIES + NAMES + qjson + PATHS +- ${QJSON_LIBRARY_DIRS} ++ ${PC_QJSON_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ${KDE4_LIB_DIR} + ) +@@ -35,7 +35,7 @@ + PATH_SUFFIXES + qjson + PATHS +- ${QJSON_INCLUDE_DIRS} ++ ${PC_QJSON_INCLUDE_DIRS} + ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_DIR} + ) diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch deleted file mode 100644 index 8c2d274dcab..00000000000 --- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/testapp/CMakeLists.txt b/tools/testapp/CMakeLists.txt -index 5b6d72e..77ab35d 100644 ---- a/tools/testapp/CMakeLists.txt -+++ b/tools/testapp/CMakeLists.txt -@@ -11,6 +11,8 @@ include_directories( - ${QJSON_INCLUDE_DIR} - ) - -+link_directories(${QT_LIBRARY_DIR}) -+ - add_executable(dbusmenubench-qtapp ${qtapp_SRCS}) - - target_link_libraries(dbusmenubench-qtapp |