[arch-commits] Commit in deepin-terminal/repos (3 files)
Felix Yan
felixonmars at archlinux.org
Wed Apr 7 20:35:01 UTC 2021
Date: Wednesday, April 7, 2021 @ 20:35:01
Author: felixonmars
Revision: 912689
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-terminal/repos/community-testing-x86_64/
deepin-terminal/repos/community-testing-x86_64/PKGBUILD
(from rev 912688, deepin-terminal/trunk/PKGBUILD)
deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch
(from rev 912688, deepin-terminal/trunk/remove-vendor.patch)
---------------------+
PKGBUILD | 51 ++++++++++++++++++++++++++++++++
remove-vendor.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
Copied: deepin-terminal/repos/community-testing-x86_64/PKGBUILD (from rev 912688, deepin-terminal/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-04-07 20:35:01 UTC (rev 912689)
@@ -0,0 +1,51 @@
+# 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.4.0.20
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal"
+license=('GPL3')
+depends=('at-spi2-core' 'deepin-qt5integration' 'libsecret')
+makedepends=('chrpath' 'cmake' 'expac' 'gmock' 'gtest' 'lxqt-build-tools' 'ninja' 'qt5-tools')
+checkdepends=('xorg-server-xvfb')
+optdepends=('zssh: for remote management support')
+groups=('deepin-extra')
+source=("https://github.com/linuxdeepin/deepin-terminal/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('03879ea71fac9786ccdf0203f9c172acfc256f9ec8dca73aa2e9c83f14fa8fdf18e021fe94811ad330172394faec7f3cb990760438e63963f89a1d5ab8565018')
+
+prepare() {
+ mkdir -p build
+ cd deepin-terminal-$pkgver
+ # Devendor qtermwidget - disabled due to the vendored copy has changes
+ #rm -r terminalwidget
+ #sed -i '/terminalwidget/d;/build_qtermwidget/d' deepin-terminal.pro
+ #sed -i 's|terminalwidget/lib/qtermwidget.h|qtermwidget5/qtermwidget.h|' encodeplugin/encodelistmodel.cpp views/termwidget.h theme/themelistmodel.cpp
+
+ # ninja: error: '/build/deepin-terminal/src/deepin-terminal-5.4.0.6/default-config.json', needed by '/build/deepin-terminal/src/deepin-terminal-5.4.0.6/settings_translation.cpp', missing and no known rule to make it
+ sed -i 's|default-config.json|src/assets/other/default-config.json|' CMakeLists.txt
+
+ # ‘QString& QString::operator=(const char*)’ is private within this context
+ sed -i '/LXQtCompilerSettings/a remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)' 3rdparty/terminalwidget/CMakeLists.txt
+}
+
+build(){
+ cd build
+ cmake -GNinja -DDTKCORE_TOOL_DIR=/usr/lib/libdtk-$(expac %v dtkcore | cut -d - -f 1 | cut -d : -f 2)/DCore/bin ../deepin-terminal-$pkgver
+ ninja
+}
+
+check() {
+ cd build
+ LD_LIBRARY_PATH="$PWD/3rdparty/terminalwidget" xvfb-run ninja test || echo "Tests failed"
+}
+
+package() {
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+ chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
+}
Copied: deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch (from rev 912688, deepin-terminal/trunk/remove-vendor.patch)
===================================================================
--- community-testing-x86_64/remove-vendor.patch (rev 0)
+++ community-testing-x86_64/remove-vendor.patch 2021-04-07 20:35:01 UTC (rev 912689)
@@ -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)
More information about the arch-commits
mailing list