[Rosegarden-devel] patch: compile with x.org 7

[Patrick L. <plam@MIT.EDU>]

Hi,

I tried to compile SVN on my computer, which uses xft 2.1.8.2-8 under
Debian and XOrg 7.  It didn't work because rosegarden looks for files in
/usr/X11R6/*/X11 and XOrg 7 has moved them to /usr/*/X11.  Here's a
patch which worked for me:

Index: gui/SConscript
===================================================================
--- gui/SConscript      (revision 7476)
+++ gui/SConscript      (working copy)
@@ -159,8 +159,8 @@
 obj=env.kobject('program',env)
 obj.target='rosegarden'
 obj.source=rgSources
-obj.includes='../ ../.. /usr/X11R6/include/X11/Xft
/usr/include/freetype2 ../base ../sound'
+obj.includes='../ ../.. /usr/include/X11/Xft /usr/include/freetype2
../base ../sound'
 obj.libs='kdeui kdecore kdeprint kio Xft RosegardenSequencer
RosegardenSound guitar base'
-obj.libpaths='../base ../sound ../gui/guitar /usr/X11R6/lib'
+obj.libpaths='../base ../sound ../gui/guitar /usr/lib'
 obj.execute()

pat