diff --git a/.gitignore b/.gitignore index 5b7484f..d4b8cba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /deepin-terminal-2.5.2.tar.gz /deepin-terminal-2.5.5.tar.gz +/deepin-terminal-2.6.4.tar.gz diff --git a/deepin-terminal.spec b/deepin-terminal.spec index 11844e9..5245b28 100644 --- a/deepin-terminal.spec +++ b/deepin-terminal.spec @@ -1,12 +1,13 @@ %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.5.5 +Version: 2.6.4 Release: 1%{?dist} Summary: Default terminal emulation application for Deepin License: GPLv3 URL: https://github.com/linuxdeepin/deepin-terminal Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}_unbundle_vte.patch BuildRequires: cmake BuildRequires: gettext @@ -40,12 +41,9 @@ The %{name}-data package provides shared data for Deepin Terminal. %prep %setup -q +%patch0 -p1 -b .unbundle_vte sed -i 's|return __FILE__;|return "%{_datadir}/%{name}/project_path.c";|' project_path.c -# fixes build fail for vala 0.36.3 -# https://github.com/linuxdeepin/deepin-terminal/issues/8 -rm vapi/gee-0.8.vapi - # remove es_419 locale rm -rf po/es_419/ sed -i '/es_419/d' deepin-terminal.desktop @@ -101,6 +99,13 @@ fi %{_datadir}/applications/%{name}.desktop %changelog +* Mon Oct 16 2017 mosquito - 2.6.4-1 +- Update to 2.6.4 +- Unbundle vte + +* Thu Sep 21 2017 mosquito - 2.6.1-1 +- Update to 2.6.1 + * Tue Aug 29 2017 mosquito - 2.5.5-1 - Update to 2.5.5 diff --git a/deepin-terminal_unbundle_vte.patch b/deepin-terminal_unbundle_vte.patch new file mode 100644 index 0000000..d4ed38e --- /dev/null +++ b/deepin-terminal_unbundle_vte.patch @@ -0,0 +1,73 @@ +--- 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 @@ + 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(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 +- ) +- + set(CFLAGS + ${GIO_CFLAGS} + ${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER} +@@ -50,10 +42,8 @@ + ${WNCK_INCLUDE_DIRS} + ${JsonGlib_INCLUDE_DIRS} + ${LIBSECRET_INCLUDE_DIRS} ++ ${VTE_INCLUDE_DIRS} +- ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src +- #$${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} + ${JsonGlib_LIBRARIES} + ${LIBSECRET_LIBRARIES} ++ ${VTE_LIBRARIES} +- ${ZLIB_LIBRARIES} + ${X11_LIBRARIES} + ${XTST_LIBRARIES} + ${FONTCONFIG_LIBRARY} + ${M_LIBRARIES} +- stdc++ + m +- z +- pthread +- gnutls +- pcre2-8 + ) + vala_precompile(VALA_C + ./lib/animation.vala +@@ -153,8 +138,7 @@ + glib-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) +-add_dependencies(${target} Vte-0.29) ++target_link_libraries(${target} ${LIBS}) + + FILE(GLOB children LIST_DIRECTORIES true po/*) + SET(dirlist "") diff --git a/sources b/sources index db43d90..3e7fe67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (deepin-terminal-2.5.5.tar.gz) = a1685c4f0957c18c4300d7bd2af91fa0781dc2e2b30ed5be76de6b8e9e31faa511a90403e9d9ce94cffc36f98c1c9cb14e0da0350b343e23f4e8c27b555ab3ff +SHA512 (deepin-terminal-2.6.4.tar.gz) = 864b344a56936944b881a4df1619880098fff27175ba3ceda5f913d24c3036cac8b1838c3f211b48bcf1b4f7553597fdbfeda6d61550be9caa479d9972b192ff