diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-09-05 22:54:50 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-09-06 03:54:43 +0200 |
| commit | 6050cf5b5b66bd53d20c9b8b3d4de9c0b9847336 (patch) | |
| tree | e27d30169d9ba458690a6520adf3dc8cdf3e6960 | |
| parent | 83f4e7547c1bca68c3786dfb7dba10182c87a84e (diff) | |
| download | tde-packaging-6050cf5b5b66bd53d20c9b8b3d4de9c0b9847336.tar.gz tde-packaging-6050cf5b5b66bd53d20c9b8b3d4de9c0b9847336.zip | |
DEB gtk-qt-engine: Housekeeping of CMake rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 19c0416351535854618916d018d37a7f8e3b8e55)
4 files changed, 10 insertions, 39 deletions
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs index 6f7727790..76c3076c9 100644 --- a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs +++ b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs @@ -1,2 +1,3 @@ +AUTHORS README.md TODO diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/rules b/debian/_base/applications/themes/gtk-qt-engine/debian/rules index 3da211208..a6797f19a 100755 --- a/debian/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/debian/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,37 +1,17 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs index 6f7727790..76c3076c9 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs @@ -1,2 +1,3 @@ +AUTHORS README.md TODO diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules index d2050021c..a6797f19a 100755 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,28 +1,17 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" |