Committing ongoing work for firefox

component/chromium/buildout.cfg

@@ -6,7 +6,7 @@ parts =
 [chromium]
 recipe = slapos.recipe.build
 slapos_promise =
-  directory:bin
+  file:chrome
 
 #chromium zip files for linux seem to be corrupted : rights are not correctly
 #set (+x) when unzipping using python, but it works when doing "unzip chromium.zip"
@@ -22,6 +22,15 @@ script =
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
   workdir = guessworkdir(extract_dir)
   self.copyTree(workdir, "%(location)s")
-  import pdb; pdb.set_trace()
+  wrapper = open(os.path.join("%(location)s", "chrome-slapos"), 'w')
+  wrapper.write("""#!/bin/sh
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng:location}/lib:%(location)s
+  %(location)s/chrome""")
+  wrapper.flush()
+  wrapper.close()
+  os.chmod(wrapper, 0766)
+  os.chmod(os.path.join("%(location)s", chrome), 0766)
+  os.chmod(os.path.join("%(location)s", chrome-wrapper), 0766)
+  os.chmod(wrapper, 0766)
 
 # requirements : libXrender1 libxss1 x11-common
\ No newline at end of file

component/firefox/buildout.cfg

 [buildout]
 extends = 
-  ../glib/buildout.cfg
   ../bison/buildout.cfg
+  ../dbus/buildout.cfg
+  ../flex/buildout.cfg
   ../gtk-2/buildout.cfg
+  ../glib/buildout.cfg
+  ../mesa/buildout.cfg
+  ../perl/buildout.cfg
    
 parts =
+  firefox-bin
   firefox
 
-#[firefox]
-#recipe = slapos.recipe.build
-#slapos_promise =
-#  file:firefox
-#  file:firefox-bin
-#
-#x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
-#x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
-#script =
-#  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-#  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-#  workdir = guessworkdir(extract_dir)
-#  self.copyTree(workdir, "%(location)s")
-  
+[firefox-bin]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:firefox
+  file:firefox-bin
+  file:firefox-wrapper
+
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "%(location)s")
+  wrapper = open(os.path.join("%(location)s", "firefox-wrapper"), 'w')
+  wrapper.write("""#!/bin/sh
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:%(location)s
+  %(location)s/firefox""")
+
+[libIDL]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
+#md5sum = 
+environment =
+  PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
+  LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
+  PATH=${pkgconfig:location}/bin:${bison:location}/bin::${flex:location}/bin:%(PATH)s
+
+[firefox-cairo-patch]
+recipe = hexagonit.recipe.download
+url = http://svnweb.mageia.org/packages/cauldron/xulrunner/current/SOURCES/xulrunner-2.0-system-cairo.patch?revision=43415&view=co&pathrev=60536
+download-only = true
+filename = cairo.patch
+
 [firefox]
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/source/firefox-6.0.2.source.tar.bz2
+#patches =
+#  ${firefox-cairo-patch:location}/${firefox-cairo-patch:filename}
 configure-options = 
   --enable-application=browser
   --disable-webm
   --disable-ogg
   --disable-wave
-  --disable-pango
   --disable-gnomevfs
   --disable-gconf
   --disable-libnotify
   --disable-gnomeui
   --disable-dbus
-  --disable-crypto
-  --disable-jsd
-  --disable-dbm
   --disable-accessibility
   --disable-printing
-  --disable-xpcom-fastload
-  --disable-permissions
-  --disable-negotiateauth
-  --disable-xtf
-  --disable-pref-extensions
-  --disable-angle
   --disable-crashreporter
   --disable-libjpeg-turbo
-  --disable-mathml
-  --disable-smil
-  --disable-installer
   --disable-updater
-  --disable-xpconnect-idispatch
-  --disable-activex
-  --disable-tests
-  --disable-parental-controls
-  --disable-feeds
-  --disable-zipwriter
-  --disable-libconic
-  --disable-optimize
-  --disable-logging
-  --disable-elf-hack
-  --disable-xul
-  --disable-profilelocking
-  --disable-rdf
+  --disable-javaxpcom
   --disable-necko-disk-cache
   --disable-necko-wifi
-  --disable-cookies
-  --disable-ctypes
-environment =
-  PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig
-  
-#  --without-libIDL
-#  --with-libIDL-prefix=PFX
-#  --with-libIDL-exec-prefix=PFX
-#  --disable-libIDLtest
-#  --with-glib-prefix=PFX
-#  --with-glib-exec-prefix=PFX
-#  --disable-glibtest
-
-#perl
-#libXt-devel
-#freetype
-#fontconfig
-#pkgconfig
-#yasm
-#autoconf
-
-[dbus-1]
-recipe = hexagonit.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
-
-[dbus-glib]
-recipe = hexagonit.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.90.tar.gz
-
-[libIDL]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.0.tar.bz2
+  --disable-mathml
+  --disable-smil
+  --disable-angle
+  --disable-tests
 environment =
-  PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
-  LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
-  PATH=${pkgconfig:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libIDL:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXt:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${mesa:location}/include -I${libIce:location}/include -I${kbproto:location}/include -I${xtrans:location}/include -I${fontconfig:location}/include/ -I${freetype:location}/include/ -I${freetype:location}/include/freetype2 -I${cairo:location}/include/cairo -I${libSM:location}/include/ -I${xorg-libpthread-stubs:location}/include -I${pango:location}/include/pango-1.0 -I${gdk-pixbuf:location}/include/gdk-pixbuf-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${gtk-2:location}/lib/gtk-2.0/include -I${atk:location}/include/atk-1.0 -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${dbus-glib:location}/include
+  LDFLAGS=-L${gettext:location}/lib
+  LD_LIBRARY_PATH=${libIDL:location}/lib:${glib:location}/lib:${gettext:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${libpng:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${pixman:location}/lib:${libXt:location}/lib:${dbus:location}/lib:${mesa:location}/lib
+  
\ No newline at end of file

component/gtk-2/buildout.cfg

@@ -20,22 +20,24 @@ url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 environment = 
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libx11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
-  CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libx11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib
-  LD_LIBRARY_PATH=${render:location}/lib:${libx11:location}/lib:${libXrender:location}/lib
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [pango]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
 md5sum = be4e3891353fae6b62a6f8d7689c4266
-#XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
+configure-options = 
+  --disable-static
+# XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 environment = 
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
   CPPFLAGS=-I${cairo:location}/include/cairo
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender
-  LD_LIBRARY_PATH=${render:location}/lib:${libx11:location}/lib:${libXrender:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${libXrender:location}/lib -lXrender
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [gdk-pixbuf]
 recipe = hexagonit.recipe.cmmi
@@ -63,12 +65,16 @@ environment =
 
 [gtk-2]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.20/gtk+-2.20.0.tar.bz2
-md5sum = 5517f78b1eb9b1eb60bd48a0152d09e6
+url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
+md5sum = 421100f6597e613234f8dead6091a9fe
+configure-options = 
+  --disable-static
+  --disable-cups
+  --disable-papi
+  --enable-explicit-deps
 environment = 
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libx11:location}/lib/pkgconfig:${libXext:location}/lib
-  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libx11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
-  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libx11:location}/lib
-  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libx11:location}/lib
-  
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo
+  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib
\ No newline at end of file

component/xorg/buildout.cfg

@@ -29,6 +29,8 @@ configure-options =
   --disable-specs
   --without-xmlto
   --without-fop
+environment =
+  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
 
 [xextproto]
 recipe = hexagonit.recipe.cmmi
@@ -47,6 +49,8 @@ configure-options =
   --disable-docs
   --without-xmlto
   --without-fop
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXau]
 recipe = hexagonit.recipe.cmmi
@@ -97,6 +101,7 @@ url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
   PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
+  CPPFLAGS=-I${xcbproto:location}/include -I${libXau:location}/include -I${xproto:location}/include -I${xorg-libpthread-stubs:location}/include -I${xextproto:location}/include -I${libX11:location}/include -I${libxcb:location}/include
   LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
   LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -292,4 +297,98 @@ environment =
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib
   LD_RUN_PATH=${render:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  
+
+
+[libIce]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
+#md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+
+[libSM]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.gz
+#md5sum = 
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libIce:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+
+[libXt]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
+md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+    PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig:${libIce:location}/lib/pkgconfig
+    CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libSM:location}/include -I${libIce:location}/include -I${kbproto:location}/include
+
+
+[dri2proto]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-libpthread-stubs:location}/lib/pkgconfig
+
+
+[pciaccess]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[makedepend]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+
+[glproto]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+
+[xfixes]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include
+
+[xdamage]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
+#md5sum =
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include -I${damageproto:location}/include -I${xfixes:location}/include