From 3869edbde8ae03f8f556fe29fcb15a684fa0d6af Mon Sep 17 00:00:00 2001 From: John Date: Wed, 21 Feb 2018 15:18:08 +0100 Subject: [PATCH] New package: deepin-terminal-3.0.0. --- srcpkgs/deepin-terminal/patches/glib.patch | 11 ++++ srcpkgs/deepin-terminal/patches/musl.patch | 10 ++++ .../patches/remove-vendor.patch | 52 +++++++++++++++++++ srcpkgs/deepin-terminal/template | 18 +++++++ 4 files changed, 91 insertions(+) create mode 100644 srcpkgs/deepin-terminal/patches/glib.patch create mode 100644 srcpkgs/deepin-terminal/patches/musl.patch create mode 100644 srcpkgs/deepin-terminal/patches/remove-vendor.patch create mode 100644 srcpkgs/deepin-terminal/template diff --git a/srcpkgs/deepin-terminal/patches/glib.patch b/srcpkgs/deepin-terminal/patches/glib.patch new file mode 100644 index 00000000000..142ff0b0992 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/glib.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2018-05-24 16:03:56.376621081 +0200 ++++ - 2018-05-24 16:07:49.217575585 +0200 +@@ -10,7 +10,7 @@ + find_package(Vala) + ensure_vala_version("0.22.0" MINIMUM) + find_package(PkgConfig) +-find_package(GLib "2.48" REQUIRED) ++find_package(GLib REQUIRED) + find_package(JsonGlib) + find_package(Libsecret) + find_package(FontConfig) diff --git a/srcpkgs/deepin-terminal/patches/musl.patch b/srcpkgs/deepin-terminal/patches/musl.patch new file mode 100644 index 00000000000..4576a2ad6b9 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/musl.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 00000000000..8aa78a3eb5b --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/remove-vendor.patch @@ -0,0 +1,52 @@ +--- 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 new file mode 100644 index 00000000000..c9e7ba73601 --- /dev/null +++ b/srcpkgs/deepin-terminal/template @@ -0,0 +1,18 @@ +# Template file for 'deepin-terminal' +pkgname=deepin-terminal +version=3.0.0 +revision=1 +build_style=cmake +configure_args="-DTEST_BUILD=OFF" +hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config + vala" +makedepends="json-glib-devel libgee08-devel librsvg-devel libsecret-devel + libwnck-devel vala-devel vte3-devel glib-devel gdk-pixbuf-devel" +depends="deepin-menu expect" +short_desc="Deepin Terminal" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-terminal" +distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" +checksum=a01b2a8679523916586eff30ea4768ee6f1e2094826513971d2ef00db0471460 +nocross=yes