[arch-commits] Commit in deepin-terminal/repos (3 files)

[Felix Yan]

    Date: Friday, May 1, 2020 @ 16:45:18
  Author: felixonmars
Revision: 624060

archrelease: copy trunk to community-staging-x86_64

Added:
  deepin-terminal/repos/community-staging-x86_64/
  deepin-terminal/repos/community-staging-x86_64/PKGBUILD
    (from rev 624059, deepin-terminal/trunk/PKGBUILD)
  deepin-terminal/repos/community-staging-x86_64/remove-vendor.patch
    (from rev 624059, deepin-terminal/trunk/remove-vendor.patch)

---------------------+
 PKGBUILD            |   46 +++++++++++++++++++++++++++++
 remove-vendor.patch |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

Copied: deepin-terminal/repos/community-staging-x86_64/PKGBUILD (from rev 624059, deepin-terminal/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-05-01 16:45:18 UTC (rev 624060)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-terminal
+pkgver=5.0.4.1
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal"
+license=('GPL3')
+depends=('vte3' 'libsecret' 'libgee' 'libwnck3' 'expect' 'deepin-menu')
+makedepends=('vala' 'cmake')
+optdepends=('deepin-manual: for help menual'
+            'deepin-shortcut-viewer: for shortcut display'
+            'zssh: for remote management support')
+groups=('deepin-extra')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal/archive/$pkgver.tar.gz"
+        $pkgname-vte-fix.patch::https://github.com/linuxdeepin/deepin-terminal/commit/8d0a761873c2ef898c9977acc0192bf9ef9e7ca4.patch
+        $pkgname-vte-0.59.patch::https://github.com/linuxdeepin/deepin-terminal/commit/d38f972c8cb958524b326986c6dc72b24fa35dad.patch)
+sha512sums=('9523d5411b017947b40568fa3d47654e3a9d560c016a7e75311a14c60c9da3368337c4652fdbaa3fb1278cebb01a93f6c0c804bd277c59a009ead3024bf14036'
+            '9bdeb82f54664f2c158d29cb7095b1c7fd0edf12ea20d1c738a79f68df820a5320070a31dcd5673dff3c412ca75bd7140e4293ee0ea986c8ba832455b8eb9662'
+            '44a6538138c0fed9938048229444d6cbf050af6b26307f09068ad86d6a256aef19ceca55c6149036e62c0a50e9c89f13f89f43412ec0d6d42db1256f5206957f')
+
+prepare() {
+  patch -d deepin-terminal-$pkgver -Np1 -i ../$pkgname-vte-fix.patch
+  patch -d deepin-terminal-$pkgver -Np1 -i ../$pkgname-vte-0.59.patch
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DTEST_BUILD=OFF \
+    -DUSE_VENDOR_LIB=OFF \
+    -DVERSION=$pkgver \
+    ../deepin-terminal-$pkgver
+  make
+}
+
+package() {
+  make -C build DESTDIR="$pkgdir" install
+  ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator
+}

Copied: deepin-terminal/repos/community-staging-x86_64/remove-vendor.patch (from rev 624059, deepin-terminal/trunk/remove-vendor.patch)
===================================================================
--- community-staging-x86_64/remove-vendor.patch	                        (rev 0)
+++ community-staging-x86_64/remove-vendor.patch	2020-05-01 16:45:18 UTC (rev 624060)
@@ -0,0 +1,79 @@
+From: Yanhao Mo <yanhaocs at gmail.com>
+Date: Wed, 16 May 2018 13:16:20 +0800
+Subject: use system libs
+
+---
+ CMakeLists.txt | 25 +++++--------------------
+ 1 file changed, 5 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d57aca..47f83d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,6 +24,7 @@ pkg_check_modules(RSVG REQUIRED librsvg-2.0)
+ 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,22 +45,6 @@ execute_process(
+ )
+ 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
+-  BUILD_COMMAND make
+-  INSTALL_COMMAND ""
+-  BUILD_IN_SOURCE 1
+-  )
+-
+ set(CFLAGS
+ 	${GIO_CFLAGS}
+ 	${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER}
+@@ -79,7 +64,7 @@ set(INCLUDE_PATHS
+ 	${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 +81,7 @@ set(LIBS
+ 	${XTST_LIBRARIES}
+ 	${FONTCONFIG_LIBRARY}
+ 	${M_LIBRARIES}
++	${VTE_LIBRARIES}
+ 	stdc++
+ 	m
+ 	z
+@@ -137,8 +123,7 @@ PACKAGES
+ 	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 "")
+@@ -170,7 +155,7 @@ FOREACH(lang ${dirlist})
+ ENDFOREACH(lang)
+ 
+ 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 lib/${target})
+ INSTALL (FILES hicolor/32x32/${target}.png DESTINATION share/icons/hicolor/32x32/apps)
+ INSTALL (FILES hicolor/48x48/${target}.png DESTINATION share/icons/hicolor/48x48/apps)
+ INSTALL (FILES hicolor/96x96/${target}.png DESTINATION share/icons/hicolor/96x96/apps)