merge of '78e920edfcc452a246ac6107c6733947f37cf081'

     and '7f3c3e5a83f5d237147a155da9148a52402e6937'

6 files changed, 106 insertions, 0 deletions

diff --git a/packages/eel/eel/eel-no-strftime.patch b/packages/eel/eel/eel-no-strftime.patch
new file mode 100644
index 0000000000..a5795e573e
--- /dev/null
+++ b/packages/eel/eel/eel-no-strftime.patch
@@ -0,0 +1,29 @@
+--- /tmp/configure.in	2008-09-05 14:01:25.000000000 +0200
++++ eel-2.22.2/configure.in	2008-09-05 14:01:58.693198000 +0200
+@@ -98,26 +98,6 @@
+ 
+ 
+ 
+-dnl ===========================================================================
+-
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+-                int main ()
+-                {
+-                  char buf[100];
+-                  struct tm tm = {0};
+-                  tm.tm_year = 99;
+-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+-		      strcmp (buf, "1999")==0)
+-                    return 0;
+-                  return 1;
+-                }
+-            ],
+-	    AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+-            )
+-
+-dnl ===========================================================================
+ 
+ dnl X development libraries check
+ 
diff --git a/packages/eel/eel_2.22.2.bb b/packages/eel/eel_2.22.2.bb
new file mode 100644
index 0000000000..04353795c3
--- /dev/null
+++ b/packages/eel/eel_2.22.2.bb
@@ -0,0 +1,16 @@
+# eel OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+inherit gnome
+
+LICENSE="GPL"
+
+SRC_URI += "file://eel-no-strftime.patch;patch=1"
+
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome-themes/.mtn2git_empty b/packages/gnome-themes/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnome-themes/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnome/gnome-themes_2.22.2.bb b/packages/gnome/gnome-themes_2.22.2.bb
new file mode 100644
index 0000000000..1b45ab4d05
--- /dev/null
+++ b/packages/gnome/gnome-themes_2.22.2.bb
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native"
+RDEPENDS = "gnome-icon-theme"
+
+EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check"
+
+inherit gnome
+
+PACKAGE_ARCH = "all"
+
+PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice"
+FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so"
+FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so"
+FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so"
+FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so"
+FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so"
+
+PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional"
+FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
+FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon"
+FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
+FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse"
+FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint"
+FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse"
+FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint"
+FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue"
+FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist"
+FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional"
+
+FILES_${PN} += "${datadir}/themes ${datadir}/icons"
diff --git a/packages/gnome-themes/gnome-themes_2.6.2.bb b/packages/gnome/gnome-themes_2.6.2.bb
index 2c18b59654..2c18b59654 100644
--- a/packages/gnome-themes/gnome-themes_2.6.2.bb
+++ b/packages/gnome/gnome-themes_2.6.2.bb
diff --git a/packages/gtk-engines/gtk-engines_2.15.4.bb b/packages/gtk-engines/gtk-engines_2.15.4.bb
new file mode 100644
index 0000000000..177c5b8baf
--- /dev/null
+++ b/packages/gtk-engines/gtk-engines_2.15.4.bb
@@ -0,0 +1,30 @@
+LICENSE = "GPL"
+SECTION = "x11/base"
+DESCRIPTION = "GTK theme engines"
+DEPENDS = "gtk+ cairo"
+
+RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
+RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
+RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
+RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
+RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
+RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
+RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
+RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+
+inherit gnome  gtk-binver
+
+PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}
+