diff --git a/deepin-terminal-5.4.22.tar.gz b/deepin-terminal-5.4.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a8adee0febcb7cb27bd181efcdb58cbcd0c52e21 Binary files /dev/null and b/deepin-terminal-5.4.22.tar.gz differ diff --git a/deepin-terminal.spec b/deepin-terminal.spec index 321d43fafec0b5a6b604c8e2a0f7d5a5d4d3c04b..d748404a1335ba96cc2cf4eede2c0bd306521622 100644 --- a/deepin-terminal.spec +++ b/deepin-terminal.spec @@ -1,107 +1,130 @@ -%global _terminals gnome-terminal mate-terminal xfce4-terminal lxterminal qterminal qterminal-qt5 terminology yakuake fourterm roxterm lilyterm termit xterm mrxvt +%define specrelease 1%{?dist} + +%define libname libqtermwidget5 Name: deepin-terminal -Version: 5.0.4.1 -Release: 1 +Version: 5.4.22 +Release: %{specrelease}.03 Summary: Default terminal emulation application for Deepin -License: GPLv3 -URL: https://github.com/linuxdeepin/deepin-terminal -Source0: %{name}_%{version}.orig.tar.xz - -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: vala-devel -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libwnck-3.0) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(vapigen) -BuildRequires: pkgconfig(vte-2.91) -BuildRequires: pkgconfig(gnutls) -Requires: deepin-menu -Requires: deepin-shortcut-viewer -Requires: expect -Requires: xdg-utils -Recommends: deepin-manual -Recommends: zssh -Requires: %{name}-data = %{version}-%{release} +License: GPLv3+ +URL: https://github.com/linuxdeepin/%{name} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +Provides: deepin-terminal-data +Obsoletes: deepin-terminal-data + +BuildRequires: gcc-c++ +BuildRequires: cmake3 +BuildRequires: qt5-linguist + +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(dtkgui) +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(libsecret-1) + +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: lxqt-build-tools >= 0.6.0~ +BuildRequires: utf8proc-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: xcb-util-wm-devel +BuildRequires: dde-qt-dbus-factory-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qttools-devel +BuildRequires: dtkcommon-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel + +Requires: libqtermwidget5 +Requires: libqtermwidget5-data +Requires: expect +Requires: zssh +Requires: qt-at-spi +Requires: at-spi2-core %description %{summary}. -%package data -Summary: Data files of Deepin Terminal -BuildArch: noarch -Requires: hicolor-icon-theme +%package -n %{libname} +Summary: Terminal emulator widget for Qt 5 +%description -n %{libname} +Terminal emulator widget for Qt 5 (shared libraries) +QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as +built-in console or terminal emulation widget. + +%package -n %{libname}-devel +Summary: Terminal emulator widget for Qt 5 +%description -n %{libname}-devel +Terminal emulator widget for Qt 5 (shared libraries) +QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as +built-in console or terminal emulation widget. + -%description data -The %{name}-data package provides shared data for Deepin Terminal. +%package -n %{libname}-data +Summary: Terminal emulator widget for Qt 5 +%description -n %{libname}-data +Terminal emulator widget for Qt 5 (shared libraries) +QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as +built-in console or terminal emulation widget. %prep -%setup -q -sed -i '/ssh_login/s|lib|libexec|' lib/utils.vala CMakeLists.txt -sed -i '/stdc++/d' CMakeLists.txt -rm -rf po/es_419/ -sed -i '/es_419/d' deepin-terminal.desktop +%autosetup -p1 %build -%cmake -DCMAKE_BUILD_TYPE=Release \ - -DTEST_BUILD=OFF \ - -DUSE_VENDOR_LIB=OFF \ - -DVERSION=%{version} \ - . +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease +export PATH=%{_qt5_bindir}:$PATH +# cmake_minimum_required version is too high +sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version} ../ %make_build +popd %install -%make_install - -%find_lang %{name} - -%preun -if [ $1 -eq 0 ]; then - %{_sbindir}/alternatives --remove x-terminal-emulator %{_bindir}/%{name} -fi - -%post -if [ $1 -ge 1 ]; then - %{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \ - x-terminal-emulator %{_bindir}/%{name} 20 -fi - -%triggerin -- konsole5 %_terminals -if [ $1 -ge 1 ]; then - PRI=20 - for i in konsole %{_terminals}; do - PRI=$((PRI-1)) - test -x %{_bindir}/$i && \ - %{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \ - x-terminal-emulator %{_bindir}/$i $PRI &>/dev/null ||: - done -fi - -%triggerpostun -- konsole5 %_terminals -if [ $2 -eq 0 ]; then - for i in konsole %{_terminals}; do - test -x %{_bindir}/$i || \ - %{_sbindir}/alternatives --remove x-terminal-emulator %{_bindir}/$i &>/dev/null ||: - done -fi +%make_install -C build INSTALL_ROOT="%buildroot" + +%post -n %{libname} +ldconfig + +%postun -n %{libname} +ldconfig %files %doc README.md %license LICENSE %{_bindir}/%{name} -%{_libexecdir}/%{name}/ssh_login.sh - -%files data -f %{name}.lang -%{_datadir}/%{name}/ -%{_datadir}/icons/hicolor/*/apps/%{name}* +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/%{name}.desktop +%{_datadir}/deepin-manual/manual-assets/application/deepin-terminal/terminal/ + +%files -n %{libname} +%{_libdir}/libterminalwidget5.so.0.14.1 + +%files -n %{libname}-devel +%{_includedir}/terminalwidget5/*.h +%{_libdir}/cmake/terminalwidget5/*.cmake +%{_libdir}/libterminalwidget5.so +%{_libdir}/libterminalwidget5.so.0 +%{_libdir}/pkgconfig/terminalwidget5.pc + +%files -n %{libname}-data +%{_datadir}/terminalwidget5/color-schemes/*.schema +%{_datadir}/terminalwidget5/color-schemes/*.colorscheme +%{_datadir}/terminalwidget5/color-schemes/historic/*.schema +%{_datadir}/terminalwidget5/kb-layouts/*.keytab +%{_datadir}/terminalwidget5/kb-layouts/historic/*.keytab +%{_datadir}/terminalwidget5/translations/*.qm %changelog -* Thu Jul 30 2020 openEuler Buildteam - 5.0.4.1-1 -- Package init +* Mon Jun 13 2022 uoser - 5.4.22-1.03 +- update: update to 5.4.22-1.03 diff --git a/deepin-terminal_5.0.4.1.orig.tar.xz b/deepin-terminal_5.0.4.1.orig.tar.xz deleted file mode 100644 index 8d048e3dda98456236fb70a84758189026d3e01d..0000000000000000000000000000000000000000 Binary files a/deepin-terminal_5.0.4.1.orig.tar.xz and /dev/null differ