]> git.pld-linux.org Git - packages/uim.git/blob - uim-qt5-options.patch
Release 2 (by relup.sh)
[packages/uim.git] / uim-qt5-options.patch
1 --- uim-1.8.9/configure.ac.orig 2023-01-31 07:07:28.042694371 +0100
2 +++ uim-1.8.9/configure.ac      2023-02-01 22:17:54.615354533 +0100
3 @@ -1150,6 +1150,18 @@ AC_ARG_WITH(qt5-immodule,
4    [],
5    [with_qt5_immodule=no])
6  
7 +AC_ARG_WITH(qt5-quick,
8 +  AC_HELP_STRING([--with-qt5-quick],
9 +    [build Qt5Quick plugin]),
10 +  [],
11 +  [with_qt5_quick=$with_qt5])
12 +
13 +AC_ARG_WITH(kde5,
14 +  AC_HELP_STRING([--with-kde5],
15 +    [build KDE5 plasmoid]),
16 +  [],
17 +  [with_kde5=$with_qt5])
18 +
19  if test "x$with_qt5" = xyes || test "x$with_qt5_immodule" = xyes; then
20    if test -z "$QMAKE5"; then
21      AC_MSG_ERROR([no qmake for Qt5 found])
22 @@ -1954,12 +1966,20 @@ if test "x$with_qt5" = xyes; then
23    if test "x$with_qt5_immodule" = xyes; then
24      qt5_immodule_option="DEFINES+=QT5_IMMODULE"
25    fi
26 +  CMAKE_ARGS=
27 +  if test "x$with_qt5_quick" = xyes; then
28 +    CMAKE_ARGS="$CMAKE_ARGS -DWITH_QUICK=ON"
29 +  fi
30 +  if test "x$with_kde5" = xyes; then
31 +    CMAKE_ARGS="$CMAKE_ARGS -DWITH_KDE5=ON"
32 +  fi
33    set -e
34    # FIXME: move CMAKE_CXX_FLAGS into cmake_option
35    ${CMAKE} \
36      -B ${ac_abs_top_builddir}/qt5/applet.cmake \
37      -S ${ac_abs_top_srcdir}/qt5/applet \
38      -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
39 +    $CMAKE_ARGS \
40      ${cmake_option}
41    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
42      ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
43 --- uim-1.8.9/qt5/applet/CMakeLists.txt.orig    2020-03-27 23:51:26.000000000 +0100
44 +++ uim-1.8.9/qt5/applet/CMakeLists.txt 2023-02-01 22:18:53.598368328 +0100
45 @@ -1,5 +1,9 @@
46  project(uim-applet)
47  
48 +option(WITH_KDE5 "KDE5 plasmoid applet")
49 +option(WITH_QUICK "Qt5Quick module")
50 +
51 +if(WITH_KDE5)
52  # use Extra CMake Modules (ECM) for common functionality
53  find_package(ECM REQUIRED NO_MODULE)
54  # needed by find_package(KF5Plasma) below.
55 @@ -10,5 +14,8 @@ find_package(KF5Plasma REQUIRED)
56  
57  # Add installation target ("make install")
58  plasma_install_package(plasmoid com.github.uim.status)
59 +endif()
60  
61 +if(WITH_QUICK)
62  add_subdirectory(qtquick-plugin)
63 +endif()
64 --- uim-1.8.9/configure.ac.orig 2023-02-02 21:18:06.666723146 +0100
65 +++ uim-1.8.9/configure.ac      2023-02-02 21:31:56.125562915 +0100
66 @@ -1901,6 +1901,7 @@ if test "x$CMAKE" != xno; then
67    # FIXME: move CMAKE_CXX_FLAGS into cmake_option
68    cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
69    cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
70 +  cmake_option="${cmake_option} -DCMAKE_INSTALL_LIBDIR=${libdir}"
71    cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
72    cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
73  fi
This page took 0.064632 seconds and 3 git commands to generate.