[razorqt] Shared libqtxdg-0.5.3 compatible
Eugene A. Pivnev
tieugene at fedoraproject.org
Sun Oct 5 10:06:56 UTC 2014
commit 2b1c6ef5824ca937046d54c8abfee5d6a2dcec8b
Author: TI_Eugene <ti.eugene at gmail.com>
Date: Sun Oct 5 14:06:37 2014 +0400
Shared libqtxdg-0.5.3 compatible
libqtxdg-0.5.3.diff | 18 --
libqtxdg-0.5.3.tar.gz | Bin 63772 -> 0 bytes
razorqt-libqtxdg-0.5.3.patch | 697 ++++++++++++++++++++++++++++++++++++++++++
razorqt.spec | 45 +---
4 files changed, 705 insertions(+), 55 deletions(-)
---
diff --git a/razorqt-libqtxdg-0.5.3.patch b/razorqt-libqtxdg-0.5.3.patch
new file mode 100644
index 0000000..72cef3f
--- /dev/null
+++ b/razorqt-libqtxdg-0.5.3.patch
@@ -0,0 +1,697 @@
+diff -urN razorqt-0.5.2.orig/CMakeLists.txt razorqt-0.5.2/CMakeLists.txt
+--- razorqt-0.5.2.orig/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/CMakeLists.txt 2014-08-25 13:49:22.000000000 +0400
+@@ -31,8 +31,11 @@
+ set( QT_USE_QTDBUS 1 )
+ find_package ( Qt4 4.6.0 REQUIRED )
+ include ( ${QT_USE_FILE} )
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+ include_directories (
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ # additional cmake files
+@@ -71,10 +74,6 @@
+ endif(${MODULE_VAR})
+ endmacro()
+
+-build_module(MODULE_QTXDG
+- "Qt library for XDG standards"
+- libraries/qtxdg On)
+-
+ build_module(MODULE_LIBRAZORQT
+ "Core Razor library"
+ libraries/razorqt On)
+diff -urN razorqt-0.5.2.orig/libraries/CMakeLists.txt razorqt-0.5.2/libraries/CMakeLists.txt
+--- razorqt-0.5.2.orig/libraries/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/libraries/CMakeLists.txt 2014-08-25 13:34:59.000000000 +0400
+@@ -1,7 +1,6 @@
+ add_subdirectory(razormount)
+ add_subdirectory(razorqt)
+ add_subdirectory(razorqxt)
+-add_subdirectory(qtxdg)
+
+-add_dependencies(razorqt qtxdg razorqxt razormount)
++add_dependencies(razorqt razorqxt razormount)
+
+diff -urN razorqt-0.5.2.orig/libraries/razorqt/CMakeLists.txt razorqt-0.5.2/libraries/razorqt/CMakeLists.txt
+--- razorqt-0.5.2.orig/libraries/razorqt/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/libraries/razorqt/CMakeLists.txt 2014-08-25 14:40:36.000000000 +0400
+@@ -1,10 +1,13 @@
+ project(librazorqt)
+ find_package(X11 REQUIRED)
++find_package(QTXDG REQUIRED)
++include(${QTXDG_USE_FILE})
+
+ include_directories (
+ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/libraries
+ )
+
+@@ -120,7 +123,7 @@
+ target_link_libraries ( razorqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+ ${X11_X11_LIB}
+- qtxdg
++ ${QTXDG_LIBRARIES}
+ )
+
+ set_target_properties(razorqt PROPERTIES
+diff -urN razorqt-0.5.2.orig/razorqt-about/src/CMakeLists.txt razorqt-0.5.2/razorqt-about/src/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-about/src/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-about/src/CMakeLists.txt 2014-08-25 14:12:15.000000000 +0400
+@@ -21,7 +21,6 @@
+
+ set(razor-about_LIBRARIES
+ razorqt
+- qtxdg
+ )
+
+ # Translations **********************************
+@@ -29,7 +28,7 @@
+ razor_translate_ts(razor-about_QM_FILES
+ SOURCES
+ ${razor-about_H_FILES}
+- ${razor-about_CPP_FILES}
++ ${razor-about_CPP_FILES}
+ ${razor-about_UI_FILES}
+ )
+
+@@ -55,6 +54,8 @@
+ add_definitions(-Wall)
+ find_package(Qt4 REQUIRED)
+ include(${QT_USE_FILE})
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+
+ set(RAZOR_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/razor)
+@@ -67,17 +68,19 @@
+ qt4_wrap_ui(razor-about_UI_HEADERS ${razor-about_UI_FILES})
+ qt4_add_resources(razor-about_QRC_SOURCES ${razor-about_QRC_FILES})
+
+-add_executable(${PROJECT_NAME}
+- ${razor-about_CPP_FILES}
+- ${razor-about_UI_FILES}
+- ${razor-about_RESOURCES}
+- ${razor-about_QRC_SOURCES}
+- ${razor-about_QM_FILES}
+- ${razor-about_MOC_SOURCES}
++add_executable(${PROJECT_NAME}
++ ${razor-about_CPP_FILES}
++ ${razor-about_UI_FILES}
++ ${razor-about_RESOURCES}
++ ${razor-about_QRC_SOURCES}
++ ${razor-about_QM_FILES}
++ ${razor-about_MOC_SOURCES}
+ ${razor-about_DESKTOP_FILES}
+ )
+ add_dependencies(${PROJECT_NAME} razorqt)
+-target_link_libraries(${PROJECT_NAME} ${razor-about_LIBRARIES} ${QT_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} ${razor-about_LIBRARIES} ${QT_LIBRARIES}
++${QTXDG_LIBRARIES}
++)
+
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(FILES ${CONFIG_FILES} DESTINATION ${APP_SHARE_DIR})
+diff -urN razorqt-0.5.2.orig/razorqt-config/razor-config-appearance/CMakeLists.txt razorqt-0.5.2/razorqt-config/razor-config-appearance/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-config/razor-config-appearance/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-config/razor-config-appearance/CMakeLists.txt 2014-08-25 14:16:23.000000000 +0400
+@@ -1,10 +1,13 @@
+ project(razor-config-appearance)
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/libraries/
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ set(H_FILES
+@@ -34,16 +37,15 @@
+
+ set(LIBRARIES
+ razorqt
+- qtxdg
+ )
+
+
+ # Translations **********************************
+ include(RazorTranslate)
+-razor_translate_ts(QM_FILES
++razor_translate_ts(QM_FILES
+ SOURCES
+ ${H_FILES}
+- ${CPP_FILES}
++ ${CPP_FILES}
+ ${UI_FILES}
+ INSTALLATION_DIR
+ ${CMAKE_INSTALL_PREFIX}/share/razor/razor-config
+@@ -52,7 +54,7 @@
+ razor_translate_desktop(DESKTOP_FILES
+ SOURCES
+ ${PROJECT_NAME}.desktop.in
+-)
++)
+
+ #************************************************
+
+@@ -62,8 +64,8 @@
+
+
+ add_executable(${PROJECT_NAME} ${CPP_FILES} ${UI_FILES} ${RESOURCES} ${QRC_SOURCES} ${QM_FILES} ${MOC_SOURCES} ${DESKTOP_FILES})
+-add_dependencies(${PROJECT_NAME} razorqt qtxdg)
+-target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES})
++add_dependencies(${PROJECT_NAME} razorqt)
++target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES} ${QTXDG_LIBRARIES})
+
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(FILES ${DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+diff -urN razorqt-0.5.2.orig/razorqt-config/razor-config-mouse/CMakeLists.txt razorqt-0.5.2/razorqt-config/razor-config-mouse/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-config/razor-config-mouse/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-config/razor-config-mouse/CMakeLists.txt 2014-08-25 14:18:14.000000000 +0400
+@@ -1,6 +1,10 @@
+ project(razor-config-mouse)
+ find_package(X11 REQUIRED)
+-include_directories(${X11_INCLUDE_DIR})
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
++include_directories(${X11_INCLUDE_DIR}
++${QTXDG_INCLUDE_DIRS}
++)
+
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+@@ -66,9 +70,9 @@
+ #************************************************
+
+ add_executable ( razor-config-mouse ${razor-config-mouse_SRCS} ${razor-config-mouse_CXX} ${razor-config-mouse_MOCS} ${DESKTOP_FILES} ${QM_FILES})
+-add_dependencies( razor-config-mouse razorqt qtxdg)
++add_dependencies( razor-config-mouse razorqt)
+ target_link_libraries ( razor-config-mouse ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY}
+- ${X11_X11_LIB} ${X11_Xcursor_LIB} razorqt qtxdg ${ZLIB_LIBRARY} ${X11_Xfixes_LIB})
++ ${X11_X11_LIB} ${X11_Xcursor_LIB} razorqt ${QTXDG_LIBRARIES} ${ZLIB_LIBRARY} ${X11_Xfixes_LIB})
+ # not needed probably ${X11_Xfixes_LIB})
+
+ INSTALL(TARGETS razor-config-mouse RUNTIME DESTINATION bin)
+diff -urN razorqt-0.5.2.orig/razorqt-config/src/CMakeLists.txt razorqt-0.5.2/razorqt-config/src/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-config/src/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-config/src/CMakeLists.txt 2014-08-25 14:17:30.000000000 +0400
+@@ -1,12 +1,15 @@
+ # build static helper class first
+ project(razor-config)
+ add_subdirectory(qcategorizedview)
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+ include_directories (
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/libraries
+ ${CMAKE_CURRENT_SOURCE_DIR}/qcategorizedview
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ set ( razor-config_HDRS
+@@ -42,10 +45,10 @@
+ #************************************************
+
+ add_executable ( razor-config ${razor-config_SRCS} ${UIS} ${MOCS} ${DESKTOP_FILES} ${QM_FILES})
+-add_dependencies( razor-config razorqt qtxdg)
++add_dependencies( razor-config razorqt)
+ target_link_libraries ( razor-config
+ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}
+- qtxdg razorqt)
++ ${QTXDG_LIBRARIES} razorqt)
+ # helper static lib
+ link_directories(${CMAKE_CURRENT_SOURCE_DIR}/qcategorizedview)
+ target_link_libraries( razor-config qcategorizedview)
+diff -urN razorqt-0.5.2.orig/razorqt-confupdate/CMakeLists.txt razorqt-0.5.2/razorqt-confupdate/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-confupdate/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-confupdate/CMakeLists.txt 2014-08-25 14:19:47.000000000 +0400
+@@ -1,5 +1,7 @@
+ project(razor-confupdate)
+ cmake_minimum_required( VERSION 2.6 )
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+ set(PROG_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/razor/${PROJECT_NAME})
+ add_definitions(-DPROG_SHARE_DIR=\"${PROG_SHARE_DIR}\")
+@@ -15,8 +17,9 @@
+ include( ${QT_USE_FILE} )
+ include_directories(
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+- ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/libraries/
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ set(${PROJECT_NAME}_HEADERS
+@@ -35,12 +38,11 @@
+ )
+
+ set(LIBRARIES
+- qtxdg
+-)
++ )
+ qt4_wrap_cpp(${PROJECT_NAME}_MOCSCXX ${${PROJECT_NAME}_MOCS})
+
+ add_executable ( ${PROJECT_NAME} ${${PROJECT_NAME}_SRCS} ${${PROJECT_NAME}_HEADERS} ${${PROJECT_NAME}_MOCSCXX})
+-target_link_libraries ( ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${LIBRARIES} )
++target_link_libraries ( ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${LIBRARIES} ${QTXDG_LIBRARIES})
+ add_dependencies(${PROJECT_NAME} razorqt)
+ INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+
+diff -urN razorqt-0.5.2.orig/razorqt-confupdate/tests/CMakeLists.txt razorqt-0.5.2/razorqt-confupdate/tests/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-confupdate/tests/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-confupdate/tests/CMakeLists.txt 2014-08-25 14:25:08.000000000 +0400
+@@ -12,7 +12,6 @@
+
+
+ set(LIBRARIES
+- qtxdg
+ )
+
+ set(QT_USE_QTTEST true)
+@@ -21,6 +20,8 @@
+
+ find_package ( Qt4 REQUIRED )
+ include ( ${QT_USE_FILE} )
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+ message(STATUS "IN: ${${PROJECT_NAME}_MOCS}")
+ qt4_wrap_cpp(MOCS ${${PROJECT_NAME}_MOCS})
+@@ -29,12 +30,13 @@
+
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+- ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/libraries/
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+-target_link_libraries ( ${PROJECT_NAME} ${QT_LIBRARIES} ${LIBRARIES} )
++target_link_libraries ( ${PROJECT_NAME} ${QT_LIBRARIES} ${LIBRARIES} ${QTXDG_LIBRARIES})
+ add_dependencies(${PROJECT_NAME} razorqt)
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+
+diff -urN razorqt-0.5.2.orig/razorqt-confupdate/updates/razor-0.5/CMakeLists.txt razorqt-0.5.2/razorqt-confupdate/updates/razor-0.5/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-confupdate/updates/razor-0.5/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-confupdate/updates/razor-0.5/CMakeLists.txt 2014-08-25 14:20:41.000000000 +0400
+@@ -8,11 +8,14 @@
+ add_definitions ( -Wall )
+ find_package ( Qt4 REQUIRED )
+ include ( ${QT_USE_FILE} )
++find_package(QTXDG REQUIRED QUIET)
++include(${QTXDG_USE_FILE})
+
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+- ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/libraries/
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ set(${PROJECT_NAME}_SRCS
+@@ -20,14 +23,13 @@
+ )
+
+ set(LIBRARIES
+- qtxdg
+ )
+
+ add_executable ( ${PROJECT_NAME} ${${PROJECT_NAME}_SRCS})
+-target_link_libraries ( ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${LIBRARIES} )
++target_link_libraries ( ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${LIBRARIES} ${QTXDG_LIBRARIES})
+ add_dependencies(${PROJECT_NAME} razorqt)
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION lib${LIB_SUFFIX}/razor-confupdate_bin)
+
+ install(FILES desktop-041-050.py DESTINATION share/razor/razor-confupdate)
+
+-install(FILES razor-0.5.upd DESTINATION share/razor/razor-confupdate)
++install(FILES razor-0.5.upd DESTINATION share/razor/razor-confupdate)
+diff -urN razorqt-0.5.2.orig/razorqt-desktop/CMakeLists.txt razorqt-0.5.2/razorqt-desktop/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-desktop/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-desktop/CMakeLists.txt 2014-08-25 14:26:52.000000000 +0400
+@@ -8,6 +8,8 @@
+ add_definitions ( -Wall )
+ find_package ( Qt4 REQUIRED )
+ find_package ( X11 REQUIRED )
++find_package(QTXDG REQUIRED )
++include(${QTXDG_USE_FILE})
+
+ include(RazorLibSuffix)
+
+@@ -20,6 +22,7 @@
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} ${X11_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/libraries/
+ src)
+
+@@ -31,7 +34,7 @@
+
+ add_executable ( razor-desktop ${razor-desktop_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+ add_dependencies( razor-desktop razorqt)
+-target_link_libraries ( razor-desktop ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
++target_link_libraries ( razor-desktop ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${QTXDG_LIBRARIES} razorqt)
+ INSTALL(TARGETS razor-desktop RUNTIME DESTINATION bin)
+ install(DIRECTORY resources/ DESTINATION ${RAZOR_ETC_XDG_DIRECTORY}/razor)
+
+diff -urN razorqt-0.5.2.orig/razorqt-desktop/config/CMakeLists.txt razorqt-0.5.2/razorqt-desktop/config/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-desktop/config/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-desktop/config/CMakeLists.txt 2014-08-25 14:28:29.000000000 +0400
+@@ -4,6 +4,7 @@
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libraries/)
+
+ set ( razor-desktopcfg_HDRS
+@@ -56,10 +57,10 @@
+ ${razor-desktopcfg_QM_FILES}
+ ${DESKTOP_FILES} )
+
+-add_dependencies( razor-config-desktop razorqt qtxdg)
++add_dependencies( razor-config-desktop razorqt)
+ target_link_libraries ( razor-config-desktop ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY}
+- ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
++ ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${QTXDG_LIBRARIES} razorqt)
+
+ INSTALL(TARGETS razor-config-desktop RUNTIME DESTINATION bin)
+ install(FILES ${DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+diff -urN razorqt-0.5.2.orig/razorqt-globalkeyshortcuts/config/CMakeLists.txt razorqt-0.5.2/razorqt-globalkeyshortcuts/config/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-globalkeyshortcuts/config/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-globalkeyshortcuts/config/CMakeLists.txt 2014-08-25 14:30:10.000000000 +0400
+@@ -4,6 +4,7 @@
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/libraries/
+ )
+
+@@ -30,7 +31,6 @@
+
+ set(LIBRARIES
+ razorqt
+- qtxdg
+ )
+
+
+@@ -54,8 +54,8 @@
+
+
+ add_executable(${PROJECT_NAME} ${CPP_FILES} ${UI_FILES} ${RESOURCES} ${QRC_SOURCES} ${QM_FILES} ${MOC_SOURCES} ${DESKTOP_FILES})
+-add_dependencies(${PROJECT_NAME} razorqt qtxdg)
+-target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES})
++add_dependencies(${PROJECT_NAME} razorqt)
++target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES} ${QTXDG_LIBRARIES})
+
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(FILES ${DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+diff -urN razorqt-0.5.2.orig/razorqt-notificationd/src/CMakeLists.txt razorqt-0.5.2/razorqt-notificationd/src/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-notificationd/src/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-notificationd/src/CMakeLists.txt 2014-08-25 14:31:43.000000000 +0400
+@@ -1,6 +1,7 @@
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/libraries/
+ )
+
+@@ -54,7 +55,8 @@
+ add_dependencies(razor-notificationd razorqt)
+ target_link_libraries(razor-notificationd ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+- razorqt qtxdg
++ ${QTXDG_LIBRARIES}
++ razorqt
+ )
+
+ INSTALL(TARGETS razor-notificationd RUNTIME DESTINATION bin)
+diff -urN razorqt-0.5.2.orig/razorqt-panel/panel/CMakeLists.txt razorqt-0.5.2/razorqt-panel/panel/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-panel/panel/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-panel/panel/CMakeLists.txt 2014-08-25 14:34:04.000000000 +0400
+@@ -39,7 +39,6 @@
+
+ set(LIBRARIES
+ razorqt
+- qtxdg
+ )
+
+ # QRC files .................
+@@ -83,22 +82,25 @@
+
+ find_package(Qt4 REQUIRED)
+ #find_package ( X11 REQUIRED )
++find_package(QTXDG REQUIRED)
+
+ include_directories(
++ ${QTXDG_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+ include(${QT_USE_FILE})
++include(${QTXDG_USE_FILE})
+ qt4_wrap_cpp(MOC_SOURCES ${MOCS})
+ qt4_wrap_ui(UI_HEADERS ${FORMS})
+ qt4_add_resources(QRC_SOURCES ${RESOURCES})
+
+ # Translations **********************************
+ include(RazorTranslate)
+-razor_translate_ts(razor-runner_QM_FILES
++razor_translate_ts(razor-runner_QM_FILES
+ SOURCES
+ ${razor-panel_H_FILES}
+- ${razor-panel_CPP_FILES}
++ ${razor-panel_CPP_FILES}
+ ${razor-panel_UI_FILES}
+ )
+ #************************************************
+@@ -109,7 +111,7 @@
+ message(STATUS "Panel plugins location: ${PLUGIN_DIR}")
+
+ add_executable(${PROJECT} ${razor-panel_H_FILES} ${razor-panel_CPP_FILES} ${MOC_SOURCES} ${razor-runner_QM_FILES} ${QRC_SOURCES} ${UI_HEADERS})
+-target_link_libraries(${PROJECT} ${LIBRARIES} ${QT_LIBRARIES})
++target_link_libraries(${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QTXDG_LIBRARIES})
+
+ install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
+ install(FILES ${CONFIG_FILES} DESTINATION ${RAZOR_ETC_XDG_DIRECTORY}/razor/razor-panel/)
+diff -urN razorqt-0.5.2.orig/razorqt-policykit/CMakeLists.txt razorqt-0.5.2/razorqt-policykit/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-policykit/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-policykit/CMakeLists.txt 2014-08-25 14:36:37.000000000 +0400
+@@ -3,6 +3,8 @@
+ if (ENABLE_POLICYKIT)
+
+ find_package(PolkitQt-1)
++find_package(QTXDG REQUIRED)
++include(${QTXDG_USE_FILE})
+
+ if (NOT POLKITQT-1_LIB_DIR AND NOT POLKITQT-1_INCLUDE_DIR)
+ message(WARNING "Qt bindings for policykit are not found. Razor policykit integration won't be built")
+@@ -13,7 +15,7 @@
+ message(STATUS "PolkitQt-1: ${POLKITQT-1_VERSION_STRING}")
+ message(STATUS " libs: ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}")
+ message(STATUS " include: ${POLKITQT-1_INCLUDE_DIR}")
+-
++
+ find_package(PkgConfig)
+ pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
+ message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")
+@@ -27,6 +29,7 @@
+ ${CMAKE_SOURCE_DIR}/libraries
+ ${POLKIT_AGENT_INCLUDE_DIRS}
+ ${POLKITQT-1_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ )
+
+ set(razor-policykit-agent_SRCS
+@@ -53,7 +56,7 @@
+ ${razor-policykit-agent_UI}
+ )
+ #************************************************
+-
++
+ QT4_WRAP_CPP(razor-policykit-agent_MOCS ${razor-policykit-agent_H})
+ QT4_WRAP_UI(razor-policykit-agent_UI_CPP ${razor-policykit-agent_UI})
+
+@@ -70,10 +73,11 @@
+ ${POLKITQT-1_CORE_LIBRARY}
+ ${POLKITQT-1_AGENT_LIBRARY}
+ ${POLKIT_AGENT_LIBRARIES}
+- qtxdg razorqt
++ ${QTXDG_LIBRARIES}
++ razorqt
+ )
+-
+-
++
++
+ # install
+ install(TARGETS razor-policykit-agent DESTINATION bin)
+
+diff -urN razorqt-0.5.2.orig/razorqt-runner/CMakeLists.txt razorqt-0.5.2/razorqt-runner/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-runner/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-runner/CMakeLists.txt 2014-08-25 14:38:35.000000000 +0400
+@@ -38,7 +38,6 @@
+ set(razor-runner_LIBRARIES
+ razorqt
+ razorqxt
+- qtxdg
+ )
+
+ set(QT_USE_QTXML true)
+@@ -64,10 +63,10 @@
+
+ # Translations **********************************
+ include(RazorTranslate)
+-razor_translate_ts(razor-runner_QM_FILES
++razor_translate_ts(razor-runner_QM_FILES
+ SOURCES
+ ${razor-runner_H_FILES}
+- ${razor-runner_CPP_FILES}
++ ${razor-runner_CPP_FILES}
+ ${razor-runner_UI_FILES}
+ )
+ #************************************************
+@@ -90,6 +89,9 @@
+ include(${QT_USE_FILE})
+ find_package(X11 REQUIRED)
+ include_directories(${X11_INCLUDE_DIR})
++find_package(QTXDG REQUIRED)
++include(${QTXDG_USE_FILE})
++include_directories(${QTXDG_INCLUDE_DIRS})
+
+ set(RAZOR_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/razor)
+ set(APP_SHARE_DIR ${RAZOR_SHARE_DIR}/${PROJECT_NAME})
+@@ -108,7 +110,7 @@
+ endif (VBOXRUNNER_HEADLESS)
+
+ if (RUNNER_VBOX)
+- set(QRC_FILES
++ set(QRC_FILES
+ ${QRC_FILES}
+ virtualbox-icons.qrc
+ )
+@@ -119,15 +121,15 @@
+ qt4_wrap_ui(razor-runner_UI_HEADERS ${razor-runner_UI_FILES})
+ qt4_add_resources(razor-runner_QRC_SOURCES ${QRC_FILES})
+
+-add_executable(${PROJECT_NAME}
+- ${razor-runner_CPP_FILES}
+- ${razor-runner_UI_FILES}
+- ${razor-runner_QRC_SOURCES}
+- ${razor-runner_QM_FILES}
++add_executable(${PROJECT_NAME}
++ ${razor-runner_CPP_FILES}
++ ${razor-runner_UI_FILES}
++ ${razor-runner_QRC_SOURCES}
++ ${razor-runner_QM_FILES}
+ ${razor-runner_MOC_SOURCES})
+
+ add_dependencies(${PROJECT_NAME} razorqt)
+-target_link_libraries(${PROJECT_NAME} ${razor-runner_LIBRARIES} ${QT_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} ${razor-runner_LIBRARIES} ${QT_LIBRARIES} ${QTXDG_LIBRARIES})
+
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(FILES ${CONFIG_FILES} DESTINATION ${APP_SHARE_DIR})
+diff -urN razorqt-0.5.2.orig/razorqt-session/razor-config-session/CMakeLists.txt razorqt-0.5.2/razorqt-session/razor-config-session/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-session/razor-config-session/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-session/razor-config-session/CMakeLists.txt 2014-08-25 14:41:55.000000000 +0400
+@@ -4,6 +4,7 @@
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libraries/)
+
+ set( razor-sessioncfg_HDRS
+@@ -43,22 +44,22 @@
+ QT4_WRAP_CPP(razor-sessioncfg_MOCS ${razor-sessioncfg_HDRS})
+ # Translations **********************************
+ include(RazorTranslate)
+-razor_translate_ts(razor-sessioncfg_QM_FILES
++razor_translate_ts(razor-sessioncfg_QM_FILES
+ SOURCES
+ ${razor-sessioncfg_HDRS}
+- ${razor-sessioncfg_SRCS}
++ ${razor-sessioncfg_SRCS}
+ ${razor-sessioncfg_UI_FILES}
+ )
+
+ razor_translate_desktop(razor-sessioncfg_DESKTOP_FILES
+ SOURCES
+ razor-config-session.desktop.in
+-)
++)
+ #************************************************
+
+ add_executable ( razor-config-session ${razor-sessioncfg_SRCS} ${razor-sessioncfg_UIS} ${razor-sessioncfg_MOCS} ${razor-sessioncfg_DESKTOP_FILES} ${razor-sessioncfg_QM_FILES})
+-add_dependencies( razor-config-session razorqt qtxdg)
+-target_link_libraries ( razor-config-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
++add_dependencies( razor-config-session razorqt)
++target_link_libraries ( razor-config-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${QTXDG_LIBRARIES} razorqt)
+
+ INSTALL(TARGETS razor-config-session RUNTIME DESTINATION bin)
+ install(FILES ${razor-sessioncfg_DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+diff -urN razorqt-0.5.2.orig/razorqt-session/razor-session/CMakeLists.txt razorqt-0.5.2/razorqt-session/razor-session/CMakeLists.txt
+--- razorqt-0.5.2.orig/razorqt-session/razor-session/CMakeLists.txt 2013-01-12 20:45:52.000000000 +0400
++++ razorqt-0.5.2/razorqt-session/razor-session/CMakeLists.txt 2014-08-25 14:42:10.000000000 +0400
+@@ -8,6 +8,7 @@
+ add_definitions ( -Wall )
+ find_package ( Qt4 REQUIRED )
+ find_package ( X11 REQUIRED )
++find_package ( QTXDG REQUIRED )
+
+ include(RazorLibSuffix)
+
+@@ -15,6 +16,7 @@
+ include_directories (
+ ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR}
++ ${QTXDG_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libraries/
+ src)
+
+@@ -40,10 +42,10 @@
+
+ # Translations **********************************
+ include(RazorTranslate)
+-razor_translate_ts(razor-runner_QM_FILES
++razor_translate_ts(razor-runner_QM_FILES
+ SOURCES
+ ${razor-session_HDRS}
+- ${razor-session_SRCS}
++ ${razor-session_SRCS}
+ ${razor-session_UI}
+ )
+
+@@ -53,8 +55,8 @@
+ qt4_wrap_ui(UIS ${razor-session_UI})
+
+ add_executable ( razor-session ${razor-session_SRCS} ${UIS} ${RSCS} ${razor-runner_QM_FILES} ${MOCS} )
+-add_dependencies( razor-session razorqt qtxdg)
+-target_link_libraries ( razor-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
++add_dependencies( razor-session razorqt)
++target_link_libraries ( razor-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${QTXDG_LIBRARIES} razorqt)
+ INSTALL(TARGETS razor-session RUNTIME DESTINATION bin)
+
+ if (NOT DEFINED BUNDLE_XDG_UTILS)
diff --git a/razorqt.spec b/razorqt.spec
index b3dde53..830c517 100644
--- a/razorqt.spec
+++ b/razorqt.spec
@@ -18,14 +18,13 @@
Name: razorqt
Version: 0.5.2
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Lightweight desktop toolbox
License: GPLv2+
Url: http://razor-qt.org
Source0: http://razor-qt.org/downloads/%{name}-%{version}.tar.bz2
# find_lang helper: (for i in `find . -type f -name "*_uk.ts"`; do echo "`basename $i`" | sed -r 's/_uk\.ts$//'; done) | sort
Source1: %{name}-l10n-%{version}.lst
-Source2: libqtxdg-0.5.3.tar.gz
# These are customizations - not bugs
Patch0: %{name}-%{version}-desktop.patch
Patch1: %{name}-%{version}-panel.patch
@@ -33,6 +32,7 @@ BuildRequires: %{cmake_pkg} >= 2.8.5
BuildRequires: doxygen, desktop-file-utils
BuildRequires: pkgconfig(QtGui), pkgconfig(QtWebKit)
BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(qtxdg) = 0.5.3
Requires: %{name}-about = %{version}-%{release}
Requires: %{name}-appswitcher = %{version}-%{release}
Requires: %{name}-autosuspend = %{version}-%{release}
@@ -53,7 +53,7 @@ Requires: %{name}-policykit-agent = %{version}-%{release}
# upstreamable patch to support liblightdm-qt-3
Patch2: razorqt-0.5.2-liblightdm-qt-3.patch
# hack
-Patch3: libqtxdg-0.5.3.diff
+Patch3: razorqt-libqtxdg-0.5.3.patch
%description
RazorQt is an advanced, easy-to-use, and fast desktop environment
@@ -310,34 +310,16 @@ Requires: %{name}-theme-light = %{version}-%{release}
%description themes
Razor-qt themes meta-package
-%package -n libqtxdg
-Summary: Qt implementation of the XDG Specifications
-BuildRequires: file-devel
-
-%description -n libqtxdg
-This library implements functions of the XDG Specifications in Qt.
-
-%package -n libqtxdg-devel
-Summary: Development files for QtXdg library
-Requires: libqtxdg%{?_isa} = %{version}-%{release}
-
-%description -n libqtxdg-devel
-Qt implementation of the XDG Specifications, development package.
-This package provides the development files for the qtxdg library.
-This library implements functions of the XDG Specifications in Qt.
-This package is part of the Razor-qt.
%prep
%setup -q
cp razorqt-desktop/resources/desktop.conf razorqt-desktop/resources/desktop.conf.sample
cp razorqt-panel/panel/resources/panel.conf razorqt-panel/panel/resources/panel.conf.sample
+rm -rf libraries/qtxdg
%patch0 -p 0
%patch1 -p 0
%patch2 -p1 -b .liblightdm-qt-3
-tar xf %{SOURCE2} -C libraries
-rm -rf libraries/qtxdg
-mv libraries/libqtxdg-0.5.3 libraries/qtxdg
-%patch3 -p 0
+%patch3 -p 1
%build
mkdir build
@@ -382,9 +364,6 @@ rm -f %{buildroot}/%{_sysconfdir}/razor/desktop.conf.sample
rm -f %{buildroot}/%{_sysconfdir}/xdg/autostart/razor-policykit-agent.desktop
%endif
-%post -n libqtxdg -p /sbin/ldconfig
-
-%postun -n libqtxdg -p /sbin/ldconfig
%post libs -p /sbin/ldconfig
@@ -421,17 +400,6 @@ fi
%files
# meta package
-%files -n libqtxdg -f libqtxdg.lang
-%doc COPYING GPL LGPL
-%{_libdir}/libqtxdg.so.*
-%dir %{_datadir}/libqtxdg/
-
-%files -n libqtxdg-devel
-%{_libdir}/libqtxdg.so
-%{_libdir}/pkgconfig/qtxdg.pc
-%{_includedir}/qtxdg/
-%{_datadir}/cmake/qtxdg/qtxdg-config.cmake
-%{_datadir}/cmake/qtxdg/qtxdg_use.cmake
%files libs -f librazorqt.lang
%doc COPYING GPL LGPL
@@ -602,6 +570,9 @@ fi
# meta package
%changelog
+* Sun Oct 05 2014 TI_Eugene <ti.eugene at gmail.com> 0.5.2-20
+- rebuild with system libqtxdg-0.5.3
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list