r47704 - in /desktop/unstable/vte2.91/debian: changelog control control.in libvte-2.91-0.symbols patches/01_scroll_notebook.patch patches/fix-out-of-tree-build.patch patches/pthread-vs-nostdlib.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri Mar 25 08:40:20 UTC 2016


Author: ah
Date: Fri Mar 25 08:40:19 2016
New Revision: 47704

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47704
Log:
* New upstream release.
* Update (build-)dependencies according to configure.ac changes:
  - add libpcre2-dev (>= 10.21)
  - bump libgtk-3-dev (>= 3.16)
* Refresh both patches to apply without fuzz.
* Fix return statement in debian/patches/01_scroll_notebook.patch
  - the function is (now?) void, so don't try to return FALSE.
* Add debian/patches/pthread-vs-nostdlib.patch
* Update debian/libvte-2.91-0.symbols with two additions.

Added:
    desktop/unstable/vte2.91/debian/patches/pthread-vs-nostdlib.patch
Modified:
    desktop/unstable/vte2.91/debian/changelog
    desktop/unstable/vte2.91/debian/control
    desktop/unstable/vte2.91/debian/control.in
    desktop/unstable/vte2.91/debian/libvte-2.91-0.symbols
    desktop/unstable/vte2.91/debian/patches/01_scroll_notebook.patch
    desktop/unstable/vte2.91/debian/patches/fix-out-of-tree-build.patch
    desktop/unstable/vte2.91/debian/patches/series

Modified: desktop/unstable/vte2.91/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/changelog?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/changelog	[utf-8] Fri Mar 25 08:40:19 2016
@@ -1,3 +1,17 @@
+vte2.91 (0.44.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update (build-)dependencies according to configure.ac changes:
+    - add libpcre2-dev (>= 10.21)
+    - bump libgtk-3-dev (>= 3.16)
+  * Refresh both patches to apply without fuzz.
+  * Fix return statement in debian/patches/01_scroll_notebook.patch
+    - the function is (now?) void, so don't try to return FALSE.
+  * Add debian/patches/pthread-vs-nostdlib.patch
+  * Update debian/libvte-2.91-0.symbols with two additions.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 24 Mar 2016 17:25:27 +0100
+
 vte2.91 (0.42.5-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/vte2.91/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/control?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/control	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/control	[utf-8] Fri Mar 25 08:40:19 2016
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
@@ -14,7 +14,8 @@
                dh-autoreconf,
                libglib2.0-dev (>= 2.40.0),
                libpango1.0-dev (>= 1.22.0),
-               libgtk-3-dev (>= 3.8.0),
+               libpcre2-dev (>= 10.21),
+               libgtk-3-dev (>= 3.16),
                libgnutls28-dev (>= 3.2.7),
                libxml2-utils,
                gobject-introspection (>= 0.9.12-4~),
@@ -82,7 +83,8 @@
          gir1.2-vte-2.91 (= ${binary:Version}),
          libglib2.0-dev (>= 2.40.0),
          libpango1.0-dev (>= 1.22.0),
-         libgtk-3-dev (>= 3.8.0),
+         libgtk-3-dev (>= 3.12.0),
+         libpcre2-dev (>= 10.21),
          zlib1g-dev,
          libgnutls28-dev (>= 3.2.7),
          libvte-2.91-common

Modified: desktop/unstable/vte2.91/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/control.in?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/control.in	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/control.in	[utf-8] Fri Mar 25 08:40:19 2016
@@ -10,7 +10,8 @@
                dh-autoreconf,
                libglib2.0-dev (>= 2.40.0),
                libpango1.0-dev (>= 1.22.0),
-               libgtk-3-dev (>= 3.8.0),
+               libpcre2-dev (>= 10.21),
+               libgtk-3-dev (>= 3.16),
                libgnutls28-dev (>= 3.2.7),
                libxml2-utils,
                gobject-introspection (>= 0.9.12-4~),
@@ -78,7 +79,8 @@
          gir1.2-vte-2.91 (= ${binary:Version}),
          libglib2.0-dev (>= 2.40.0),
          libpango1.0-dev (>= 1.22.0),
-         libgtk-3-dev (>= 3.8.0),
+         libgtk-3-dev (>= 3.12.0),
+         libpcre2-dev (>= 10.21),
          zlib1g-dev,
          libgnutls28-dev (>= 3.2.7),
          libvte-2.91-common

Modified: desktop/unstable/vte2.91/debian/libvte-2.91-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/libvte-2.91-0.symbols?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/libvte-2.91-0.symbols	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/libvte-2.91-0.symbols	[utf-8] Fri Mar 25 08:40:19 2016
@@ -22,6 +22,7 @@
  vte_pty_set_utf8 at Base 0
  vte_terminal_copy_clipboard at Base 0
  vte_terminal_copy_primary at Base 0
+ vte_terminal_event_check_gregex_simple at Base 0.44.0
  vte_terminal_feed at Base 0
  vte_terminal_feed_child at Base 0
  vte_terminal_feed_child_binary at Base 0
@@ -80,6 +81,7 @@
  vte_terminal_set_color_background at Base 0
  vte_terminal_set_color_bold at Base 0
  vte_terminal_set_color_cursor at Base 0
+ vte_terminal_set_color_cursor_foreground at Base 0.44.0
  vte_terminal_set_color_foreground at Base 0
  vte_terminal_set_color_highlight at Base 0
  vte_terminal_set_color_highlight_foreground at Base 0

Modified: desktop/unstable/vte2.91/debian/patches/01_scroll_notebook.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/01_scroll_notebook.patch?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/01_scroll_notebook.patch	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/patches/01_scroll_notebook.patch	[utf-8] Fri Mar 25 08:40:19 2016
@@ -6,17 +6,17 @@
 
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -10302,6 +10302,13 @@
+@@ -9842,6 +9842,13 @@
  
- 	vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
+ 	read_modifiers(base_event);
  
 +#if GTK_CHECK_VERSION (2, 90, 8)
 +	/* Do not intercept Alt+scroll, let the GtkNotebook handle it to switch tabs.
 +	   Requires a fixed GTK+, see https://bugzilla.gnome.org/show_bug.cgi?id=145244 */
 +	if (event->state & GDK_MOD1_MASK)
-+		return FALSE;
++		return;
 +#endif
 +
  	switch (event->direction) {
  	case GDK_SCROLL_UP:
- 		terminal->pvt->mouse_smooth_scroll_delta -= 1.;
+ 		m_mouse_smooth_scroll_delta -= 1.;

Modified: desktop/unstable/vte2.91/debian/patches/fix-out-of-tree-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/fix-out-of-tree-build.patch?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/fix-out-of-tree-build.patch	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/patches/fix-out-of-tree-build.patch	[utf-8] Fri Mar 25 08:40:19 2016
@@ -1,6 +1,6 @@
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -290,6 +290,7 @@
+@@ -288,6 +288,7 @@
  	-Wno-unused-but-set-variable \
  	$(VTE_CFLAGS) \
  	$(AM_CFLAGS) \

Added: desktop/unstable/vte2.91/debian/patches/pthread-vs-nostdlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/pthread-vs-nostdlib.patch?rev=47704&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/pthread-vs-nostdlib.patch	(added)
+++ desktop/unstable/vte2.91/debian/patches/pthread-vs-nostdlib.patch	[utf-8] Fri Mar 25 08:40:19 2016
@@ -0,0 +1,28 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Fix FTBFS with -pthread vs. -nostdlib vs. -Wl,-z,defs
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761444
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,20 @@
+ AC_SUBST([VTE_LDFLAGS])
+ AC_SUBST([VTE_CXXLDFLAGS])
+ 
++# Linking with both -nostdlib and -Wl,-z,defs results in
++# ./src/pty.cc:131: undefined reference to `pthread_sigmask'
++# This explicitly links in pthead which is not done automatically
++# when using -nostdlib.
++# See https://bugzilla.gnome.org/show_bug.cgi?id=761444
++AC_SEARCH_LIBS(pthread_sigmask, pthread,,
++               [AC_MSG_ERROR([cannot find pthread_sigmask in libc or libpthread])])
++if test x"$ac_cv_search_pthread_sigmask" != x"none required" ; then
++   PTHREAD_LIBS=$ac_cv_search_pthread_sigmask
++fi
++AC_SUBST(PTHREAD_LIBS)
++
++LIBS="$LIBS $PTHREAD_LIBS"
++
+ ################################################################################
+ # Core
+ ################################################################################

Modified: desktop/unstable/vte2.91/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/series?rev=47704&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/patches/series	[utf-8] Fri Mar 25 08:40:19 2016
@@ -1,2 +1,3 @@
 01_scroll_notebook.patch
 fix-out-of-tree-build.patch
+pthread-vs-nostdlib.patch




More information about the pkg-gnome-commits mailing list