component/gtk: merge gtk-2/buildout.cfg and gtk-3/buildout.cfg. remove obsolete [gtk-2].

component/chromium/buildout.cfg

@@ -17,8 +17,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
-  ../gtk-2/buildout.cfg
-  ../gtk-3/buildout.cfg
+  ../gtk/buildout.cfg
   ../libexpat/buildout.cfg
   ../libffi/buildout.cfg
   ../libpng/buildout.cfg

component/firefox/buildout.cfg

@@ -4,8 +4,7 @@ extends =
   ../dbus/buildout.cfg
   ../fontconfig/buildout.cfg
   ../fonts/buildout.cfg
-  ../gtk-2/buildout.cfg
-  ../gtk-3/buildout.cfg
+  ../gtk/buildout.cfg
   ../libffi/buildout.cfg
   ../libpng/buildout.cfg
   ../mesa/buildout.cfg
@@ -123,7 +122,6 @@ library =
   ${gdk-pixbuf:location}/lib
   ${gettext:location}/lib
   ${glib:location}/lib
-  ${gtk-2:location}/lib
   ${gtk-3:location}/lib
   ${harfbuzz:location}/lib
   ${libepoxy:location}/lib

component/fluxbox/buildout.cfg

@@ -4,7 +4,7 @@ extends =
   ../glib/buildout.cfg
   ../libpng/buildout.cfg
   ../xorg/buildout.cfg
-  ../gtk-2/buildout.cfg
+  ../gtk/buildout.cfg
 parts =
     fluxbox
 

component/graphviz/buildout.cfg

@@ -6,7 +6,7 @@ parts =
   graphviz
 extends =
   ../bzip2/buildout.cfg
-  ../gtk-2/buildout.cfg
+  ../gtk/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
   ../libexpat/buildout.cfg

component/gtk-2/buildout.cfg

-[buildout]
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../bzip2/buildout.cfg
-  ../fontconfig/buildout.cfg
-  ../freetype/buildout.cfg
-  ../gettext/buildout.cfg
-  ../glib/buildout.cfg
-  ../jbigkit/buildout.cfg
-  ../libjpeg/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../libtool/buildout.cfg
-  ../m4/buildout.cfg
-  ../perl/buildout.cfg
-  ../python3/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../xorg/buildout.cfg
-  ../icu/buildout.cfg
-  ../xz-utils/buildout.cfg
-  ../zlib/buildout.cfg
-
-parts =
-  gtk-2
-
-[cairo]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://cairographics.org/releases/cairo-1.16.0.tar.xz
-md5sum = f19e0353828269c22bd72e271243a552
-pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
-configure-options =
-  --disable-static
-  --disable-gtk-doc-html
-  --enable-tee=yes
-  --enable-xlib=yes
-  --disable-xlib-xrender
-  --disable-xcb
-  --enable-ft
-  --enable-fc
-environment =
-  M4=${m4:location}/bin/m4
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${:pkg_config_depends}
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${glib:location}/lib
-
-[harfbuzz]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
-md5sum = 2b3a4dfdb3e5e50055f941978944da9f
-pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${icu4c:location}/lib/pkgconfig
-configure-options =
-  --disable-static
-  --disable-gtk-doc-html
-  --with-cairo
-  --with-freetype
-  --with-icu
-environment =
-  PATH=${xz-utils:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=${glib:location}/lib
-
-[fribidi]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://github.com/fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz
-md5sum = 1b767c259c3cd8e0c8496970f63c22dc
-configure-options =
-  --enable-shared
-  --disable-static
-environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
-
-[pango]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://download.gnome.org/core/44/44.10/sources/pango-1.50.14.tar.xz
-md5sum = baa2a0a67c71935165a205a76da25954
-pkg_config_depends = ${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
-configure-command =
-  meson builddir --libdir=lib -Dprefix="@@LOCATION@@" -Dgtk_doc=false -Dintrospection=disabled
-make-binary = ninja -C builddir
-environment =
-  PATH=${glib:location}/bin:${python3:location}/bin:${freetype:location}/bin:${meson:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fribidi:location}/lib
-
-[gdk-pixbuf]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz
-md5sum = 4a62f339cb1424693fba9bb7ffef8150
-configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload --libdir=lib -Dprefix=@@LOCATION@@ -Dgtk_doc=false -Dman=false -Dgio_sniffing=false
-make-binary = ninja -C builddir
-pkg_config_depends = ${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
-environment =
-  PATH=${glib:location}/bin:${perl:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${libpng:location}/bin%(PATH)s
-  PKG_CONFIG_PATH=${:pkg_config_depends}
-  CFLAGS=-I${gettext:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib
-
-[atk]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz
-md5sum = 4dcea15cbf166706c166fc4fee05e3f8
-configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload --libdir=lib -Dprefix=@@LOCATION@@ -Ddocs=false -Dintrospection=false
-make-binary = ninja -C builddir
-environment =
-  PATH=${glib:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}
-  CFLAGS=-I${gettext:location}/include
-  LDFLAGS=-L${gettext:location}/lib -lintl -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib
-
-[gtk-2]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz
-md5sum = 0118e98dbe0e4dab90ce475f9f0e6c0c
-pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${gdk-pixbuf:pkg_config_depends}
-configure-options =
-  --disable-static
-  --disable-glibtest
-  --disable-cups
-  --disable-papi
-  --enable-explicit-deps
-  --disable-xinerama
-  --disable-gtk-doc-html
-environment =
-  PATH=${python3:location}/bin:${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${:pkg_config_depends}
-# not taken from pkg-config result...
-  CPPFLAGS=-I${gettext:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${xorgproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include
-  LDFLAGS=-L${gettext:location}/lib -lintl -Wl,-rpath=${gettext:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${harfbuzz:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -Wl,-rpath=${atk:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${pango:location}/lib

component/gtk-3/buildout.cfg → component/gtk/buildout.cfg

 [buildout]
 extends =
+  ../bzip2/buildout.cfg
   ../dbus/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
-  ../gtk-2/buildout.cfg
   ../intltool/buildout.cfg
+  ../jbigkit/buildout.cfg
   ../libepoxy/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
   ../libpsl/buildout.cfg
-  ../perl/buildout.cfg
-  ../perl-XML-Parser/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../m4/buildout.cfg
   ../meson/buildout.cfg
   ../nodejs/buildout.cfg
   ../ninja/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-XML-Parser/buildout.cfg
   ../python3/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../xorg/buildout.cfg
+  ../icu/buildout.cfg
   ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
+
+[cairo]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://cairographics.org/releases/cairo-1.16.0.tar.xz
+md5sum = f19e0353828269c22bd72e271243a552
+pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html
+  --enable-tee=yes
+  --enable-xlib=yes
+  --disable-xlib-xrender
+  --disable-xcb
+  --enable-ft
+  --enable-fc
+environment =
+  M4=${m4:location}/bin/m4
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${glib:location}/lib
+
+[harfbuzz]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
+md5sum = 2b3a4dfdb3e5e50055f941978944da9f
+pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${icu4c:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html
+  --with-cairo
+  --with-freetype
+  --with-icu
+environment =
+  PATH=${xz-utils:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=${glib:location}/lib
+
+[fribidi]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz
+md5sum = 1b767c259c3cd8e0c8496970f63c22dc
+configure-options =
+  --enable-shared
+  --disable-static
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
+
+[pango]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.gnome.org/core/44/44.10/sources/pango-1.50.14.tar.xz
+md5sum = baa2a0a67c71935165a205a76da25954
+pkg_config_depends = ${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
+configure-command =
+  meson builddir --libdir=lib -Dprefix="@@LOCATION@@" -Dgtk_doc=false -Dintrospection=disabled
+make-binary = ninja -C builddir
+environment =
+  PATH=${glib:location}/bin:${python3:location}/bin:${freetype:location}/bin:${meson:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fribidi:location}/lib
+
+[gdk-pixbuf]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz
+md5sum = 4a62f339cb1424693fba9bb7ffef8150
+configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload --libdir=lib -Dprefix=@@LOCATION@@ -Dgtk_doc=false -Dman=false -Dgio_sniffing=false
+make-binary = ninja -C builddir
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
+environment =
+  PATH=${glib:location}/bin:${perl:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${libpng:location}/bin%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+
+[atk]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz
+md5sum = 4dcea15cbf166706c166fc4fee05e3f8
+configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload --libdir=lib -Dprefix=@@LOCATION@@ -Ddocs=false -Dintrospection=false
+make-binary = ninja -C builddir
+environment =
+  PATH=${glib:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}
+  CFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -lintl -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib
 
 [at-spi2-core]
 recipe = slapos.recipe.cmmi

component/gtkmm/buildout.cfg

@@ -4,7 +4,7 @@ extends =
   ../freetype/buildout.cfg
   ../gettext/buildout.cfg
   ../glibmm/buildout.cfg
-  ../gtk-2/buildout.cfg
+  ../gtk/buildout.cfg
   ../perl/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg

component/inkscape/buildout.cfg

@@ -9,7 +9,7 @@ extends =
   ../garbage-collector/buildout.cfg
   ../gettext/buildout.cfg
   ../glibmm/buildout.cfg
-  ../gtk-3/buildout.cfg
+  ../gtk/buildout.cfg
   ../gtkmm/buildout.cfg
   ../intltool/buildout.cfg
   ../lcms/buildout.cfg

component/librsvg/buildout.cfg

@@ -2,7 +2,7 @@
 parts = librsvg
 extends =
   ../bzip2/buildout.cfg
-  ../gtk-2/buildout.cfg
+  ../gtk/buildout.cfg
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg

component/wxpython/buildout.cfg

@@ -2,7 +2,7 @@
 
 extends =
   ../pkgconfig/buildout.cfg
-  ../gtk-3/buildout.cfg
+  ../gtk/buildout.cfg
   ../pillow/buildout.cfg
   ../numpy/buildout.cfg
   ../wxwidgets/buildout.cfg

component/wxwidgets/buildout.cfg

@@ -5,7 +5,7 @@ extends =
   ../zlib/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
-  ../gtk-3/buildout.cfg
+  ../gtk/buildout.cfg
   ../glib/buildout.cfg
   ../libexpat/buildout.cfg
   ../libepoxy/buildout.cfg