From 010d66fc861d6fffbd5301d6c9e028d1db40256a Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Jun 30 2021 08:58:50 +0000 Subject: 2.0.0 --- diff --git a/maliit-framework-properly-search-for-qtwaylandscanner.patch b/maliit-framework-properly-search-for-qtwaylandscanner.patch new file mode 100644 index 0000000..4f08b2f --- /dev/null +++ b/maliit-framework-properly-search-for-qtwaylandscanner.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/FindQtWaylandScanner.cmake b/cmake/FindQtWaylandScanner.cmake +index 3143d01..f38ee7f 100644 +--- a/cmake/FindQtWaylandScanner.cmake ++++ b/cmake/FindQtWaylandScanner.cmake +@@ -69,7 +69,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpers.cmake) + ecm_find_package_version_check(QtWaylandScanner) + + # Find qtwaylandscanner +-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib64/qt5/bin/) ++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner ++ HINTS /usr/lib64/qt5/bin/ /usr/lib/qt5/bin/) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QtWaylandScanner diff --git a/maliit-framework.spec b/maliit-framework.spec index c313eef..111ecfa 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -1,51 +1,56 @@ -Name: maliit-framework -Version: 0.94.2 -Release: 22%{?dist} -Summary: Input method framework +Name: maliit-framework +Version: 2.0.0 +Release: 1%{?dist} +Summary: Input method framework -License: LGPLv2 -URL: http://maliit.org/ -Source0: http://maliit.org/releases/%{name}/%{name}-%{version}.tar.bz2 +License: LGPLv2 +URL: https://maliit.github.io/ +Source0: https://github.com/maliit/framework/archive/refs/tags/framework-%{version}.tar.gz +# Upstream PR: https://github.com/maliit/framework/pull/57 +Patch0: maliit-framework-properly-search-for-qtwaylandscanner.patch + +BuildRequires: cmake BuildRequires: make -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel +BuildRequires: gcc-c++ + BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk2-devel BuildRequires: gtk3-devel -BuildRequires: gtk-doc -BuildRequires: hunspell-devel BuildRequires: libX11-devel BuildRequires: libXcomposite-devel BuildRequires: libXdamage-devel BuildRequires: libXext-devel BuildRequires: libXfixes-devel -BuildRequires: qt-devel +BuildRequires: libxkbcommon-devel BuildRequires: systemd-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtbase-private-devel +#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtwayland-devel + +BuildRequires: wayland-devel +BuildRequires: wayland-protocols-devel + +Obsoletes: maliit-framework-gtk2 < 2.0.0 +Obsoletes: maliit-framework-qt4 < 2.0.0 + %description Maliit provides a flexible and cross-platform input method framework. It has a plugin-based client-server architecture where applications act as clients and communicate with the Maliit server via input context plugins. The communication link currently uses D-Bus. -%package qt4 -Summary: Input method module for Qt 4 based on Maliit framework +%package qt5 +Summary: Input method module for Qt 5 based on Maliit framework Requires: %{name}%{?_isa} = %{version}-%{release} -%description qt4 +%description qt5 Input method module for Qt 4 based on Maliit framework. -%package gtk2 -Summary: Input method module for GTK+ 2 based on Maliit framework -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description gtk2 -Input method module for GTK+ 2 based on Maliit framework. - %package gtk3 Summary: Input method module for GTK+ 3 based on Maliit framework Requires: %{name}%{?_isa} = %{version}-%{release} @@ -69,39 +74,24 @@ This package contains developer documentation for %{name}. %package examples Summary: Tests and examples for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} -Requires: %{name}-qt4%{?_isa} = %{version}-%{release} +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description examples This package contains tests and examples for %{name}. %prep -%setup -q -sed -i 's/ -O0//' config.pri - -# Fix shebang of maliit-exampleapp-gtk3-python.py executable to avoid depending on Python 2. -sed -i '1s=^#!/usr/bin/env python=#!/usr/bin/python3=' examples/apps/gtk3-python/maliit-exampleapp-gtk3-python.py +%autosetup -n framework-%{version} -p1 %build +%cmake -Denable-examples=ON \ + -Denable-dbus-activation=ON \ + -Denable-wayland-gtk=ON -%{qmake_qt4} -r MALIIT_VERSION=%{version} PREFIX=%{_prefix} \ - BINDIR=%{_bindir} LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir} \ - MALIIT_ENABLE_MULTITOUCH=true MALIIT_DEBUG=disabled \ - CONFIG+=disable-gtk-cache-update CONFIG+=disable-preedit \ - CONFIG+=enable-hunspell CONFIG+=enable-dbus-activation \ - CONFIG+=disable-background-translucency - -make %{?_smp_mflags} V=1 +%cmake_build %install -make install INSTALL="install -p" INSTALL_ROOT=%{buildroot} DESTDIR=%{buildroot} - -find %{buildroot} -name '.moc' -delete -find %{buildroot} -name '.gitignore' -delete - -# e.g. maliit-plugins package stores files in there -mkdir -p %{buildroot}%{_datadir}/maliit +%cmake_install %ldconfig_scriptlets @@ -109,43 +99,39 @@ mkdir -p %{buildroot}%{_datadir}/maliit %license LICENSE.LGPL %doc README NEWS %{_bindir}/maliit-server -%{_libdir}/libmaliit*.so.* -%dir %{_libdir}/maliit -%dir %{_libdir}/maliit/plugins -%dir %{_libdir}/maliit/plugins/factories -%{_libdir}/maliit/plugins/factories/libmaliit-plugins-quick-factory.so -%{_libdir}/girepository-1.0/Maliit-1.0.typelib -%{_datadir}/maliit/ +%{_libdir}/libmaliit-glib.so.2 +%{_libdir}/libmaliit-glib.so.2.0.0 +%{_libdir}/libmaliit-plugins.so.2 +%{_libdir}/libmaliit-plugins.so.2.0.0 %{_datadir}/dbus-1/services/org.maliit.server.service -%files qt4 -%{_libdir}/qt4/plugins/inputmethods/libmaliit* - -%files gtk2 -%{_libdir}/gtk-2.0/2.10.0/immodules/libim-maliit.so +%files qt5 +%{_libdir}/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so +%{_libdir}/qt5/plugins/wayland-shell-integration/libinputpanel-shell.so %files gtk3 -%{_libdir}/gtk-3.0/3.0.0/immodules/libim-maliit.so +%{_libdir}/gtk-3.0/3.0.0/immodules/libim-wayland.so %files devel -%{_includedir}/maliit/ -%{_libdir}/libmaliit*.so -%{_libdir}/pkgconfig/maliit*.pc -%{_libdir}/qt4/mkspecs/features/maliit* -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Maliit-1.0.gir +%{_includedir}/maliit-2 +%{_libdir}/cmake/MaliitGLib/ +%{_libdir}/cmake/MaliitPlugins/ +%{_libdir}/libmaliit-plugins.so +%{_libdir}/libmaliit-glib.so +%{_libdir}/pkgconfig/*.pc +%{_libdir}/qt5/mkspecs/features/*.prf %files docs -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/maliit/ -%{_datadir}/doc/maliit-framework/html +%{_datadir}/doc/maliit-framework-doc/ +%{_datadir}/doc/maliit-framework/ %files examples -%{_bindir}/maliit-example* -%{_libdir}/maliit-framework-tests +%{_bindir}/maliit-exampleapp-plainqt %changelog +* Tue Jun 29 2021 Jan Grulich - 2.0.0-1 +- 2.0.0 + * Tue Jan 26 2021 Fedora Release Engineering - 0.94.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild