[arch-commits] Commit in deepin-terminal/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, June 1, 2020 @ 21:47:57
  Author: felixonmars
Revision: 637921

upgpkg: deepin-terminal 5.2.2.20200601-1

Modified:
  deepin-terminal/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-01 21:39:32 UTC (rev 637920)
+++ PKGBUILD	2020-06-01 21:47:57 UTC (rev 637921)
@@ -3,8 +3,9 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-terminal
-pkgver=5.2.1
-pkgrel=2
+pkgver=5.2.2.20200601
+_commit=4f83513d1bff94604d7e3c022c36ea34f9779e9d
+pkgrel=1
 pkgdesc='Default terminal emulation application for Deepin'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-terminal-reborn"
@@ -13,12 +14,12 @@
 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-reborn/archive/$pkgver.tar.gz")
-sha512sums=('4679e88a1862f12a7021f1d01e7cb9b98fdaf7d0a4052a9acd488010db05904ee729d6afd6c47aad3c2a9133bbebe30fa0045d6c9b345bae09357b4dff7b8c75')
+source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/deepin-terminal-reborn/archive/$_commit.tar.gz")
+sha512sums=('1b31ccda8f430ec480c2dae92b031fd76c715e862d89ecbc06485b90117ccc73825450a52816556852005de764664cbc9a8df09e02554cbf70c1325e26f4cd0c')
 
 prepare() {
   mkdir -p build
-  cd deepin-terminal-reborn-$pkgver
+  cd deepin-terminal-reborn-$_commit
   # Devendor qtermwidget - disabled due to the vendored copy has changes
   #rm -r terminalwidget
   #sed -i '/terminalwidget/d;/build_qtermwidget/d' deepin-terminal.pro
@@ -25,17 +26,17 @@
   #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>' terminalwidget/lib/SessionManager.h
-  sed -i 's/QString("/QString::fromLatin1("/;s/message = "Session crashed.";/message = QString::fromLatin1("Session crashed.");/' terminalwidget/lib/Session.cpp
-  sed -i '/#include <QTextStream>/a #include <cwctype>' terminalwidget/lib/TerminalCharacterDecoder.cpp
-  sed -i '/#include <QPainter>/a #include <QPainterPath>' encodeplugin/encodeitemdelegate.cpp customcommand/customcommanddelegate.cpp remotemanage/serverconfigdelegate.cpp theme/themeitemdelegate.cpp
-
-  sed -i 's|default-config.json|resources/other/default-config.json|' CMakeLists.txt
+  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-reborn-$pkgver
+  cmake -DDTKCORE_TOOL_DIR=/usr/lib/libdtk-$(expac %v dtkcore | cut -d - -f 1 | cut -d : -f 2)/DCore/bin ../deepin-terminal-reborn-$_commit
   make
 }