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

Felix Yan felixonmars at archlinux.org
Wed May 16 16:26:38 UTC 2018


    Date: Wednesday, May 16, 2018 @ 16:26:37
  Author: felixonmars
Revision: 322936

archrelease: copy trunk to community-x86_64

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

---------------------+
 PKGBUILD            |   91 ++++++++++++++--------------
 remove-vendor.patch |  158 +++++++++++++++++++++++++-------------------------
 2 files changed, 125 insertions(+), 124 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-16 16:26:13 UTC (rev 322935)
+++ PKGBUILD	2018-05-16 16:26:37 UTC (rev 322936)
@@ -1,45 +0,0 @@
-# $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=3.0.0
-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=('9e5906ae5d2690841cb14e99f93901cfe122298e00c897344c7c3fbc2751d4cbec63f335da8de30cf3746f67e3c8a2a5b8e39d9faa5b210f4e0772883556c8d6'
-            '1eb83fd8a8844ad7ee914afab506d0cbbc900a8239f008be8113ff8eee98006b35b6e447f40b6cce7f15864a33d3d1b385476ac7946be98012bfdc78c956a373')
-
-prepare() {
-  mkdir -p build
-
-  cd deepin-terminal-$pkgver
-
-  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-x86_64/PKGBUILD (from rev 322935, deepin-terminal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-16 16:26:37 UTC (rev 322936)
@@ -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=3.0.0
+pkgrel=2
+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=('9e5906ae5d2690841cb14e99f93901cfe122298e00c897344c7c3fbc2751d4cbec63f335da8de30cf3746f67e3c8a2a5b8e39d9faa5b210f4e0772883556c8d6'
+            '1eb83fd8a8844ad7ee914afab506d0cbbc900a8239f008be8113ff8eee98006b35b6e447f40b6cce7f15864a33d3d1b385476ac7946be98012bfdc78c956a373')
+
+prepare() {
+  mkdir -p build
+
+  cd deepin-terminal-$pkgver
+
+  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 \
+    -DTEST_BUILD=OFF \
+    ../deepin-terminal-$pkgver
+  make
+}
+
+package() {
+  make -C build DESTDIR="$pkgdir" install
+  ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator
+}

Deleted: remove-vendor.patch
===================================================================
--- remove-vendor.patch	2018-05-16 16:26:13 UTC (rev 322935)
+++ remove-vendor.patch	2018-05-16 16:26:37 UTC (rev 322936)
@@ -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 322935, deepin-terminal/trunk/remove-vendor.patch)
===================================================================
--- remove-vendor.patch	                        (rev 0)
+++ remove-vendor.patch	2018-05-16 16:26:37 UTC (rev 322936)
@@ -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