diff --git a/.gitignore b/.gitignore index 18ee3dc..6dd8de1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /deepin-terminal-2.5.5.tar.gz /deepin-terminal-2.6.4.tar.gz /deepin-terminal-2.7.tar.gz +/deepin-terminal-2.9.2.tar.gz diff --git a/deepin-terminal.spec b/deepin-terminal.spec index 9271af4..fa69a29 100644 --- a/deepin-terminal.spec +++ b/deepin-terminal.spec @@ -1,7 +1,7 @@ %global _terminals gnome-terminal mate-terminal xfce4-terminal lxterminal qterminal qterminal-qt5 terminology yakuake fourterm roxterm lilyterm termit xterm mrxvt Name: deepin-terminal -Version: 2.7 +Version: 2.9.2 Release: 1%{?dist} Summary: Default terminal emulation application for Deepin License: GPLv3 @@ -18,6 +18,7 @@ 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(vte-2.91) # right-click menu style Requires: deepin-menu @@ -26,6 +27,7 @@ Requires: deepin-shortcut-viewer Requires: expect Requires: xdg-utils Recommends: deepin-manual +Recommends: zssh Requires: %{name}-data = %{version}-%{release} %description @@ -43,6 +45,9 @@ The %{name}-data package provides shared data for Deepin Terminal. %setup -q %patch0 -p1 -b .unbundle_vte sed -i 's|return __FILE__;|return "%{_datadir}/%{name}/project_path.c";|' project_path.c +sed -i 's|/usr/lib/%{name}/zssh|%{_bindir}/zssh|' ssh_login.sh +sed -i '/ssh_login/s|lib|libexec|' lib/utils.vala +sed -i 's|2.7|2.9|' lib/constant.vala # remove es_419 locale rm -rf po/es_419/ @@ -91,6 +96,7 @@ fi %doc README.md %license LICENSE %{_bindir}/%{name} +%{_libexecdir}/%{name}/ssh_login.sh %files data -f %{name}.lang %{_datadir}/%{name}/ @@ -99,6 +105,18 @@ fi %{_datadir}/applications/%{name}.desktop %changelog +* Thu Dec 7 2017 mosquito - 2.9.2-1 +- Update to 2.9.2 + +* Wed Nov 15 2017 mosquito - 2.7.6-1 +- Update to 2.7.6 + +* Fri Oct 27 2017 mosquito - 2.7.4-1 +- Update to 2.7.4 + +* Mon Oct 23 2017 mosquito - 2.7.2-1 +- Update to 2.7.2 + * Tue Oct 17 2017 mosquito - 2.7-1 - Update to 2.7 diff --git a/deepin-terminal_unbundle_vte.patch b/deepin-terminal_unbundle_vte.patch index d4ed38e..86df828 100644 --- a/deepin-terminal_unbundle_vte.patch +++ b/deepin-terminal_unbundle_vte.patch @@ -1,53 +1,53 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4,7 +4,6 @@ - - cmake_minimum_required(VERSION 2.6) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) --include(ExternalProject) - include(ValaPrecompile) - include(ValaVersion) - find_package(Vala) -@@ -18,20 +17,13 @@ +@@ -18,6 +18,7 @@ find_package(Gettext) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) +pkg_check_modules(VTE REQUIRED vte-2.91) pkg_check_modules(GEE REQUIRED gee-0.8) pkg_check_modules(GIO REQUIRED gio-unix-2.0) - pkg_check_modules(WNCK REQUIRED libwnck-3.0) + pkg_check_modules(RSVG REQUIRED librsvg-2.0) +@@ -25,22 +26,6 @@ pkg_check_modules(FONTCONFIG REQUIRED fontconfig) pkg_check_modules(GLIB REQUIRED glib-2.0) -ExternalProject_Add(Vte-0.29 -- SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1 -- CONFIGURE_COMMAND ./configure --enable-static -- BUILD_COMMAND make -- INSTALL_COMMAND "" -- BUILD_IN_SOURCE 1 -- ) +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1 +- CONFIGURE_COMMAND ./configure --enable-static +- BUILD_COMMAND make +- INSTALL_COMMAND "" +- BUILD_IN_SOURCE 1 +- ) +- +-ExternalProject_Add(zssh-1.5c +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c +- CONFIGURE_COMMAND ./configure +- BUILD_COMMAND make +- INSTALL_COMMAND "" +- BUILD_IN_SOURCE 1 +- ) - set(CFLAGS ${GIO_CFLAGS} ${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER} -@@ -50,10 +42,8 @@ - ${WNCK_INCLUDE_DIRS} +@@ -60,9 +45,8 @@ + ${RSVG_INCLUDE_DIRS} ${JsonGlib_INCLUDE_DIRS} ${LIBSECRET_INCLUDE_DIRS} -+ ${VTE_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src -- #$${VTE_INCLUDE_DIRS} ++ ${VTE_INCLUDE_DIRS} ) -find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal) include_directories(${INCLUDE_PATHS}) set(LIBS ${GIO_LIBRARIES} -@@ -62,17 +52,12 @@ - ${WNCK_LIBRARIES} +@@ -72,17 +56,12 @@ + ${RSVG_LIBRARIES} ${JsonGlib_LIBRARIES} ${LIBSECRET_LIBRARIES} -+ ${VTE_LIBRARIES} - ${ZLIB_LIBRARIES} ++ ${VTE_LIBRARIES} ${X11_LIBRARIES} ${XTST_LIBRARIES} ${FONTCONFIG_LIBRARY} @@ -61,8 +61,8 @@ ) vala_precompile(VALA_C ./lib/animation.vala -@@ -153,8 +138,7 @@ - glib-2.0 +@@ -165,8 +144,7 @@ + librsvg-2.0 ) add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c ${CMAKE_SOURCE_DIR}/lib/font.c) -target_link_libraries(${target} ${LIBS} ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src/.libs/libvte-2.91.a) @@ -71,3 +71,12 @@ FILE(GLOB children LIST_DIRECTORIES true po/*) SET(dirlist "") +@@ -183,7 +161,7 @@ + endforeach() + + INSTALL (TARGETS ${target} DESTINATION bin) +-INSTALL (PROGRAMS ssh_login.sh ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c/zssh DESTINATION lib/${target}) ++INSTALL (PROGRAMS ssh_login.sh DESTINATION libexec/${target}) + INSTALL (FILES hicolor/32x32/deepin-terminal.png DESTINATION share/icons/hicolor/32x32/apps) + INSTALL (FILES hicolor/48x48/deepin-terminal.png DESTINATION share/icons/hicolor/48x48/apps) + INSTALL (FILES hicolor/96x96/deepin-terminal.png DESTINATION share/icons/hicolor/96x96/apps) diff --git a/sources b/sources index c8aecae..e9fb810 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (deepin-terminal-2.7.tar.gz) = b9c69e51d6fd52ccf9d6e13cd1d817b12b650527d942e0f091f4fa258700a9ec69ef144b0f9598945819ebc7f83f80f93602af5a7706671627ccafe3f901a5f5 +SHA512 (deepin-terminal-2.9.2.tar.gz) = 17fb431407791b840cb72cf14760e542ee503bfc12e8cf434a6b6e110d0e1d46d2fa969c3dcce0eaa336e90082f6ccddfe2513f5340ad6c946d04d10cebd35f9