r38532 - in /desktop/unstable/vte3/debian: changelog patches/01_scroll_notebook.patch patches/03_scroll_region_updates.patch patches/04_workaround_resources_compiler_path.patch patches/25_optional-ncurses.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Mon Jun 10 23:10:45 UTC 2013
Author: biebl
Date: Mon Jun 10 23:10:45 2013
New Revision: 38532
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38532
Log:
Refresh patches.
Modified:
desktop/unstable/vte3/debian/changelog
desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch
desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch
desktop/unstable/vte3/debian/patches/04_workaround_resources_compiler_path.patch
desktop/unstable/vte3/debian/patches/25_optional-ncurses.patch
Modified: desktop/unstable/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/changelog?rev=38532&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte3/debian/changelog [utf-8] Mon Jun 10 23:10:45 2013
@@ -1,6 +1,7 @@
vte3 (1:0.34.6-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patches.
-- Michael Biebl <biebl at debian.org> Tue, 11 Jun 2013 01:09:25 +0200
Modified: desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch?rev=38532&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch [utf-8] Mon Jun 10 23:10:45 2013
@@ -4,11 +4,11 @@
Corresponding GTK+ bug: GNOME #145244
-Index: vte-0.32.2/src/vte.c
+Index: vte-0.34.6/src/vte.c
===================================================================
---- vte-0.32.2.orig/src/vte.c 2012-05-29 19:44:17.000000000 +0200
-+++ vte-0.32.2/src/vte.c 2012-06-01 01:13:26.527472012 +0200
-@@ -11387,6 +11387,13 @@
+--- vte-0.34.6.orig/src/vte.c 2013-06-11 01:10:00.042955816 +0200
++++ vte-0.34.6/src/vte.c 2013-06-11 01:10:00.034955546 +0200
+@@ -11304,6 +11304,13 @@
vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
Modified: desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch?rev=38532&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch [utf-8] Mon Jun 10 23:10:45 2013
@@ -2,11 +2,11 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=542087
Bug-Ubuntu: https://launchpad.net/bugs/246701
-Index: vte-0.32.2/src/vte.c
+Index: vte-0.34.6/src/vte.c
===================================================================
---- vte-0.32.2.orig/src/vte.c 2012-06-01 01:13:26.527472012 +0200
-+++ vte-0.32.2/src/vte.c 2012-06-01 01:13:33.119471779 +0200
-@@ -4068,6 +4068,7 @@
+--- vte-0.34.6.orig/src/vte.c 2013-06-11 01:10:05.359134587 +0200
++++ vte-0.34.6/src/vte.c 2013-06-11 01:10:05.355134454 +0200
+@@ -4074,6 +4074,7 @@
long wcount, start, delta;
gboolean leftovers, modified, bottom, again;
gboolean invalidated_text;
@@ -14,7 +14,7 @@
GArray *unichars;
struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
-@@ -4087,6 +4088,10 @@
+@@ -4093,6 +4094,10 @@
cursor = screen->cursor_current;
cursor_visible = terminal->pvt->cursor_visible;
@@ -25,7 +25,7 @@
/* We should only be called when there's data to process. */
g_assert(terminal->pvt->incoming ||
(terminal->pvt->pending->len > 0));
-@@ -4185,6 +4190,8 @@
+@@ -4191,6 +4196,8 @@
* points to the first character which isn't part of this
* sequence. */
if ((match != NULL) && (match[0] != '\0')) {
@@ -34,7 +34,7 @@
/* Call the right sequence handler for the requested
* behavior. */
_vte_terminal_handle_sequence(terminal,
-@@ -4195,12 +4202,20 @@
+@@ -4201,12 +4208,20 @@
start = (next - wbuf);
modified = TRUE;
@@ -60,7 +60,7 @@
/* Clip off any part of the box which isn't already on-screen. */
bbox_topleft.x = MAX(bbox_topleft.x, 0);
bbox_topleft.y = MAX(bbox_topleft.y, delta);
-@@ -4220,6 +4235,8 @@
+@@ -4226,6 +4241,8 @@
bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
bbox_topleft.x = bbox_topleft.y = G_MAXINT;
}
Modified: desktop/unstable/vte3/debian/patches/04_workaround_resources_compiler_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/04_workaround_resources_compiler_path.patch?rev=38532&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/04_workaround_resources_compiler_path.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/04_workaround_resources_compiler_path.patch [utf-8] Mon Jun 10 23:10:45 2013
@@ -1,11 +1,11 @@
Description: Drop --sourcedir from glib-compile-resources call. It is not necessary here, and breaks out-of-tree builds with absolute configure paths, such as cdbs does.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672541
-Index: vte3-exp/src/Makefile.am
+Index: vte-0.34.6/src/Makefile.am
===================================================================
---- vte3-exp.orig/src/Makefile.am 2012-03-10 16:55:12.000000000 +0100
-+++ vte3-exp/src/Makefile.am 2012-03-21 13:01:21.900076144 +0100
-@@ -152,7 +152,7 @@
+--- vte-0.34.6.orig/src/Makefile.am 2013-06-11 01:10:09.695278751 +0200
++++ vte-0.34.6/src/Makefile.am 2013-06-11 01:10:09.687278486 +0200
+@@ -150,7 +150,7 @@
mv -f $@.tmp $@
vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml)
Modified: desktop/unstable/vte3/debian/patches/25_optional-ncurses.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/25_optional-ncurses.patch?rev=38532&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/25_optional-ncurses.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/25_optional-ncurses.patch [utf-8] Mon Jun 10 23:10:45 2013
@@ -1,7 +1,7 @@
-Index: vte-0.32.2/configure.in
+Index: vte-0.34.6/configure.in
===================================================================
---- vte-0.32.2.orig/configure.in 2012-06-01 23:36:21.731601165 +0200
-+++ vte-0.32.2/configure.in 2012-06-01 23:36:31.603600816 +0200
+--- vte-0.34.6.orig/configure.in 2013-06-11 01:10:12.623375272 +0200
++++ vte-0.34.6/configure.in 2013-06-11 01:10:12.611374876 +0200
@@ -242,45 +242,52 @@
AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
AC_CHECK_FUNCS([ceil floor round])
@@ -93,11 +93,11 @@
# Search for the required modules.
-Index: vte-0.32.2/src/keymap.c
+Index: vte-0.34.6/src/keymap.c
===================================================================
---- vte-0.32.2.orig/src/keymap.c 2012-06-01 23:36:21.731601165 +0200
-+++ vte-0.32.2/src/keymap.c 2012-06-01 23:36:31.603600816 +0200
-@@ -50,7 +50,7 @@
+--- vte-0.34.6.orig/src/keymap.c 2013-06-11 01:10:12.623375272 +0200
++++ vte-0.34.6/src/keymap.c 2013-06-11 01:10:12.615375008 +0200
+@@ -52,7 +52,7 @@
#include <termcap.h>
#define VTE_TERMCAP_NAME "termcap"
#else
@@ -106,7 +106,7 @@
#endif
#ifdef VTE_DEBUG
-@@ -1014,8 +1014,10 @@
+@@ -1006,8 +1006,10 @@
enum _vte_fkey_mode fkey_mode;
char *cap, *tmp;
const char *termcap_special = NULL;
@@ -117,7 +117,7 @@
g_return_if_fail(normal != NULL);
g_return_if_fail(normal_length != NULL);
-@@ -1169,6 +1171,7 @@
+@@ -1161,6 +1163,7 @@
}
}
}
@@ -125,7 +125,7 @@
if (termcap_special != NULL) {
tmp = g_strdup(terminal);
cap = NULL;
-@@ -1209,6 +1212,7 @@
+@@ -1201,6 +1204,7 @@
return;
}
}
@@ -133,10 +133,10 @@
_vte_debug_print(VTE_DEBUG_KEYBOARD,
" (ignoring, no match for modifier state).\n");
-Index: vte-0.32.2/src/ssfe.c
+Index: vte-0.34.6/src/ssfe.c
===================================================================
---- vte-0.32.2.orig/src/ssfe.c 2012-06-01 23:36:21.731601165 +0200
-+++ vte-0.32.2/src/ssfe.c 2012-06-01 23:36:31.603600816 +0200
+--- vte-0.34.6.orig/src/ssfe.c 2013-06-11 01:10:12.623375272 +0200
++++ vte-0.34.6/src/ssfe.c 2013-06-11 01:10:12.615375008 +0200
@@ -38,7 +38,7 @@
#include <termcap.h>
#define VTE_TERMCAP_NAME "termcap"
More information about the pkg-gnome-commits
mailing list