Hello community,
here is the log from the commit of package deepin-terminal for openSUSE:Factory
checked in at 2019-11-15 22:38:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-terminal (Old)
and /work/SRC/openSUSE:Factory/.deepin-terminal.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-terminal"
Fri Nov 15 22:38:08 2019 rev:3 rq:748784 version:3.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-terminal/deepin-terminal.changes
2019-06-24 21:53:27.988110800 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-terminal.new.26869/deepin-terminal.changes
2019-11-15 22:38:14.960124912 +0100
@@ -1,0 +2,8 @@
+Sun Nov 10 04:40:20 UTC 2019 - Marguerite Su <[email protected]>
+
+- add
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
+ * fix TW build errors
+- drop deepin-terminal_unbundle_vte.patch, refreshed to be
+ deepin-terminal-system-vte.patch
+
+-------------------------------------------------------------------
Old:
----
deepin-terminal_unbundle_vte.patch
New:
----
deepin-terminal-system-vte.patch
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-terminal.spec ++++++
--- /var/tmp/diff_new_pack.fnxFRA/_old 2019-11-15 22:38:15.560126856 +0100
+++ /var/tmp/diff_new_pack.fnxFRA/_new 2019-11-15 22:38:15.560126856 +0100
@@ -13,9 +13,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: deepin-terminal
Version: 3.2.6
Release: 0
@@ -24,38 +25,39 @@
Group: System/X11/Terminals
Url: https://github.com/linuxdeepin/deepin-terminal
Source0:
https://github.com/linuxdeepin/deepin-terminal/archive/%{version}/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE deepin-terminal_unbundle_vte.patch [email protected]
- Use vte in system default
-Patch0: deepin-terminal_unbundle_vte.patch
+# PATCH-FIX-OPENSUSE deepin-terminal-system-vte.patch [email protected] -
Use vte in system default
+Patch0: deepin-terminal-system-vte.patch
+# PATCH-FIX-UPSTREAM
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
+Patch1:
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
BuildRequires: cmake
BuildRequires: fdupes
-BuildRequires: vala
-BuildRequires: hicolor-icon-theme
-BuildRequires: update-desktop-files
-BuildRequires: readline-devel
-BuildRequires: libxml2-tools
BuildRequires: gcc-c++
-BuildRequires: intltool >= 0.35.0
BuildRequires: gtk-doc
+BuildRequires: hicolor-icon-theme
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libxml2-tools
+BuildRequires: readline-devel
+BuildRequires: update-desktop-files
+BuildRequires: vala
+BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(vapigen)
BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(gtk+-3.0)
%if 0%{?suse_version} > 1500
BuildRequires: pkgconfig(vte-2.91)
-%else
-BuildRequires: pkgconfig(libpcre2-8)
-BuildRequires: pkgconfig(gnutls)
%endif
-BuildRequires: pkgconfig(gee-0.8)
-BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(gdk-x11-3.0)
+BuildRequires: pkgconfig(gee-0.8)
+BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(librsvg-2.0)
+BuildRequires: pkgconfig(libsecret-1)
+BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(ncurses)
-BuildRequires: pkgconfig(gobject-introspection-1.0)
Recommends: %{name}-lang
Requires: deepin-menu
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,14 +69,14 @@
windows, remote management, quake mode and other features.
%prep
-%setup -q
-%if 0%{?suse_version} > 1500
-%patch0 -p1
-%endif
+%autosetup -p1
sed -i 's|return @@PROJECT_PATH@@;|return "%{_datadir}/%{name}";|'
project_path.c.in
%build
%cmake -DCMAKE_INSTALL_DIR=%{_prefix} \
+%if 0%{?suse_version} > 1500
+ -DUSE_SYSTEM_VTE=ON \
+%endif
-DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \
-DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS"
%if 0%{?sle_version} > 150000 && 0%{?is_opensuse}
@@ -83,7 +85,6 @@
make %{?_smp_mflags}
%endif
-
%install
%cmake_install
@@ -91,7 +92,6 @@
%find_lang %{name}
%fdupes %{buildroot}
-
%files
%defattr(-,root,root,-)
%doc README.md CHANGELOG.md
++++++ deepin-terminal-system-vte.patch ++++++
Index: deepin-terminal-3.2.6/CMakeLists.txt
===================================================================
--- deepin-terminal-3.2.6.orig/CMakeLists.txt
+++ deepin-terminal-3.2.6/CMakeLists.txt
@@ -27,8 +27,12 @@ pkg_check_modules(GLIB REQUIRED glib-2.0
option(TEST_BUILD "Build with native testing" ON)
option(USE_VENDOR_LIB "Backport support for debian stretch" ON)
+option(USE_SYSTEM_VTE "Use system vte" OFF)
-if (NOT USE_VENDOR_LIB)
+message(WARNING "USE_VENDOR_LIB: ${USE_VENDOR_LIB}")
+message(WARNING "USE_SYSTEM_VTE: ${USE_SYSTEM_VTE}")
+
+if (USE_SYSTEM_VTE)
pkg_check_modules(VTE REQUIRED vte-2.91)
endif()
@@ -64,7 +68,7 @@ execute_process(
)
endif()
-if (USE_VENDOR_LIB)
+if (NOT USE_SYSTEM_VTE)
ExternalProject_Add(Vte-0.52
SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.52.1
CONFIGURE_COMMAND ./configure --enable-static
@@ -72,7 +76,9 @@ ExternalProject_Add(Vte-0.52
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
+endif()
+if (USE_VENDOR_LIB)
ExternalProject_Add(zssh-1.5c
SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c
CONFIGURE_COMMAND ./configure
@@ -92,6 +98,9 @@ set(CFLAGS
-s -O3 -w
# -g
)
+if (USE_SYSTEM_VTE)
+ list(APPEND CFLAGS ${VTE_CFLAGS})
+endif()
add_compile_options(${CFLAGS})
set(INCLUDE_PATHS
${GIO_INCLUDE_DIRS}
@@ -103,7 +112,7 @@ set(INCLUDE_PATHS
${LIBSECRET_INCLUDE_DIRS}
)
-if (USE_VENDOR_LIB)
+if (NOT USE_SYSTEM_VTE)
list(APPEND INCLUDE_PATHS ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.52.1/src)
find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal)
else()
@@ -128,12 +137,12 @@ set(LIBS
m
z
pthread
- gnutls
- pcre2-8
+ gnutls
+ pcre2-8
)
-if (NOT USE_VENDOR_LIB)
- list(APPEND LIBS ${VTE_LIBRARIES})
+if (USE_SYSTEM_VTE)
+ list(APPEND LIBS ${VTE_LIBRARIES})
endif()
SET(APP_SOURCES, "")
@@ -187,7 +196,7 @@ endif()
add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c
${CMAKE_SOURCE_DIR}/lib/font.c)
-if (USE_VENDOR_LIB)
+if (NOT USE_SYSTEM_VTE)
target_link_libraries(${target} ${LIBS}
${CMAKE_SOURCE_DIR}/3rdparty/vte-0.52.1/src/.libs/libvte-2.91.a)
add_dependencies(${target} Vte-0.52)
else()
++++++
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
++++++
>From 9a5e2d58fb6028bcb7e51d7b17feb5b780531fde Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <[email protected]>
Date: Sat, 5 Oct 2019 10:26:09 +0200
Subject: [PATCH] xcb: Fix "missing return statement at end of subroutine body"
errors
---
vapi/xcb.vapi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/vapi/xcb.vapi b/vapi/xcb.vapi
index d92207000..770895a81 100644
--- a/vapi/xcb.vapi
+++ b/vapi/xcb.vapi
@@ -371,13 +371,13 @@ namespace Xcb {
private VoidCookie vala_image_text_8_checked (uint8 string_len,
Drawable drawable, GContext gc, int16 x, int16 y, string text);
[CCode (cname = "vala_xcb_image_text8_checked")]
public VoidCookie image_text_8_checked (Drawable drawable,
GContext gc, int16 x, int16 y, string text) {
- this.vala_image_text_8_checked ((uint8) text.length,
drawable, gc, x, y, text);
+ return this.vala_image_text_8_checked ((uint8)
text.length, drawable, gc, x, y, text);
}
[CCode (cname = "xcb_image_text_8")]
private VoidCookie vala_image_text_8 (uint8 string_len,
Drawable drawable, GContext gc, int16 x, int16 y, string text);
[CCode (cname = "vala_xcb_image_text8")]
public VoidCookie image_text_8 (Drawable drawable, GContext gc,
int16 x, int16 y, string text) {
- this.vala_image_text_8 ((uint8) text.length, drawable,
gc, x, y, text);
+ return this.vala_image_text_8 ((uint8) text.length,
drawable, gc, x, y, text);
}
//image_text_16
@@ -409,13 +409,13 @@ namespace Xcb {
private AllocNamedColorCookie vala_alloc_named_color (Colormap
cmap, uint16 name_len, string name);
[CCode (cname = "vala_xcb_alloc_named_color")]
public AllocNamedColorCookie alloc_named_color (Colormap cmap,
string name) {
- this.vala_alloc_named_color (cmap, (uint16)
name.length, name);
+ return this.vala_alloc_named_color (cmap, (uint16)
name.length, name);
}
[CCode (cname = "xcb_alloc_named_color_unchecked")]
private AllocNamedColorCookie vala_alloc_named_color_unchecked
(Colormap cmap, uint16 name_len, string name);
[CCode (cname = "vala_xcb_alloc_named_color_unchecked")]
public AllocNamedColorCookie alloc_named_color_unchecked
(Colormap cmap, string name) {
- this.vala_alloc_named_color_unchecked (cmap, (uint16)
name.length, name);
+ return this.vala_alloc_named_color_unchecked (cmap,
(uint16) name.length, name);
}
public AllocNamedColorReply? alloc_named_color_reply
(AllocNamedColorCookie cookie, out GenericError? e = null);
@@ -437,13 +437,13 @@ namespace Xcb {
private VoidCookie vala_store_named_color_checked (ColorFlag
flags, Colormap cmap, uint32 pixel, uint16 name_len, string name);
[CCode (cname = "vala_xcb_store_named_color_checked")]
public VoidCookie store_named_color_checked (ColorFlag flags,
Colormap cmap, uint32 pixel, string name) {
- this.vala_store_named_color_checked (flags, cmap,
pixel, (uint16) name.length, name);
+ return this.vala_store_named_color_checked (flags,
cmap, pixel, (uint16) name.length, name);
}
[CCode (cname = "xcb_store_named_color")]
private VoidCookie vala_store_named_color (ColorFlag flags,
Colormap cmap, uint32 pixel, uint16 name_len, string name);
[CCode (cname = "vala_xcb_store_named_color")]
public VoidCookie store_named_color (ColorFlag flags, Colormap
cmap, uint32 pixel, string name) {
- this.vala_store_named_color (flags, cmap, pixel,
(uint16) name.length, name);
+ return this.vala_store_named_color (flags, cmap, pixel,
(uint16) name.length, name);
}
public QueryColorsCookie query_colors (Colormap cmap, [CCode
(array_length_pos = 1.9, array_length_type = "uint32_t")] uint32[] pixels);
@@ -454,13 +454,13 @@ namespace Xcb {
private LookupColorCookie vala_lookup_color (Colormap cmap,
uint16 name_len, string name);
[CCode (cname = "vala_xcb_lookup_color")]
public LookupColorCookie lookup_color (Colormap cmap, string
name) {
- this.vala_lookup_color (cmap, (uint16) name.length,
name);
+ return this.vala_lookup_color (cmap, (uint16)
name.length, name);
}
[CCode (cname = "xcb_lookup_color_unchecked")]
private LookupColorCookie vala_lookup_color_unchecked (Colormap
cmap, uint16 name_len, string name);
[CCode (cname = "vala_xcb_lookup_color_unchecked")]
public LookupColorCookie lookup_color_unchecked (Colormap cmap,
string name) {
- this.vala_lookup_color_unchecked (cmap, (uint16)
name.length, name);
+ return this.vala_lookup_color_unchecked (cmap, (uint16)
name.length, name);
}
public LookupColorReply? lookup_color_reply (LookupColorCookie
cookie, out GenericError? e = null);
--
2.22.0
