Date: Wednesday, May 13, 2020 @ 09:02:20 Author: felixonmars Revision: 627525
upgpkg: deepin-terminal 5.2.1-1 Modified: deepin-terminal/trunk/PKGBUILD ----------+ PKGBUILD | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-13 08:51:52 UTC (rev 627524) +++ PKGBUILD 2020-05-13 09:02:20 UTC (rev 627525) @@ -3,44 +3,43 @@ # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> pkgname=deepin-terminal -pkgver=5.0.4.1 +pkgver=5.2.1 pkgrel=1 pkgdesc='Default terminal emulation application for Deepin' arch=('x86_64') -url="https://github.com/linuxdeepin/deepin-terminal" +url="https://github.com/linuxdeepin/deepin-terminal-reborn" 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') +depends=('deepin-qt5integration') +makedepends=('chrpath' 'cmake' 'expac' 'lxqt-build-tools' 'qt5-tools') 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') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal-reborn/archive/$pkgver.tar.gz") +sha512sums=('4679e88a1862f12a7021f1d01e7cb9b98fdaf7d0a4052a9acd488010db05904ee729d6afd6c47aad3c2a9133bbebe30fa0045d6c9b345bae09357b4dff7b8c75') 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 + cd deepin-terminal-reborn-$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>' 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 's|default-config.json|resources/other/default-config.json|' CMakeLists.txt } -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 + cmake -DDTKCORE_TOOL_DIR=/usr/lib/libdtk-$(expac %v dtkcore | cut -d - -f 1 | cut -d : -f 2)/DCore/bin ../deepin-terminal-reborn-$pkgver make } package() { - make -C build DESTDIR="$pkgdir" install - ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator + cd build + make DESTDIR="$pkgdir" install + + rm -r "$pkgdir"/build + chrpath --delete "$pkgdir"/usr/bin/deepin-terminal }