diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-04-24 22:28:34 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-04-25 01:33:55 +0200 |
| commit | 992c464040a6a0e66c9775739fa155c5c8cd0e83 (patch) | |
| tree | 9a0a5ea95fc37195497e4a75ae3c5936a84f9577 /source/kde/kde/cmake/marble | |
| parent | 2afec1d1768f9cbcc3e963eb0b22d822aea4db1e (diff) | |
| download | current-20230424222834.tar.gz current-20230424222834.tar.xz | |
Mon Apr 24 22:28:34 UTC 202320230424222834
d/parallel-20230422-noarch-1.txz: Upgraded.
d/patchelf-0.18.0-x86_64-1.txz: Upgraded.
d/perl-5.36.1-x86_64-1.txz: Upgraded.
Upgraded: libnet-3.15.
kde/baloo-5.105.0-x86_64-2.txz: Rebuilt.
Move XDG directory to /etc/kde/xdg.
kde/kdepim-addons-23.04.0-x86_64-2.txz: Rebuilt.
Add some more import plugins.
kde/kdiagram-2.8.0-x86_64-5.txz: Rebuilt.
Include license in docs.
kde/kid3-3.9.3-x86_64-2.txz: Rebuilt.
kde/kross-interpreters-23.04.0-x86_64-2.txz: Rebuilt.
Add krossruby.so.
kde/kservice-5.105.0-x86_64-2.txz: Rebuilt.
Use default menu name.
kde/ktextaddons-1.2.1-x86_64-1.txz: Upgraded.
kde/marble-23.04.0-x86_64-2.txz: Rebuilt.
Add marble-maps.
kde/plasma-browser-integration-5.27.4-x86_64-2.txz: Rebuilt.
Move under /etc/kde.
kde/prison-5.105.0-x86_64-2.txz: Rebuilt.
Add PrisonScanner component.
kde/pulseaudio-qt-1.3-x86_64-3.txz: Rebuilt.
Include licenses in docs.
kde/solid-5.105.0-x86_64-2.txz: Rebuilt.
Add solid-power.
kde/umbrello-23.04.0-x86_64-2.txz: Rebuilt.
Don't ship API docs.
l/glib2-2.76.2-x86_64-1.txz: Upgraded.
l/imagemagick-7.1.1_8-x86_64-1.txz: Upgraded.
l/libmtp-1.1.21-x86_64-1.txz: Upgraded.
xfce/xfce4-weather-plugin-0.11.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/cmake/marble')
| -rw-r--r-- | source/kde/kde/cmake/marble | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/source/kde/kde/cmake/marble b/source/kde/kde/cmake/marble index 1e6c6e64a..9fc7c82d3 100644 --- a/source/kde/kde/cmake/marble +++ b/source/kde/kde/cmake/marble @@ -1,7 +1,6 @@ -function marble_configure() -{ +mkdir cmake-build +cd cmake-build cmake \ - $* \ $KDE_OPT_ARGS \ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -11,43 +10,20 @@ function marble_configure() -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DBUILD_TESTING=OFF \ - .. -} - -# Configure the Qt5 support first: -mkdir cmake-build_qt5 -cd cmake-build_qt5 -marble_configure \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DBUILD_TESTING=OFF \ + -DBUILD_TOUCH=ON \ + -DBUILD_MARBLE_EXAMPLES=OFF \ + -DBUILD_MARBLE_TESTS=OFF \ + -DMOBILE=OFF \ + .. -# -#cd - -# -## Add Qt4 support (needed by libkgeomap): -#mkdir cmake-build_qt4 -#cd cmake-build_qt4 -#QT5DIR="" \ -#QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ -#marble_configure \ -# -DQT_MOC_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/moc \ -# -DQT_QMAKE_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/qmake \ -# -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt/plugins \ -# -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt/plugins \ -# -DMARBLE_PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/marble4/plugins \ -# -DQT5BUILD=OFF \ -# -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \ -# -DCMAKE_DISABLE_FIND_PACKAGE_KF5=ON \ -# -DBUILD_MARBLE_TESTS=OFF \ -# -DBUILD_MARBLE_APPS=OFF -# -## make can pick up from here, and first build the Qt4, then Qt5 stuff. -# |