diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c6d313ab..191c56e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(INCLUDE_INSTALL_RPEFIX "/usr/include/${PROJECT_NAME}") set(PLUGIN_INSTALL_PATH ${LIBRARY_INSTALL_PREFIX}/plugins) set(TOOLS_INSTALL_PATH ${LIBRARY_INSTALL_PREFIX}/tools) # set install runtime path -set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PREFIX} ${PLUGIN_PATH}) +# set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PREFIX} ${PLUGIN_PATH}) message(STATUS "LIBRARY_INSTALL_PREFIX ${LIBRARY_INSTALL_PREFIX}") message(STATUS "RUNTIME_INSTALL_RPEFIX ${RUNTIME_INSTALL_RPEFIX}") @@ -50,7 +50,7 @@ message(STATUS "SOURCES_INSTALL_RPEFIX ${SOURCES_INSTALL_RPEFIX}") message(STATUS "INCLUDE_INSTALL_RPEFIX ${INCLUDE_INSTALL_RPEFIX}") message(STATUS "PLUGIN_INSTALL_PATH ${PLUGIN_INSTALL_PATH}") message(STATUS "TOOLS_INSTALL_PATH ${TOOLS_INSTALL_PATH}") -message(STATUS "CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}") +# message(STATUS "CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}") # build runtime path set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}) @@ -80,7 +80,7 @@ if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64") endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-need -fPIE") +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-need -fPIE") find_package(Qt6 COMPONENTS Core QUIET) if (Qt6_FOUND) diff --git a/debian/control b/debian/control index 899140770..798b84b55 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: qt6-tools-dev-tools | qttools5-dev-tools, qt6-tools-dev | qttools5-dev, qt6-webengine-dev | qtwebengine5-dev, - qt6-multimedia-dev, + qt6-multimedia-dev | libdtkmultimedia-dev, libdtk6widget-dev | libdtkwidget-dev, libdtk6gui-dev | libdtkgui-dev, libdtk6core-dev | libdtkcore-dev, diff --git a/debian/rules b/debian/rules index 58e746a98..47bb90a76 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,15 @@ #!/usr/bin/make -f -include /usr/share/dpkg/default.mk + export QT_SELECT=5 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=1 -fPIC +export DEB_CXXFLAGS_MAINT_APPEND = -Wall -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=1 -fPIC +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -pie + +include /usr/share/dpkg/default.mk + define detect_qt_version ifneq (,$(shell which qmake6 2>/dev/null)) QT_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6"