Date: Monday, September 7, 2020 @ 21:23:17
Author: felixonmars
Revision: 700393
archrelease: copy trunk to community-x86_64
Added:
deepin-terminal/repos/community-x86_64/PKGBUILD
(from rev 700392, deepin-terminal/trunk/PKGBUILD)
deepin-terminal/repos/community-x86_64/remove-vendor.patch
(from rev 700392, deepin-terminal/trunk/remove-vendor.patch)
Deleted:
deepin-terminal/repos/community-x86_64/PKGBUILD
deepin-terminal/repos/community-x86_64/remove-vendor.patch
---------------------+
PKGBUILD | 92 ++++++++++++++---------------
remove-vendor.patch | 158 +++++++++++++++++++++++++-------------------------
2 files changed, 125 insertions(+), 125 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-07 21:23:05 UTC (rev 700392)
+++ PKGBUILD 2020-09-07 21:23:17 UTC (rev 700393)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-terminal
-pkgver=5.2.25
-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')
-makedepends=('chrpath' 'cmake' 'expac' 'lxqt-build-tools' 'ninja' 'qt5-tools')
-optdepends=('zssh: for remote management support')
-groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal/archive/$pkgver.tar.gz";)
-sha512sums=('5796144ec8d3acff8d289faf957f3028d1ffa5cd573e52e272bdf12f159ee06bd50e6387f47dd48ef33cd004ed7b30e7075bc0ac2ba99d271eb98ca543981415')
-
-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
-
- # Much upstream weirdness
- sed -i '/<QHash>/i#include <QObject>\n#include <QMap>'
3rdparty/terminalwidget/lib/SessionManager.h
- #sed -i 's/QString("/QString::fromLatin1("/;s/message = "Session
crashed.";/message = QString::fromLatin1("Session crashed.");/'
3rdparty/terminalwidget/lib/{Filter,Session}.cpp
- sed -i '/LXQtCompilerSettings/a remove_definitions(-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII)' 3rdparty/terminalwidget/CMakeLists.txt
- sed -i 's|default-config.json|src/assets/other/default-config.json|'
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
-}
-
-package() {
- cd build
- DESTDIR="$pkgdir" ninja install
-
- rm -r "$pkgdir"/build
- chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
-}
Copied: deepin-terminal/repos/community-x86_64/PKGBUILD (from rev 700392,
deepin-terminal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-09-07 21:23:17 UTC (rev 700393)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-terminal
+pkgver=5.2.26
+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')
+makedepends=('chrpath' 'cmake' 'expac' 'lxqt-build-tools' 'ninja' 'qt5-tools')
+optdepends=('zssh: for remote management support')
+groups=('deepin-extra')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal/archive/$pkgver.tar.gz";)
+sha512sums=('b61522223398752d6f0ddafdb948d5af5d7d44387c262445092e1838c7de20e7988f32484297d92586c9f4a2def084967b86aa5e7ec59d5b47ae944c7c3dbe8c')
+
+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
+
+ # Much upstream weirdness
+ sed -i '/<QHash>/i#include <QObject>\n#include <QMap>'
3rdparty/terminalwidget/lib/SessionManager.h
+ #sed -i 's/QString("/QString::fromLatin1("/;s/message = "Session
crashed.";/message = QString::fromLatin1("Session crashed.");/'
3rdparty/terminalwidget/lib/{Filter,Session}.cpp
+ sed -i '/LXQtCompilerSettings/a remove_definitions(-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII)' 3rdparty/terminalwidget/CMakeLists.txt
+ sed -i 's|default-config.json|src/assets/other/default-config.json|'
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
+}
+
+package() {
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+ rm -r "$pkgdir"/build
+ chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
+}
Deleted: remove-vendor.patch
===================================================================
--- remove-vendor.patch 2020-09-07 21:23:05 UTC (rev 700392)
+++ remove-vendor.patch 2020-09-07 21:23:17 UTC (rev 700393)
@@ -1,79 +0,0 @@
-From: Yanhao Mo <yanha...@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)
Copied: deepin-terminal/repos/community-x86_64/remove-vendor.patch (from rev
700392, deepin-terminal/trunk/remove-vendor.patch)
===================================================================
--- remove-vendor.patch (rev 0)
+++ remove-vendor.patch 2020-09-07 21:23:17 UTC (rev 700393)
@@ -0,0 +1,79 @@
+From: Yanhao Mo <yanha...@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)
