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

Felix Yan felixonmars at archlinux.org
Thu Nov 23 04:15:23 UTC 2017


    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 <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+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.patch	2017-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
+ 	./widget/dialog_button.vala
+-	./widget/encoding_button.vala 
+-	./widget/encoding_panel.vala 
+-	./widget/entry.vala 
+-	./widget/entry_menu.vala 
+-	./widget/file_button.vala 
++	./widget/encoding_button.vala
++	./widget/encoding_panel.vala
++	./widget/entry.vala
++	./widget/entry_menu.vala
++	./widget/file_button.vala
+ 	./widget/image_button.vala
+ 	./widget/window_button.vala
+ 	./widget/panel_button.vala
+@@ -142,7 +121,7 @@ vala_precompile(VALA_C
+ 	./widget/window.vala
+ 	./widget/window_event_area.vala
+ 	./widget/workspace.vala
+-	./widget/workspace_manager.vala 
++	./widget/workspace_manager.vala
+ 	main.vala
+ 
+ OPTIONS
+@@ -164,8 +143,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 "")
+@@ -182,7 +160,7 @@ foreach(lang ${dirlist})
+ endforeach()
+ 
+ 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/deepin-terminal.png DESTINATION share/icons/hicolor/32x32/apps)
+ INSTALL (FILES hicolor/48x48/deepin-terminal.png DESTINATION share/icons/hicolor/48x48/apps)
+ INSTALL (FILES hicolor/96x96/deepin-terminal.png DESTINATION share/icons/hicolor/96x96/apps)


More information about the arch-commits mailing list