← Back to branch summary

~ubuntu-desktop/vte/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/04_workaround_resources_compiler_path.patch

  • Committer: Iain Lane
  • Date: 2013-11-22 14:12:40 UTC
  • Revision ID: iain.lane@canonical.com-20131122141240-r6qf5uskawpm84hq
Tags: 1:0.34.9-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - debian/patches/91_keep_fds.patch:
    + Keep file descriptors open on vte_fork_pty()
* Remove debian/patches/93_add_alt_screen_scroll_toggle.patch: implemented
  upstream (differently).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_workaround_resources_compiler_path.patch
1
1
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.
2
2
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672541
3
3
 
4
 
Index: vte-0.34.6/src/Makefile.am
 
4
Index: vte-0.34.9/src/Makefile.am
5
5
===================================================================
6
 
--- vte-0.34.6.orig/src/Makefile.am     2013-06-11 01:10:09.695278751 +0200
7
 
+++ vte-0.34.6/src/Makefile.am  2013-06-11 01:10:09.687278486 +0200
8
 
@@ -150,7 +150,7 @@
 
6
--- vte-0.34.9.orig/src/Makefile.am     2013-10-23 14:49:50.628158018 +0200
 
7
+++ vte-0.34.9/src/Makefile.am  2013-10-23 14:49:50.624157968 +0200
 
8
@@ -152,7 +152,7 @@
9
9
        mv -f $@.tmp $@
10
10
 
11
11
 vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml)