deepin-terminal: update to 3.0.7.

This commit is contained in:
John 2018-10-07 10:42:53 +02:00 committed by maxice8
parent c386ccd4e9
commit 9a148b9d81
3 changed files with 2 additions and 64 deletions

View file

@ -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 <pty.h>
#define GL_SLAVENAMELEN 50
static char gl_slavename[GL_SLAVENAMELEN + 1] = {0};

View file

@ -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 "")

View file

@ -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