gnome-panel: update to 2.32.x from the git release branch

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

5 files changed, 51 insertions, 93 deletions

diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel-2.30.0/idl-sysroot.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel-2.30.0/idl-sysroot.patch
deleted file mode 100644
index de4cd84..0000000
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel-2.30.0/idl-sysroot.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.am	2009-10-26 16:53:20.000000000 +0100
-+++ gnome-panel-2.28.0/gnome-panel/Makefile.am	2009-10-26 16:53:51.000000000 +0100
-@@ -43,7 +43,7 @@
- 	$(NULL)
- 
- $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
--	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
-+	$(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
- 
- BUILT_SOURCES = \
- 	$(CORBA_SRCLIST)	\
---- /tmp/Makefile.am	2009-10-26 16:54:17.000000000 +0100
-+++ gnome-panel-2.28.0/libpanel-applet/Makefile.am	2009-10-26 16:54:34.000000000 +0100
-@@ -45,7 +45,7 @@
- 	GNOME_Panel.h
- 
- $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
--	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
-+	$(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
- 
- noinst_PROGRAMS = test-bonobo-applet
- 
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch
index 07e5ded..de4cd84 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch
@@ -1,26 +1,22 @@
-Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
-===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-03-16 22:37:12.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-09 14:39:02.000000000 +0000
+--- /tmp/Makefile.am	2009-10-26 16:53:20.000000000 +0100
++++ gnome-panel-2.28.0/gnome-panel/Makefile.am	2009-10-26 16:53:51.000000000 +0100
 @@ -43,7 +43,7 @@
  	$(NULL)
  
  $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
--	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
-+	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+-	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++	$(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
  
  BUILT_SOURCES = \
  	$(CORBA_SRCLIST)	\
-Index: gnome-panel-2.26.0/libpanel-applet/Makefile.am
-===================================================================
---- gnome-panel-2.26.0.orig/libpanel-applet/Makefile.am	2009-03-16 22:37:13.000000000 +0000
-+++ gnome-panel-2.26.0/libpanel-applet/Makefile.am	2009-04-09 14:51:18.000000000 +0000
+--- /tmp/Makefile.am	2009-10-26 16:54:17.000000000 +0100
++++ gnome-panel-2.28.0/libpanel-applet/Makefile.am	2009-10-26 16:54:34.000000000 +0100
 @@ -45,7 +45,7 @@
  	GNOME_Panel.h
  
  $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
--	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
-+	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+-	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++	$(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
  
  noinst_PROGRAMS = test-bonobo-applet
  
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/scrollkeeper.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/scrollkeeper.patch
deleted file mode 100644
index 29b8703..0000000
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/scrollkeeper.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u gnome-panel-2.24.0.orig/configure.in gnome-panel-2.24.0/configure.in
---- gnome-panel-2.24.0.orig/configure.in	2008-09-22 17:21:55.000000000 -0400
-+++ gnome-panel-2.24.0/configure.in	2008-11-04 15:32:39.000000000 -0500
-@@ -296,9 +296,9 @@
- dnl scrollkeeper checks
- 
- AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
--if test x$SCROLLKEEPER_CONFIG = xno; then
--  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
--fi
-+dnl if test x$SCROLLKEEPER_CONFIG = xno; then
-+dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
-+dnl fi
- 
- AM_GCONF_SOURCE_2
- 
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.30.0.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.30.0.bb
deleted file mode 100644
index a224032..0000000
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.30.0.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "GNOME panel"
-LICENSE = "GPLv2 &7 LGPLv2 && GFDLv1.1"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING-DOCS;md5=cd8e4dfa2ebcc3fa3ba2f7e531b69e4b \
-                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-SECTION = "x11/gnome"
-DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
-
-inherit gnome pkgconfig
-
-SRC_URI += "file://idl-sysroot.patch"
-
-SRC_URI[archive.md5sum] = "e17f25417b2c9011ed1c3ebd75706de6"
-SRC_URI[archive.sha256sum] = "7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220"
-
-CPPFLAGS += " -I${STAGING_INCDIR}/gnome-desktop-2.0" 
-export SYSROOT = "${STAGING_DIR_HOST}"
-
-EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
-EXTRA_OECONF = "--disable-scrollkeeper --disable-eds"
-
-do_configure_prepend() {
-        sed -i -e s:help:: ${S}/Makefile.am
-}
-
-pkg_postinst_append () {
-	gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
-		--direct --load /etc/gconf/schemas/panel-default-setup.entries
-}
-
-PACKAGES =+ "libpanel-applet"
-FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
-
-FILES_${PN} =+ "${datadir}/gnome* \
-                ${datadir}/dbus-1 \
-                ${datadir}/icons \
-                ${datadir}/PolicyKit \
-                ${libdir}/bonobo \
-               "
-
-
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
new file mode 100644
index 0000000..738b51a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "GNOME panel"
+LICENSE = "GPLv2 && LGPLv2 && GFDLv1.1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+SECTION = "x11/gnome"
+
+PR = "r4"
+
+DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ pango libwnck gnome-menus cairo libgweather dbus-glib librsvg libcanberra" 
+
+inherit gtk-doc gnome pkgconfig
+
+SRCREV = "6a364b6a4a9beed3da9ca6f5b0dac81eb99dea2a"
+SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none"
+
+do_configure_prepend() {
+	gnome-doc-prepare --automake
+	sed -i -e s:help:: ${S}/Makefile.am
+}
+
+pkg_postinst_append () {
+	gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
+		--direct --load /etc/gconf/schemas/panel-default-setup.entries
+}
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/dbus-1 \
+                ${datadir}/icons \
+                ${datadir}/PolicyKit \
+                ${libdir}/bonobo \
+               "
+
+