From acb5679384b30a28dc968b13211ff41db9bf0e1d Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 27 Jan 2017 11:01:41 +0100 Subject: KDE: update the collection of cmake scripts for new/modified packages. --- kde/cmake/akonadi-calendar-tools | 1 + kde/cmake/akonadi-import-wizard | 1 + kde/cmake/akonadiconsole | 1 + kde/cmake/akregator | 1 + kde/cmake/applications5 | 28 ------------------------ kde/cmake/audiocd-kio | 1 + kde/cmake/blogilo | 1 + kde/cmake/calligra | 2 ++ kde/cmake/grantlee-editor | 1 + kde/cmake/k3b | 1 + kde/cmake/kaddressbook | 1 + kde/cmake/kalarm | 1 + kde/cmake/kalzium | 1 + kde/cmake/kde-runtime | 1 + kde/cmake/kdegraphics-mobipocket | 1 + kde/cmake/kdiagram | 1 + kde/cmake/kdialog | 1 + kde/cmake/keditbookmarks | 1 + kde/cmake/kfind | 1 + kde/cmake/kgpg | 1 + kde/cmake/kmail | 1 + kde/cmake/kmail-account-wizard | 1 + kde/cmake/knotes | 1 + kde/cmake/konqueror | 1 + kde/cmake/kontact | 1 + kde/cmake/korganizer | 1 + kde/cmake/kqtquickcharts | 1 + kde/cmake/krita | 24 ++++++++++++++++++++ kde/cmake/ktouch | 1 + kde/cmake/kwave | 24 ++++++++++++++++++++ kde/cmake/libkcddb | 1 + kde/cmake/libkcompactdisc | 1 + kde/cmake/marble | 41 +++++++++++++++++++---------------- kde/cmake/mbox-importer | 1 + kde/cmake/messagelib | 24 +++++++++++++++++++- kde/cmake/okular | 1 + kde/cmake/pim-data-exporter | 1 + kde/cmake/pim-sieve-editor | 1 + kde/cmake/pim-storage-service-manager | 1 + kde/cmake/prison | 1 + kde/cmake/svgpart | 1 + 41 files changed, 130 insertions(+), 48 deletions(-) create mode 120000 kde/cmake/akonadi-calendar-tools create mode 120000 kde/cmake/akonadi-import-wizard create mode 120000 kde/cmake/akonadiconsole create mode 120000 kde/cmake/akregator create mode 120000 kde/cmake/audiocd-kio create mode 120000 kde/cmake/blogilo create mode 120000 kde/cmake/grantlee-editor create mode 120000 kde/cmake/kaddressbook create mode 120000 kde/cmake/kalarm create mode 120000 kde/cmake/kalzium create mode 120000 kde/cmake/kdegraphics-mobipocket create mode 120000 kde/cmake/kdiagram create mode 120000 kde/cmake/kdialog create mode 120000 kde/cmake/keditbookmarks create mode 120000 kde/cmake/kfind create mode 120000 kde/cmake/kgpg create mode 120000 kde/cmake/kmail create mode 120000 kde/cmake/kmail-account-wizard create mode 120000 kde/cmake/knotes create mode 120000 kde/cmake/konqueror create mode 120000 kde/cmake/kontact create mode 120000 kde/cmake/korganizer create mode 120000 kde/cmake/kqtquickcharts create mode 100644 kde/cmake/krita create mode 120000 kde/cmake/ktouch create mode 100644 kde/cmake/kwave create mode 120000 kde/cmake/libkcddb create mode 120000 kde/cmake/libkcompactdisc create mode 120000 kde/cmake/mbox-importer mode change 120000 => 100644 kde/cmake/messagelib create mode 120000 kde/cmake/okular create mode 120000 kde/cmake/pim-data-exporter create mode 120000 kde/cmake/pim-sieve-editor create mode 120000 kde/cmake/pim-storage-service-manager create mode 120000 kde/cmake/prison create mode 120000 kde/cmake/svgpart diff --git a/kde/cmake/akonadi-calendar-tools b/kde/cmake/akonadi-calendar-tools new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/akonadi-calendar-tools @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/akonadi-import-wizard b/kde/cmake/akonadi-import-wizard new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/akonadi-import-wizard @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/akonadiconsole b/kde/cmake/akonadiconsole new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/akonadiconsole @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/akregator b/kde/cmake/akregator new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/akregator @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/applications5 b/kde/cmake/applications5 index 57353de..626e05d 100644 --- a/kde/cmake/applications5 +++ b/kde/cmake/applications5 @@ -1,31 +1,3 @@ -# Temporary cludge to fix badly ported apps: -for APP in \ -libkexiv2 \ -libkdcraw \ -kde-baseapps \ -kde-runtime \ -okular \ -kdegraphics-thumbnailers \ -kolourpaint \ -kopete \ -ksnapshot \ -superkaramba \ -libkcddb \ -kget \ -kdeartwork \ -kajongg \ -ksirk \ -kalzium \ -; do - if [ "$APP" = "$PKGNAME" ]; then - if ! grep -q 'cmake_minimum_required' CMakeLists.txt ; then - # Prepend a cmake_minimum_required stanza at the top, which enables - # newer cmake features which the build needs: - sed -i -e '1icmake_minimum_required(VERSION 2.8.9)\' CMakeLists.txt - fi - fi -done - mkdir build cd build cmake \ diff --git a/kde/cmake/audiocd-kio b/kde/cmake/audiocd-kio new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/audiocd-kio @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/blogilo b/kde/cmake/blogilo new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/blogilo @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/calligra b/kde/cmake/calligra index adb281f..442a45b 100644 --- a/kde/cmake/calligra +++ b/kde/cmake/calligra @@ -13,5 +13,7 @@ cd build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DIHAVEPATCHEDQT:BOOL=ON \ + -DOPENJPEG_INCLUDE_DIR=/usr/include/openmj2-2.1 \ + -DOPENJPEG_NAMES=openmj2 \ .. diff --git a/kde/cmake/grantlee-editor b/kde/cmake/grantlee-editor new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/grantlee-editor @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/k3b b/kde/cmake/k3b index 75a29ec..f770d25 100644 --- a/kde/cmake/k3b +++ b/kde/cmake/k3b @@ -1,3 +1,4 @@ +sed -i.cmakehack -e "s|^cmake_minimum_required|#cmake_minimum_required|" CMakeLists.txt mkdir build cd build cmake \ diff --git a/kde/cmake/kaddressbook b/kde/cmake/kaddressbook new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kaddressbook @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kalarm b/kde/cmake/kalarm new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kalarm @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kalzium b/kde/cmake/kalzium new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kalzium @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kde-runtime b/kde/cmake/kde-runtime index 6b6e7e4..501415c 100644 --- a/kde/cmake/kde-runtime +++ b/kde/cmake/kde-runtime @@ -14,6 +14,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \ -DBUILD_doc=OFF \ + -DBUILD_drkonqi=OFF \ -DBUILD_khelpcenter=OFF \ -DBUILD_kglobalaccel=OFF \ -DBUILD_kuiserver=OFF \ diff --git a/kde/cmake/kdegraphics-mobipocket b/kde/cmake/kdegraphics-mobipocket new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kdegraphics-mobipocket @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kdiagram b/kde/cmake/kdiagram new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kdiagram @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kdialog b/kde/cmake/kdialog new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kdialog @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/keditbookmarks b/kde/cmake/keditbookmarks new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/keditbookmarks @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kfind b/kde/cmake/kfind new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kfind @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kgpg b/kde/cmake/kgpg new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kgpg @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kmail b/kde/cmake/kmail new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kmail @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kmail-account-wizard b/kde/cmake/kmail-account-wizard new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kmail-account-wizard @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/knotes b/kde/cmake/knotes new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/knotes @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/konqueror b/kde/cmake/konqueror new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/konqueror @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kontact b/kde/cmake/kontact new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kontact @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/korganizer b/kde/cmake/korganizer new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/korganizer @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kqtquickcharts b/kde/cmake/kqtquickcharts new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/kqtquickcharts @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/krita b/kde/cmake/krita new file mode 100644 index 0000000..f559c24 --- /dev/null +++ b/kde/cmake/krita @@ -0,0 +1,24 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPACKAGERS_BUILD=ON \ + .. + diff --git a/kde/cmake/ktouch b/kde/cmake/ktouch new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/ktouch @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/kwave b/kde/cmake/kwave new file mode 100644 index 0000000..d8fc54f --- /dev/null +++ b/kde/cmake/kwave @@ -0,0 +1,24 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DWITH_OGG_OPUS=OFF \ + .. + diff --git a/kde/cmake/libkcddb b/kde/cmake/libkcddb new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/libkcddb @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/libkcompactdisc b/kde/cmake/libkcompactdisc new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/libkcompactdisc @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/marble b/kde/cmake/marble index 3ad624b..f47a2f0 100644 --- a/kde/cmake/marble +++ b/kde/cmake/marble @@ -29,23 +29,26 @@ marble_configure \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca -cd - -# Add Qt4 support (needed by libkgeomap): -mkdir build_qt4 -cd 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. +# +#cd - +# +## Add Qt4 support (needed by libkgeomap): +#mkdir build_qt4 +#cd 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. +# diff --git a/kde/cmake/mbox-importer b/kde/cmake/mbox-importer new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/mbox-importer @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/messagelib b/kde/cmake/messagelib deleted file mode 120000 index ab12832..0000000 --- a/kde/cmake/messagelib +++ /dev/null @@ -1 +0,0 @@ -applications5 \ No newline at end of file diff --git a/kde/cmake/messagelib b/kde/cmake/messagelib new file mode 100644 index 0000000..defd50e --- /dev/null +++ b/kde/cmake/messagelib @@ -0,0 +1,23 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + .. + diff --git a/kde/cmake/okular b/kde/cmake/okular new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/okular @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/pim-data-exporter b/kde/cmake/pim-data-exporter new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/pim-data-exporter @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/pim-sieve-editor b/kde/cmake/pim-sieve-editor new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/pim-sieve-editor @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/pim-storage-service-manager b/kde/cmake/pim-storage-service-manager new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/pim-storage-service-manager @@ -0,0 +1 @@ +applications5 \ No newline at end of file diff --git a/kde/cmake/prison b/kde/cmake/prison new file mode 120000 index 0000000..ec699d7 --- /dev/null +++ b/kde/cmake/prison @@ -0,0 +1 @@ +frameworks \ No newline at end of file diff --git a/kde/cmake/svgpart b/kde/cmake/svgpart new file mode 120000 index 0000000..ab12832 --- /dev/null +++ b/kde/cmake/svgpart @@ -0,0 +1 @@ +applications5 \ No newline at end of file -- cgit v1.2.3