r33466 - in /desktop/experimental/vte3/debian: changelog patches/04_workaround_resources_compiler_path.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Mar 21 12:05:34 2012
New Revision: 33466

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33466
Log:
Add 04_workaround_resources_compiler_path.patch: 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.
Works around GNOME #672541.

Added:
    desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch
Modified:
    desktop/experimental/vte3/debian/changelog
    desktop/experimental/vte3/debian/patches/series

Modified: desktop/experimental/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/changelog?rev=33466&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/changelog [utf-8] (original)
+++ desktop/experimental/vte3/debian/changelog [utf-8] Wed Mar 21 12:05:34 2012
@@ -7,6 +7,10 @@
   * Add 03_scroll_region_updates.patch: Fix glitches with interspersing writes
     to the bottom line with scrolls of the upper region. Patch taken from
     Ubuntu package. (GNOME #542087, LP: #246701)
+  * Add 04_workaround_resources_compiler_path.patch: 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.
+    Works around GNOME #672541.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 21 Mar 2012 10:24:18 +0100
 

Added: desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch?rev=33466&op=file
==============================================================================
--- desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch (added)
+++ desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch [utf-8] Wed Mar 21 12:05:34 2012
@@ -1,0 +1,16 @@
+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 
+===================================================================
+--- 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 @@
+ 	mv -f $@.tmp $@
+ 
+ vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml)
+-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate --c-name vte $<
++	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --generate --c-name vte $<
+ 
+ # vte the application
+ 

Modified: desktop/experimental/vte3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/series?rev=33466&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/series [utf-8] Wed Mar 21 12:05:34 2012
@@ -1,5 +1,6 @@
 01_scroll_notebook.patch
 02_meta.patch
 03_scroll_region_updates.patch
+04_workaround_resources_compiler_path.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch