summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-12-10 16:14:03 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-12-10 16:17:23 +0100
commit06448095946f635dd5753fd2db6079ca14bcfde7 (patch)
treeee647681b9a32506b2e76180e3296db0ff70deb4 /graphite
parentad2e7f5be349627326ba92a565692f0ee955f44f (diff)
Reported graphite2 patch upstream
Change-Id: Idca64b8925199f3d275e7966c1d0e13fee4967a8
Diffstat (limited to 'graphite')
-rw-r--r--graphite/UnpackedTarball_graphite.mk3
-rw-r--r--graphite/graphite2.issue1115.patch.1 (renamed from graphite/graphite2.narrowing.patch.1)0
2 files changed, 2 insertions, 1 deletions
diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk
index 25638dad8ea6..a25b3166e280 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/graphite/UnpackedTarball_graphite.mk
@@ -12,10 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
# http://projects.palaso.org/issues/1030
+# http://projects.palaso.org/issues/1115
$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
graphite/graphite2.patch \
graphite/graphite2.issue1030.patch.1 \
- graphite/graphite2.narrowing.patch.1 \
+ graphite/graphite2.issue1115.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.narrowing.patch.1 b/graphite/graphite2.issue1115.patch.1
index f19c8a3749f4..f19c8a3749f4 100644
--- a/graphite/graphite2.narrowing.patch.1
+++ b/graphite/graphite2.issue1115.patch.1