summaryrefslogtreecommitdiffstats
path: root/desktop/razorqt/patches
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-10-28 17:35:45 +0100
committer dsomero <xgizzmo@slackbuilds.org>2012-11-04 09:53:56 -0500
commitc6a03b745a857a36f3e1a19f6e8136d48be47176 (patch)
tree94fcc83c7df8a5e943eca747f103c54188369aba /desktop/razorqt/patches
parent0b099b6a187badb5553a7e9d0f991098d8c4deee (diff)
downloadslackbuilds-c6a03b745a857a36f3e1a19f6e8136d48be47176.tar.gz
slackbuilds-c6a03b745a857a36f3e1a19f6e8136d48be47176.tar.xz
desktop/razorqt: Updated for version 0.5.1.
Added a small workaround to the startrazor launch script Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'desktop/razorqt/patches')
-rw-r--r--desktop/razorqt/patches/dont_hardcode_xdg_path.patch31
-rw-r--r--desktop/razorqt/patches/include_unistd_h.diff24
2 files changed, 31 insertions, 24 deletions
diff --git a/desktop/razorqt/patches/dont_hardcode_xdg_path.patch b/desktop/razorqt/patches/dont_hardcode_xdg_path.patch
new file mode 100644
index 0000000000..f46f43aaff
--- /dev/null
+++ b/desktop/razorqt/patches/dont_hardcode_xdg_path.patch
@@ -0,0 +1,31 @@
+diff --git a/razorqt-config/src/CMakeLists.txt b/razorqt-config/src/CMakeLists.txt
+index 193809c..76df89d 100644
+--- a/razorqt-config/src/CMakeLists.txt
++++ b/razorqt-config/src/CMakeLists.txt
+@@ -52,4 +52,4 @@ target_link_libraries( razor-config qcategorizedview)
+
+ INSTALL(TARGETS razor-config RUNTIME DESTINATION bin)
+ install(FILES ${DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+-install(FILES razor-config.menu DESTINATION /etc/xdg/menus/)
++install(FILES razor-config.menu DESTINATION ${RAZOR_ETC_XDG_DIRECTORY}/menus/)
+diff --git a/razorqt-resources/application-menu/CMakeLists.txt b/razorqt-resources/application-menu/CMakeLists.txt
+index cfb1a64..356d7e5 100644
+--- a/razorqt-resources/application-menu/CMakeLists.txt
++++ b/razorqt-resources/application-menu/CMakeLists.txt
+@@ -26,5 +26,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/razor-applications.menu.in
+ ${CMAKE_CURRENT_BINARY_DIR}/razor-applications.menu
+ @ONLY)
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/razor-applications.menu DESTINATION /etc/xdg/menus/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/razor-applications.menu DESTINATION ${RAZOR_ETC_XDG_DIRECTORY}/menus/)
+ install(DIRECTORY desktop-directories DESTINATION share/ PATTERN ".desktop")
+diff --git a/razorqt-resources/autostart/CMakeLists.txt b/razorqt-resources/autostart/CMakeLists.txt
+index aa9dece..a00c119 100644
+--- a/razorqt-resources/autostart/CMakeLists.txt
++++ b/razorqt-resources/autostart/CMakeLists.txt
+@@ -11,4 +11,4 @@ razor_translate_desktop(DESKTOP_FILES
+ add_custom_target(autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES})
+ #************************************************
+
+-install(FILES ${DESKTOP_FILES} DESTINATION /etc/xdg/autostart)
++install(FILES ${DESKTOP_FILES} DESTINATION ${RAZOR_ETC_XDG_DIRECTORY}/autostart)
diff --git a/desktop/razorqt/patches/include_unistd_h.diff b/desktop/razorqt/patches/include_unistd_h.diff
deleted file mode 100644
index 49da42ff0d..0000000000
--- a/desktop/razorqt/patches/include_unistd_h.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur razorqt-0.4.1.orig/razorqt-session/src/main.cpp razorqt-0.4.1/razorqt-session/src/main.cpp
---- razorqt-0.4.1.orig/razorqt-session/src/main.cpp 2012-02-13 04:24:51.000000000 -0600
-+++ razorqt-0.4.1/razorqt-session/src/main.cpp 2012-04-22 22:33:05.094043520 -0500
-@@ -28,6 +28,8 @@
- #include <QApplication>
- #include <QIcon>
-
-+#include <unistd.h>
-+
- #include "razormodman.h"
- #include "sessiondbusadaptor.h"
- #include "razortranslate.h"
-diff -Nur razorqt-0.4.1.orig/razorqt-session/src/razormodman.cpp razorqt-0.4.1/razorqt-session/src/razormodman.cpp
---- razorqt-0.4.1.orig/razorqt-session/src/razormodman.cpp 2012-02-13 04:24:51.000000000 -0600
-+++ razorqt-0.4.1/razorqt-session/src/razormodman.cpp 2012-04-22 22:38:53.867441049 -0500
-@@ -25,6 +25,8 @@
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-+#include <unistd.h>
-+
- #include "razormodman.h"
- #include <razorqt/razorsettings.h>
- #include <qtxdg/xdgautostart.h>