Merge branch 'erp5'

component/libpng/buildout.cfg

@@ -28,6 +28,6 @@ md5sum = fd85af68f84cbdf549147811006488c1
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.2.tar.xz
-md5sum = 9d838f6fca9948a9f360a0cc1b516d5f
+url = http://download.sourceforge.net/libpng/libpng-1.6.6.tar.xz
+md5sum = 3a41dcd58bcac7cc191c2ec80c7fb2ac
 so_version = 16

component/xorg/buildout.cfg

@@ -28,13 +28,13 @@ ACLOCAL=${xorg-util-macros:location}/share/aclocal
 
 [xorg-util-macros]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/util/util-macros-1.11.0.tar.bz2
-md5sum = 22d5cdff672450cb6902e0d68c200dcb
+url = http://www.x.org/releases/X11R7.7/src/everything/util-macros-1.17.tar.bz2
+md5sum = 4f41667e1bf4938bb2b24fa09d517f77
 
 [xproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/proto/xproto-7.0.20.tar.bz2
-md5sum = 65633168e5315c19defb4652cd3d83c1
+url = http://www.x.org/releases/X11R7.7/src/everything/xproto-7.0.23.tar.bz2
+md5sum = d4d241a4849167e4e694fe73371c328c
 configure-options =
   --disable-specs
   --without-xmlto
@@ -45,8 +45,8 @@ environment =
 
 [xextproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/proto/xextproto-7.1.2.tar.bz2
-md5sum = 263ae968b223c23b2986603d84e5c30e
+url = http://www.x.org/releases/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
+md5sum = eaac343af094e6b608cf15cfba0f77c5
 configure-options =
   --disable-specs
   --without-xmlto
@@ -64,8 +64,8 @@ md5sum = 37d82a3b6009113023599632117a6855
 
 [xtrans]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2
-md5sum = c66f9ffd2da4fb012220c6c40ebc7609
+url = http://www.x.org/releases/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
+md5sum = 84c66908cf003ad8c272b0eecbdbaee3
 patches =
   ${xtrans-tmp-env-patch:location}/${xtrans-tmp-env-patch:filename}
 patches_md5sum = ${xtrans-tmp-env-patch:md5sum}
@@ -80,8 +80,8 @@ environment =
 
 [libXau]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXau-1.0.6.tar.bz2
-md5sum = 4a2cbd83727682f9ee1c1e719bac6adb
+url = http://www.x.org/releases/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
+md5sum = 2d241521df40d27034413436d1a1465c
 configure-options =
   --disable-static
 environment =
@@ -90,15 +90,15 @@ environment =
 
 [xcbproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/xcb/xcb-proto-1.6.tar.bz2
-md5sum = 04313e1d914b44d0e457f6c494fc178b
+url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
+md5sum = a5de3432cc6e43cc6a27f241dbb991b1
 environment =
   PATH=${libxml2:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}
 
 [xorg-libpthread-stubs]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2
+url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee
 
 [libxcb-tmp-env-patch]
@@ -110,8 +110,8 @@ md5sum = 61f39878120ba434a169e24cae2af862
 
 [libxcb]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2
-md5sum = 925699df361b99491165ebc12068056b
+url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
+md5sum = ed632cb0dc31b6fbd7ea5c0f931cf5a4
 patches =
   ${libxcb-tmp-env-patch:location}/${libxcb-tmp-env-patch:filename}
 patches_md5sum = ${libxcb-tmp-env-patch:md5sum}
@@ -130,8 +130,8 @@ environment =
 
 [libXext]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
-md5sum = 9bb236ff0193e9fc1c1fb504dd840331
+url = http://www.x.org/releases/X11R7.7/src/everything/libXext-1.3.1.tar.bz2
+md5sum = 71251a22bc47068d60a95f50ed2ec3cf
 environment =
   PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${libX11:location}/lib
@@ -144,33 +144,21 @@ configure-options =
   --without-xmlto
   --without-fop
   XEXT_LIBS=-lX11
-patches =
-  ${libXext-patch-link-error:location}/${libXext-patch-link-error:filename}
-patch-options = -p1
-
-[libXext-patch-link-error]
-# Fixes libXext.la link error
-# http://cgit.freedesktop.org/xorg/lib/libXext/patch/?id=700c7896b832d6e4fb0185f0d5382b01f94e7141
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
-md5sum = 52635ef694ee6f1acb642a77ee8eb010
 
 [inputproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
-md5sum = da9bf9e5d174163f597d2d72757d9038
+url = http://www.x.org/releases/X11R7.7/src/everything/inputproto-2.2.tar.bz2
+md5sum = 13c8aedaf98a92e282b7e456c0a5bed9
 
 [kbproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
-md5sum = e7edb59a3f54af15f749e8f3e314ee62
+url = http://www.x.org/releases/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
+md5sum = 677ea8523eec6caca86121ad2dca0b71
 
 [libX11]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2
-md5sum = b63d9f7493a61df51d0c0be04ac435e4
+url = http://www.x.org/releases/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
+md5sum = 78b4b3bab4acbdf0abcfca30a8c70cc6
 configure-options =
   --disable-static
   --enable-loadable-i18n
@@ -190,8 +178,8 @@ environment =
 
 [libXdmcp]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
-md5sum = 762b6bbaff7b7d0831ddb4f072f939a5
+url = http://www.x.org/releases/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
+md5sum = b94af6cef211cf3ee256f7e81f70fcd9
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -202,103 +190,92 @@ configure-options =
 
 [fixesproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
-md5sum = bdb58ecc313b509247036d5c11fa99df
+url = http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
+md5sum = e7431ab84d37b2678af71e29355e101d
 
 [bigreqsproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
-md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf
+url = http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
+md5sum = 1a05fb01fa1d5198894c931cf925c025
 
 [xcmiscproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
-md5sum = cd7372cd827bfd7ca7e9238f2ce274b1
+url = http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
+md5sum = 5f4847c78e41b801982c8a5e06365b24
 
 [damageproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
+url = http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 md5sum = 998e5904764b82642cc63d97b4ba9e95
 
 [randrproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
+url = http://www.x.org/releases/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2
 md5sum = 597491c0d8055e2a66f11350c4985775
 
 [renderproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
+url = http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274
 
 [videoproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
+url = http://www.x.org/releases/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2
 md5sum = c3b348c6e2031b72b11ae63fc7f805c2
 
 [fontsproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
-md5sum = 37102ffcaa73f77d700acd6f7a25d8f0
+url = http://www.x.org/releases/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
+md5sum = c5f4f1fb4ba7766eedbc9489e81f3be2
 
 [recordproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
-md5sum = 24541a30b399213def35f48efd926c63
+url = http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
+md5sum = 1b4e5dede5ea51906f1530ca1e21d216
 
 [resourceproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
-md5sum = 8ff0525ae7502b48597b78d00bc22284
+url = http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
+md5sum = cfdb57dae221b71b2703f8e2980eaaf4
 
 [xineramaproto]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
-md5sum = a8aadcb281b9c11a91303e24cdea45f5
+url = http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
+md5sum = 9959fe0bfb22a0e7260433b8d199590a
 
 [pixman]
 recipe = slapos.recipe.cmmi
-url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 
+url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2
 md5sum = 2e2805f5ca02edeb15a7862779670069
 
 [libfontenc]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
-md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
+url = http://www.x.org/releases/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
+md5sum = a2a861f142c3b4367f14fc14239fc1f7
 environment =
   PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${xproto:location}/lib/
-  LD_RUN_PATH=${xproto:location}/lib/
-  CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
-  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib 
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXfont]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
-md5sum = 6fb689cfe13d8d9460f4abb5bd88588d
+url = http://www.x.org/releases/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
+md5sum = 6851da5dae0a6cf5f7c9b9e2b05dd3b4
 environment =
   PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xtrans:location}/include/:${xproto:location}/lib/:${freetype:location}/lib
-  LD_RUN_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xproto:location}/lib/:${xtrans:location}/include/:${freetype:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib 
-  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${libfontenc:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libxkbfile]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
-md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
+url = http://www.x.org/releases/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
+md5sum = 19e6533ae64abba0773816a23f2b9507
 environment =
-  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
-  LD_RUN_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
-  CPPFLAGS=-I${xproto:location}/include/ -I${libX11:location}/include/ -I${kbproto:location}/include
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [xkeyboard-config]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2
-md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b
+url = http://www.x.org/releases/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
+md5sum = e7e31da9adb56ba52b5c18226b8cbef3
 depends =
   ${perl:version}
   ${perl-XML-Parser:location}
@@ -313,17 +290,14 @@ environment =
 
 [xkbcomp]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2
-md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a
+url = http://www.x.org/releases/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
+md5sum = a0fc1ac3fc4fe479ade09674347c5aa0
 # Hardcoded location for xkeyboard-config, needed during compile time
 xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb
 configure-options =
   --with-xkb-config-root=${:xkeyboard-config-location}
 environment =
   PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib
-  LD_RUN_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib
-  CPPFLAGS=-I${libxkbfile:location}/include/ -I${libX11:location}/include -I${xproto:location}/include -I${kbproto:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [render]
@@ -343,8 +317,8 @@ environment =
 
 [libXinerama]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
-md5sum = ecd4839ad01f6f637c6fb5327207f89b
+url = http://www.x.org/releases/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2
+md5sum = cb45d6672c93a608f003b6404f1dd462
 environment =
   PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -353,8 +327,8 @@ configure-options =
 
 [libICE]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
-md5sum = bb72a732b15e9dc25c3036559387eed5
+url = http://www.x.org/releases/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
+md5sum = 471b5ca9f5562ac0d6eac7a0bf650738
 configure-options =
   --disable-static
   --without-xmlto
@@ -365,8 +339,8 @@ environment =
 
 [libSM]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2
-md5sum = e78c447bf1790552b644eca81b542742
+url = http://www.x.org/releases/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
+md5sum = 766de9d1e1ecf8bf74cebe2111d8e2bd
 configure-options =
   --disable-static
   --without-xmlto
@@ -378,18 +352,17 @@ environment =
 
 [libXt]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
-md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
+url = http://www.x.org/releases/X11R7.7/src/everything/libXt-1.1.3.tar.bz2
+md5sum = a6f137ae100e74ebe3b71eb4a38c40b3
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
-  CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include
+  PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 
 [dri2proto]
 recipe = slapos.recipe.cmmi
-url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz
-md5sum = 873142af5db695537cfe05e01d13541f
-configure-options = 
+url = http://www.x.org/releases/X11R7.7/src/everything/dri2proto-2.6.tar.bz2
+md5sum = 2eb74959684f47c862081099059a11ab
+configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -398,9 +371,9 @@ environment =
 
 [pciaccess]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2
-md5sum = 285e07976274572e1f1e68edee09b70a
-configure-options = 
+url = http://www.x.org/releases/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
+md5sum = 399a419ac6a54f0fc07c69c9bdf452dc
+configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -409,7 +382,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
 md5sum = 4e6cb97bbecfbb34f3f644a75e513093
-configure-options = 
+configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -419,7 +392,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
 md5sum = f48257daf0017f7a7667e5bf48ca3578
-configure-options = 
+configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -429,23 +402,21 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
 md5sum = 1b4b8386bd5d1751b2c7177223ad4629
-configure-options = 
+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
+  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:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 
 [xdamage]
 recipe = slapos.recipe.cmmi
-url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
+url = http://www.x.org/releases/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
 md5sum = 44774e1a065158b52f1a0da5100cebec
-configure-options = 
+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 
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 
 [xorg-tmp-env-patch]
 recipe = hexagonit.recipe.download
@@ -456,37 +427,35 @@ md5sum = 8b60ab8121f0564a681fc00d03101696
 
 [libxmu]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz
-md5sum = 15e1cb9aaf97eae169bfe6944e0a541e
+url = http://www.x.org/releases/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
+md5sum = a4efff8de85bd45dd3da124285d10c00
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig
-  CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include
+  PKG_CONFIG_PATH=${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig
 
 [libXcursor]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz
-md5sum = 55558a41d0bcf9210636858844fa4d2f
+url = http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
+md5sum = 52efa81b7f26c8eda13510a2fba98eea
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
-  CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include
+  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
 
 [xwd]
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz
-md5sum = f8da771069756210833524b5afa1832c
+url = http://www.x.org/releases/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
+md5sum = 2113126f9ac9c02bb8547c112c5d037e
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig
-  CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libxkbfile:location}/include# -I${xfixes:location}/include -I${libXrender:location}/include
-  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib -lX11
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
+  CPPFLAGS=-I${libXt:location}/include
+  LDFLAGS=-L${libXt:location}/lib -Wl,-rpath=${libXt:location}/lib
 
 [xserver]
 # Adds Xvfb functionnality
 recipe = slapos.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
-md5sum = 5bef6839a76d029204ab31aa2fcb5201
+url = http://www.x.org/releases/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2
+md5sum = 791f0323b886abb7954de7f042bb7dc6
 patches =
   ${xorg-tmp-env-patch:location}/${xorg-tmp-env-patch:filename}
 patches_md5sum = ${xorg-tmp-env-patch:md5sum}
@@ -506,7 +475,7 @@ configure-options =
   --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
   --with-sha1=libgcrypt
 environment =
-  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${gpg-error:location}/lib/pkgconfig
-  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include -I${bzip2:location}/include -I${gcrypt:location}/include -I${zlib:location}/include -I${libfontenc:location}/include -I${gpg-error:location}/include
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
+  CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS=-L${gcrypt:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${gcrypt:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

stack/erp5/buildout.cfg

@@ -430,7 +430,7 @@ eggs =
   paramiko
   ply
   pyflakes
-  pyPdf # should be replaced by PyPDF2, but it is not installable
+  pypdf2
   python-magic
   python-memcached
   pytz
@@ -448,6 +448,8 @@ eggs =
   huBarcode
   qrcode
   spyne
+  httplib2
+  suds
 # Needed for checking ZODB Components source code
   pylint