subject:"\[arch\-commits\] Commit in deepin\-terminal\/repos \(3 files\)"

[arch-commits] Commit in deepin-terminal/repos (3 files)

2020-05-13 Thread Felix Yan via arch-commits

Date: Wednesday, May 13, 2020 @ 09:02:37
  Author: felixonmars
Revision: 627526

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 627525, deepin-terminal/trunk/PKGBUILD)
  deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch
(from rev 627525, deepin-terminal/trunk/remove-vendor.patch)

-+
 PKGBUILD|   45 
 remove-vendor.patch |   79 ++
 2 files changed, 124 insertions(+)

Copied: deepin-terminal/repos/community-testing-x86_64/PKGBUILD (from rev 
627525, deepin-terminal/trunk/PKGBUILD)
===
--- community-testing-x86_64/PKGBUILD   (rev 0)
+++ community-testing-x86_64/PKGBUILD   2020-05-13 09:02:37 UTC (rev 627526)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Josip Ponjavic 
+# Contributor: Xu Fasheng 
+
+pkgname=deepin-terminal
+pkgver=5.2.1
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal-reborn;
+license=('GPL3')
+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-reborn/archive/$pkgver.tar.gz;)
+sha512sums=('4679e88a1862f12a7021f1d01e7cb9b98fdaf7d0a4052a9acd488010db05904ee729d6afd6c47aad3c2a9133bbebe30fa0045d6c9b345bae09357b4dff7b8c75')
+
+prepare() {
+  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 '//i#include ' 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(){
+  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
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm -r "$pkgdir"/build
+  chrpath --delete "$pkgdir"/usr/bin/deepin-terminal
+}

Copied: deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch 
(from rev 627525, deepin-terminal/trunk/remove-vendor.patch)
===
--- community-testing-x86_64/remove-vendor.patch
(rev 0)
+++ community-testing-x86_64/remove-vendor.patch2020-05-13 09:02:37 UTC 
(rev 627526)
@@ -0,0 +1,79 @@
+From: Yanhao Mo 
+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}

[arch-commits] Commit in deepin-terminal/repos (3 files)

2020-05-01 Thread Felix Yan via arch-commits

Date: Friday, May 1, 2020 @ 16:45:18
  Author: felixonmars
Revision: 624060

archrelease: copy trunk to community-staging-x86_64

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

-+
 PKGBUILD|   46 +
 remove-vendor.patch |   79 ++
 2 files changed, 125 insertions(+)

Copied: deepin-terminal/repos/community-staging-x86_64/PKGBUILD (from rev 
624059, deepin-terminal/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-01 16:45:18 UTC (rev 624060)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan 
+# Contributor: Josip Ponjavic 
+# Contributor: Xu Fasheng 
+
+pkgname=deepin-terminal
+pkgver=5.0.4.1
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal;
+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')
+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')
+
+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
+}
+
+build() {
+  cd build
+  cmake \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DTEST_BUILD=OFF \
+-DUSE_VENDOR_LIB=OFF \
+-DVERSION=$pkgver \
+../deepin-terminal-$pkgver
+  make
+}
+
+package() {
+  make -C build DESTDIR="$pkgdir" install
+  ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator
+}

Copied: deepin-terminal/repos/community-staging-x86_64/remove-vendor.patch 
(from rev 624059, deepin-terminal/trunk/remove-vendor.patch)
===
--- community-staging-x86_64/remove-vendor.patch
(rev 0)
+++ community-staging-x86_64/remove-vendor.patch2020-05-01 16:45:18 UTC 
(rev 624060)
@@ -0,0 +1,79 @@
+From: Yanhao Mo 
+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
+

[arch-commits] Commit in deepin-terminal/repos (3 files)

2017-11-22 Thread Felix Yan

Date: Thursday, November 23, 2017 @ 04:15:23
  Author: felixonmars
Revision: 268151

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 268150, deepin-terminal/trunk/PKGBUILD)
  deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch
(from rev 268150, deepin-terminal/trunk/remove-vendor.patch)

-+
 PKGBUILD|   46 
 remove-vendor.patch |  112 ++
 2 files changed, 158 insertions(+)

Copied: deepin-terminal/repos/community-testing-x86_64/PKGBUILD (from rev 
268150, deepin-terminal/trunk/PKGBUILD)
===
--- community-testing-x86_64/PKGBUILD   (rev 0)
+++ community-testing-x86_64/PKGBUILD   2017-11-23 04:15:23 UTC (rev 268151)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Josip Ponjavic 
+# Contributor: Xu Fasheng 
+
+pkgname=deepin-terminal
+pkgver=2.8
+pkgrel=1
+pkgdesc='Default terminal emulation application for Deepin'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-terminal;
+license=('GPL3')
+depends=('vte3' 'libsecret' 'libgee' 'libwnck3' 'expect' 
'deepin-shortcut-viewer' 'deepin-menu'
+ 'deepin-manual')
+makedepends=('vala' 'cmake')
+groups=('deepin-extra')
+optdepends=('zssh: for Remote Management support')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal/archive/$pkgver.tar.gz;
+remove-vendor.patch)
+sha512sums=('fc69be13c52b221ab5e73908634b07563f6610c7a88676adb20103eff5bf6a20199e198f0f51490457f77e661e33a346bd59bce018748fea2e10a65b7b8ed900'
+
'86a81d1f4df2e23b42e3929ec28689ee62d8b6eb8690383e5b10a5418e8be4edc78549bafad7e3af57e3184e6d0d205995a36cb7790f099891e5f55af66518ac')
+
+prepare() {
+  mkdir -p build
+
+  cd deepin-terminal-$pkgver
+
+  sed -i 's|return __FILE__;|return 
"/usr/share/deepin-terminal/project_path.c";|' project_path.c
+  sed -i 's|/usr/lib/deepin-terminal/zssh|/usr/bin/zssh|' ssh_login.sh
+
+  patch -p1 -i ../remove-vendor.patch
+}
+
+build() {
+  cd build
+  cmake \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+../deepin-terminal-$pkgver
+  make
+}
+
+package() {
+  make -C build DESTDIR="$pkgdir" install
+  ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator
+}

Copied: deepin-terminal/repos/community-testing-x86_64/remove-vendor.patch 
(from rev 268150, deepin-terminal/trunk/remove-vendor.patch)
===
--- community-testing-x86_64/remove-vendor.patch
(rev 0)
+++ community-testing-x86_64/remove-vendor.patch2017-11-23 04:15:23 UTC 
(rev 268151)
@@ -0,0 +1,112 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f1c0e9..a862fac 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -24,22 +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)
+-
+-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
+-  )
++pkg_check_modules(VTE REQUIRED vte-2.91)
+ 
+ set(CFLAGS
+   ${GIO_CFLAGS}
+@@ -60,9 +45,8 @@ 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})
+ set(LIBS
+   ${GIO_LIBRARIES}
+@@ -72,17 +56,12 @@ set(LIBS
+   ${RSVG_LIBRARIES}
+   ${JsonGlib_LIBRARIES}
+   ${LIBSECRET_LIBRARIES}
+-  ${ZLIB_LIBRARIES}
++  ${VTE_LIBRARIES}
+   ${X11_LIBRARIES}
+   ${XTST_LIBRARIES}
+   ${FONTCONFIG_LIBRARY}
+   ${M_LIBRARIES}
+-  stdc++
+   m
+-  z
+-  pthread
+-  gnutls
+-  pcre2-8
+ )
+ vala_precompile(VALA_C
+   ./lib/animation.vala
+@@ -98,7 +77,7 @@ vala_precompile(VALA_C
+   ./widget/add_button.vala
+   ./widget/appbar.vala
+   ./widget/check_button.vala
+-  ./widget/click_event_box.vala 
++  ./widget/click_event_box.vala
+   ./widget/command_button.vala
+   ./widget/command_dialog.vala
+   ./widget/command_panel.vala
+@@ -109,11 +88,11 @@ vala_precompile(VALA_C
+   ./widget/cursor_toggle_button.vala
+   ./widget/dialog.vala
+

[arch-commits] Commit in deepin-terminal/repos (3 files)

[arch-commits] Commit in deepin-terminal/repos (3 files)

[arch-commits] Commit in deepin-terminal/repos (3 files)

3 matches

Site Navigation

Mail list logo

Footer information