aboutsummaryrefslogtreecommitdiff
path: root/desktop/subtle/changeset_r3244.diff
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/subtle/changeset_r3244.diff')
-rw-r--r--desktop/subtle/changeset_r3244.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/desktop/subtle/changeset_r3244.diff b/desktop/subtle/changeset_r3244.diff
new file mode 100644
index 0000000000000..9fe46a4a805fe
--- /dev/null
+++ b/desktop/subtle/changeset_r3244.diff
@@ -0,0 +1,16 @@
+diff -r 43d1d0478c46 -r 31e0a9716e58 Rakefile
+--- a/Rakefile
++++ b/Rakefile
+@@ -397,6 +397,12 @@
+ ret = false
+
+ cflags, ldflags, libs = pkg_config("xft")
++
++ # Fix a bug in ruby 2.2.0 (https://bugs.ruby-lang.org/issues/10651)
++ if cflags.empty?
++ cflags << `#{$PKGCONFIG} --cflags xft`.chomp
++ end
++
+ unless libs.nil?
+ # Update flags
+ @options["cpppath"] << " %s" % [ cflags ]