From 9a148b9d818b2e2b9b0c2f3aad834ecb15b3240d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 7 Oct 2018 10:42:53 +0200 Subject: [PATCH] deepin-terminal: update to 3.0.7. --- srcpkgs/deepin-terminal/patches/musl.patch | 10 ---- .../patches/remove-vendor.patch | 52 ------------------- srcpkgs/deepin-terminal/template | 4 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/deepin-terminal/patches/musl.patch delete mode 100644 srcpkgs/deepin-terminal/patches/remove-vendor.patch diff --git a/srcpkgs/deepin-terminal/patches/musl.patch b/srcpkgs/deepin-terminal/patches/musl.patch deleted file mode 100644 index 4576a2ad6b9..00000000000 --- a/srcpkgs/deepin-terminal/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 3rdparty/zssh-1.5c/openpty.c 2018-05-14 05:47:46.000000000 +0200 -+++ - 2018-05-24 15:26:26.729972575 +0200 -@@ -9,6 +9,7 @@ - */ - - #include "zssh.h" -+#include - - #define GL_SLAVENAMELEN 50 - static char gl_slavename[GL_SLAVENAMELEN + 1] = {0}; diff --git a/srcpkgs/deepin-terminal/patches/remove-vendor.patch b/srcpkgs/deepin-terminal/patches/remove-vendor.patch deleted file mode 100644 index 8aa78a3eb5b..00000000000 --- a/srcpkgs/deepin-terminal/patches/remove-vendor.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- masterdir/builddir/deepin-terminal-3.0.0/CMakeLists.txt 2018-05-14 05:47:46.000000000 +0200 -+++ CMakeLists.txt 2018-05-24 15:11:43.457568178 +0200 -@@ -24,6 +24,7 @@ - pkg_check_modules(WNCK REQUIRED libwnck-3.0) - pkg_check_modules(FONTCONFIG REQUIRED fontconfig) - pkg_check_modules(GLIB REQUIRED glib-2.0) -+pkg_check_modules(VTE REQUIRED vte-2.91) - - OPTION(TEST_BUILD "Build with native testing" ON) - -@@ -44,14 +45,6 @@ - ) - endif() - --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 -- ) -- - ExternalProject_Add(zssh-1.5c - SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c - CONFIGURE_COMMAND ./configure -@@ -79,7 +72,7 @@ - ${RSVG_INCLUDE_DIRS} - ${JsonGlib_INCLUDE_DIRS} - ${LIBSECRET_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}) -@@ -96,6 +89,7 @@ - ${XTST_LIBRARIES} - ${FONTCONFIG_LIBRARY} - ${M_LIBRARIES} -+ ${VTE_LIBRARIES} - stdc++ - m - z -@@ -137,8 +131,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) --add_dependencies(${target} Vte-0.29) -+target_link_libraries(${target} ${LIBS}) - - FILE(GLOB children LIST_DIRECTORIES true po/*) - SET(dirlist "") diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template index 63bead12907..1393ad1778d 100644 --- a/srcpkgs/deepin-terminal/template +++ b/srcpkgs/deepin-terminal/template @@ -1,6 +1,6 @@ # Template file for 'deepin-terminal' pkgname=deepin-terminal -version=3.0.5 +version=3.0.7 revision=1 build_style=cmake configure_args="-DTEST_BUILD=OFF" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-terminal" changelog="https://github.com/linuxdeepin/deepin-terminal/blob/master/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" -checksum=088dad3d4243e607c26d8125b4136230d5b1d93407c8e0ad9c19330f61dfbc46 +checksum=4aba58856c3e607931937093f2cca93b6ac8027a3e0f78f92458a28c091cef02 nocross=yes case $XBPS_TARGET_MACHINE in