[arch-commits] Commit in deepin-terminal/trunk (PKGBUILD remove-vendor.patch)

Felix Yan felixonmars at archlinux.org
Wed May 16 14:15:57 UTC 2018 

    Date: Wednesday, May 16, 2018 @ 14:15:56
  Author: felixonmars
Revision: 322839

upgpkg: deepin-terminal 3.0.0-1

Modified:
  deepin-terminal/trunk/PKGBUILD
  deepin-terminal/trunk/remove-vendor.patch

---------------------+
 PKGBUILD            |    7 +--
 remove-vendor.patch |   97 ++++++++++++++++----------------------------------
 2 files changed, 35 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-16 14:12:33 UTC (rev 322838)
+++ PKGBUILD	2018-05-16 14:15:56 UTC (rev 322839)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-terminal
-pkgver=2.9.2
+pkgver=3.0.0
 pkgrel=1
 pkgdesc='Default terminal emulation application for Deepin'
 arch=('x86_64')
@@ -17,8 +17,8 @@
 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=('17fb431407791b840cb72cf14760e542ee503bfc12e8cf434a6b6e110d0e1d46d2fa969c3dcce0eaa336e90082f6ccddfe2513f5340ad6c946d04d10cebd35f9'
-            '86a81d1f4df2e23b42e3929ec28689ee62d8b6eb8690383e5b10a5418e8be4edc78549bafad7e3af57e3184e6d0d205995a36cb7790f099891e5f55af66518ac')
+sha512sums=('9e5906ae5d2690841cb14e99f93901cfe122298e00c897344c7c3fbc2751d4cbec63f335da8de30cf3746f67e3c8a2a5b8e39d9faa5b210f4e0772883556c8d6'
+            '1eb83fd8a8844ad7ee914afab506d0cbbc900a8239f008be8113ff8eee98006b35b6e447f40b6cce7f15864a33d3d1b385476ac7946be98012bfdc78c956a373')
 
 prepare() {
   mkdir -p build
@@ -25,7 +25,6 @@
 
   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

Modified: remove-vendor.patch
===================================================================
--- remove-vendor.patch	2018-05-16 14:12:33 UTC (rev 322838)
+++ remove-vendor.patch	2018-05-16 14:15:56 UTC (rev 322839)
@@ -1,12 +1,27 @@
+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 0f1c0e9..a862fac 100644
+index 9d57aca..47f83d7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -24,22 +24,7 @@ pkg_check_modules(RSVG REQUIRED librsvg-2.0)
+@@ -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
@@ -22,11 +37,11 @@
 -  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
+ 	${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER}
+@@ -79,7 +64,7 @@ set(INCLUDE_PATHS
  	${RSVG_INCLUDE_DIRS}
  	${JsonGlib_INCLUDE_DIRS}
  	${LIBSECRET_INCLUDE_DIRS}
@@ -33,65 +48,17 @@
 -	${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src
 +	${VTE_INCLUDE_DIRS}
  )
--find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal)
+ 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}
+@@ -96,6 +81,7 @@ set(LIBS
  	${XTST_LIBRARIES}
  	${FONTCONFIG_LIBRARY}
  	${M_LIBRARIES}
--	stdc++
++	${VTE_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
+ 	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)
@@ -101,12 +68,12 @@
  
  FILE(GLOB children LIST_DIRECTORIES true po/*)
  SET(dirlist "")
-@@ -182,7 +160,7 @@ foreach(lang ${dirlist})
- endforeach()
+@@ -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/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)
+ 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