[arch-commits] Commit in deepin-terminal/repos/community-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Fri Jul 3 09:43:06 UTC 2020


    Date: Friday, July 3, 2020 @ 09:43:05
  Author: felixonmars
Revision: 657593

archrelease: copy trunk to community-x86_64

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

---------------------+
 PKGBUILD            |   96 +++++++++++++++---------------
 remove-vendor.patch |  158 +++++++++++++++++++++++++-------------------------
 2 files changed, 127 insertions(+), 127 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-03 09:42:37 UTC (rev 657592)
+++ PKGBUILD	2020-07-03 09:43:05 UTC (rev 657593)
@@ -1,48 +0,0 @@
-# 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.2.9
-pkgrel=1
-pkgdesc='Default terminal emulation application for Deepin'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/deepin-terminal"
-license=('GPL3')
-depends=('deepin-qt5integration')
-makedepends=('chrpath' 'cmake' 'expac' 'lxqt-build-tools' '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=('0abd6fb4b2dd4137ad3ff027ba8ae54f0d6d405d6fb0cb9c772fd38cf96c46193afcf40c8b99ff21eedf967c48645729b69fc2595f8e4c60df13ae305c4fb57a')
-
-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 '/#include <QTextStream>/a #include <cwctype>' 3rdparty/terminalwidget/lib/TerminalCharacterDecoder.cpp
-  sed -i '/#include <QPainter>/a #include <QPainterPath>' src/customcommand/customcommanddelegate.cpp src/remotemanage/serverconfigdelegate.cpp src/theme/themeitemdelegate.cpp
-  sed -i 's|default-config.json|src/assets/other/default-config.json|' CMakeLists.txt
-}
-
-build(){
-  cd build
-  cmake -DDTKCORE_TOOL_DIR=/usr/lib/libdtk-$(expac %v dtkcore | cut -d - -f 1 | cut -d : -f 2)/DCore/bin ../deepin-terminal-$pkgver
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir"/build
-  chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
-}

Copied: deepin-terminal/repos/community-x86_64/PKGBUILD (from rev 657592, deepin-terminal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-03 09:43:05 UTC (rev 657593)
@@ -0,0 +1,48 @@
+# 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.2.10
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal"
+license=('GPL3')
+depends=('deepin-qt5integration')
+makedepends=('chrpath' 'cmake' 'expac' 'lxqt-build-tools' '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=('3015f493a27b05cb42e0d2dd5928a8072c1bb2ffffd086b1c8d168c7b0febea8545e28bac93121b28554efbd302165b1ca23b0a8620b9d33dc3d31c8d426ecbd')
+
+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 '/#include <QTextStream>/a #include <cwctype>' 3rdparty/terminalwidget/lib/TerminalCharacterDecoder.cpp
+  sed -i '/#include <QPainter>/a #include <QPainterPath>' src/customcommand/customcommanddelegate.cpp src/remotemanage/serverconfigdelegate.cpp src/theme/themeitemdelegate.cpp
+  sed -i 's|default-config.json|src/assets/other/default-config.json|' CMakeLists.txt
+}
+
+build(){
+  cd build
+  cmake -DDTKCORE_TOOL_DIR=/usr/lib/libdtk-$(expac %v dtkcore | cut -d - -f 1 | cut -d : -f 2)/DCore/bin ../deepin-terminal-$pkgver
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm -r "$pkgdir"/build
+  chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
+}

Deleted: remove-vendor.patch
===================================================================
--- remove-vendor.patch	2020-07-03 09:42:37 UTC (rev 657592)
+++ remove-vendor.patch	2020-07-03 09:43:05 UTC (rev 657593)
@@ -1,79 +0,0 @@
-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)

Copied: deepin-terminal/repos/community-x86_64/remove-vendor.patch (from rev 657592, deepin-terminal/trunk/remove-vendor.patch)
===================================================================
--- remove-vendor.patch	                        (rev 0)
+++ remove-vendor.patch	2020-07-03 09:43:05 UTC (rev 657593)
@@ -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