| 1 |
johu 12/04/04 10:37:14 |
| 2 |
|
| 3 |
Added: razorqt-0.4.1-unbundle-xdg-utils.patch |
| 4 |
Log: |
| 5 |
Revision bump unbundles xdg-utils by Alec Moskvin <alecm@×××.com> wrt bug #409025. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha98/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-wm/razorqt/files/razorqt-0.4.1-unbundle-xdg-utils.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/razorqt/files/razorqt-0.4.1-unbundle-xdg-utils.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/razorqt/files/razorqt-0.4.1-unbundle-xdg-utils.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: razorqt-0.4.1-unbundle-xdg-utils.patch |
| 16 |
=================================================================== |
| 17 |
From 126638803d35491229f05c4dc9bcf4202cc9dd00 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alec Moskvin <alecm@×××.com> |
| 19 |
Date: Mon, 19 Mar 2012 23:33:07 -0400 |
| 20 |
Subject: [PATCH] Make bundling xdg-utils optional |
| 21 |
|
| 22 |
--- |
| 23 |
razorqt-session/CMakeLists.txt | 15 +++++++++++++-- |
| 24 |
razorqt-session/src/main.cpp | 3 +++ |
| 25 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git razorqt-session/CMakeLists.txt razorqt-session/CMakeLists.txt |
| 28 |
index f0189d9..17f4533 100644 |
| 29 |
--- razorqt-session/CMakeLists.txt |
| 30 |
+++ razorqt-session/CMakeLists.txt |
| 31 |
@@ -51,8 +51,19 @@ add_dependencies( razor-session razorqt qtxdg) |
| 32 |
target_link_libraries ( razor-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg) |
| 33 |
INSTALL(TARGETS razor-session RUNTIME DESTINATION bin) |
| 34 |
|
| 35 |
-install(PROGRAMS resources/xdg-open resources/xdg-mime DESTINATION lib${LIB_SUFFIX}/razor-xdg-tools) |
| 36 |
-add_definitions ( -DPATH_PREPEND=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/razor-xdg-tools\" ) |
| 37 |
+if (NOT DEFINED BUNDLE_XDG_UTILS) |
| 38 |
+ message(STATUS "*********************************************************************") |
| 39 |
+ message(STATUS "Bundling our own xdg-utils.") |
| 40 |
+ message(STATUS "If you have xdg-utils newer than 2012-03-02, you can set -DBUNDLE_XDG_UTILS=No") |
| 41 |
+ message(STATUS "*********************************************************************") |
| 42 |
+ set (BUNDLE_XDG_UTILS Yes) |
| 43 |
+endif (NOT DEFINED BUNDLE_XDG_UTILS) |
| 44 |
+ |
| 45 |
+if (BUNDLE_XDG_UTILS) |
| 46 |
+ install(PROGRAMS resources/xdg-open resources/xdg-mime DESTINATION lib${LIB_SUFFIX}/razor-xdg-tools) |
| 47 |
+ add_definitions ( -DPATH_PREPEND=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/razor-xdg-tools\" ) |
| 48 |
+endif (BUNDLE_XDG_UTILS) |
| 49 |
+ |
| 50 |
install(PROGRAMS src/startrazor DESTINATION bin) |
| 51 |
|
| 52 |
add_subdirectory(config) |
| 53 |
diff --git razorqt-session/src/main.cpp razorqt-session/src/main.cpp |
| 54 |
index 57b361a..7925448 100644 |
| 55 |
--- razorqt-session/src/main.cpp |
| 56 |
+++ razorqt-session/src/main.cpp |
| 57 |
@@ -73,8 +73,11 @@ int main(int argc, char **argv) |
| 58 |
} |
| 59 |
} |
| 60 |
|
| 61 |
+#ifdef PATH_PREPEND |
| 62 |
// PATH for out own bundled XDG tools |
| 63 |
razor_setenv_prepend("PATH", PATH_PREPEND); |
| 64 |
+#endif // PATH_PREPEND |
| 65 |
+ |
| 66 |
// special variable for Razor environment menu |
| 67 |
razor_setenv("XDG_MENU_PREFIX", "razor-"); |
| 68 |
|
| 69 |
-- |
| 70 |
1.7.8.5 |
Archives