diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-21 11:12:51 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-21 12:55:35 +0200 |
commit | d3a738c4375dba1c89c64a88ade5262d38a9cf5e (patch) | |
tree | b5811ee7084c023948a5f345ed49b2419f4bddb6 /meta-gnome/recipes-gnome/gnome-panel | |
parent | ecdd1c6f0ffec1e67b97d05b00bf680a0b3330f1 (diff) | |
download | meta-openembedded-d3a738c4375dba1c89c64a88ade5262d38a9cf5e.tar.gz |
gnome-panel: update to 2.32.x from the git release branch
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-panel')
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 de4cd8486..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel-2.30.0/idl-sysroot.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- /tmp/Makefile.am 2009-10-26 16:53:20.000000000 +0100 | ||
2 | +++ gnome-panel-2.28.0/gnome-panel/Makefile.am 2009-10-26 16:53:51.000000000 +0100 | ||
3 | @@ -43,7 +43,7 @@ | ||
4 | $(NULL) | ||
5 | |||
6 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | ||
7 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
8 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
9 | |||
10 | BUILT_SOURCES = \ | ||
11 | $(CORBA_SRCLIST) \ | ||
12 | --- /tmp/Makefile.am 2009-10-26 16:54:17.000000000 +0100 | ||
13 | +++ gnome-panel-2.28.0/libpanel-applet/Makefile.am 2009-10-26 16:54:34.000000000 +0100 | ||
14 | @@ -45,7 +45,7 @@ | ||
15 | GNOME_Panel.h | ||
16 | |||
17 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | ||
18 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
19 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
20 | |||
21 | noinst_PROGRAMS = test-bonobo-applet | ||
22 | |||
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 07e5ded6e..de4cd8486 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 @@ | |||
1 | Index: gnome-panel-2.26.0/gnome-panel/Makefile.am | 1 | --- /tmp/Makefile.am 2009-10-26 16:53:20.000000000 +0100 |
2 | =================================================================== | 2 | +++ gnome-panel-2.28.0/gnome-panel/Makefile.am 2009-10-26 16:53:51.000000000 +0100 |
3 | --- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am 2009-03-16 22:37:12.000000000 +0000 | ||
4 | +++ gnome-panel-2.26.0/gnome-panel/Makefile.am 2009-04-09 14:39:02.000000000 +0000 | ||
5 | @@ -43,7 +43,7 @@ | 3 | @@ -43,7 +43,7 @@ |
6 | $(NULL) | 4 | $(NULL) |
7 | 5 | ||
8 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | 6 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) |
9 | - $(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | 7 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl |
10 | + $(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | 8 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl |
11 | 9 | ||
12 | BUILT_SOURCES = \ | 10 | BUILT_SOURCES = \ |
13 | $(CORBA_SRCLIST) \ | 11 | $(CORBA_SRCLIST) \ |
14 | Index: gnome-panel-2.26.0/libpanel-applet/Makefile.am | 12 | --- /tmp/Makefile.am 2009-10-26 16:54:17.000000000 +0100 |
15 | =================================================================== | 13 | +++ gnome-panel-2.28.0/libpanel-applet/Makefile.am 2009-10-26 16:54:34.000000000 +0100 |
16 | --- gnome-panel-2.26.0.orig/libpanel-applet/Makefile.am 2009-03-16 22:37:13.000000000 +0000 | ||
17 | +++ gnome-panel-2.26.0/libpanel-applet/Makefile.am 2009-04-09 14:51:18.000000000 +0000 | ||
18 | @@ -45,7 +45,7 @@ | 14 | @@ -45,7 +45,7 @@ |
19 | GNOME_Panel.h | 15 | GNOME_Panel.h |
20 | 16 | ||
21 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | 17 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) |
22 | - $(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | 18 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl |
23 | + $(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | 19 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl |
24 | 20 | ||
25 | noinst_PROGRAMS = test-bonobo-applet | 21 | noinst_PROGRAMS = test-bonobo-applet |
26 | 22 | ||
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 29b870310..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/scrollkeeper.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | diff -u gnome-panel-2.24.0.orig/configure.in gnome-panel-2.24.0/configure.in | ||
2 | --- gnome-panel-2.24.0.orig/configure.in 2008-09-22 17:21:55.000000000 -0400 | ||
3 | +++ gnome-panel-2.24.0/configure.in 2008-11-04 15:32:39.000000000 -0500 | ||
4 | @@ -296,9 +296,9 @@ | ||
5 | dnl scrollkeeper checks | ||
6 | |||
7 | AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) | ||
8 | -if test x$SCROLLKEEPER_CONFIG = xno; then | ||
9 | - AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) | ||
10 | -fi | ||
11 | +dnl if test x$SCROLLKEEPER_CONFIG = xno; then | ||
12 | +dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) | ||
13 | +dnl fi | ||
14 | |||
15 | AM_GCONF_SOURCE_2 | ||
16 | |||
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 a22403213..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.30.0.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | DESCRIPTION = "GNOME panel" | ||
2 | LICENSE = "GPLv2 &7 LGPLv2 && GFDLv1.1" | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
5 | file://COPYING-DOCS;md5=cd8e4dfa2ebcc3fa3ba2f7e531b69e4b \ | ||
6 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" | ||
7 | |||
8 | SECTION = "x11/gnome" | ||
9 | DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" | ||
10 | |||
11 | inherit gnome pkgconfig | ||
12 | |||
13 | SRC_URI += "file://idl-sysroot.patch" | ||
14 | |||
15 | SRC_URI[archive.md5sum] = "e17f25417b2c9011ed1c3ebd75706de6" | ||
16 | SRC_URI[archive.sha256sum] = "7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220" | ||
17 | |||
18 | CPPFLAGS += " -I${STAGING_INCDIR}/gnome-desktop-2.0" | ||
19 | export SYSROOT = "${STAGING_DIR_HOST}" | ||
20 | |||
21 | EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}" | ||
22 | EXTRA_OECONF = "--disable-scrollkeeper --disable-eds" | ||
23 | |||
24 | do_configure_prepend() { | ||
25 | sed -i -e s:help:: ${S}/Makefile.am | ||
26 | } | ||
27 | |||
28 | pkg_postinst_append () { | ||
29 | gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ | ||
30 | --direct --load /etc/gconf/schemas/panel-default-setup.entries | ||
31 | } | ||
32 | |||
33 | PACKAGES =+ "libpanel-applet" | ||
34 | FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" | ||
35 | |||
36 | FILES_${PN} =+ "${datadir}/gnome* \ | ||
37 | ${datadir}/dbus-1 \ | ||
38 | ${datadir}/icons \ | ||
39 | ${datadir}/PolicyKit \ | ||
40 | ${libdir}/bonobo \ | ||
41 | " | ||
42 | |||
43 | |||
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 000000000..738b51a8b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb | |||
@@ -0,0 +1,43 @@ | |||
1 | DESCRIPTION = "GNOME panel" | ||
2 | LICENSE = "GPLv2 && LGPLv2 && GFDLv1.1" | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
5 | file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \ | ||
6 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
7 | |||
8 | SECTION = "x11/gnome" | ||
9 | |||
10 | PR = "r4" | ||
11 | |||
12 | DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ pango libwnck gnome-menus cairo libgweather dbus-glib librsvg libcanberra" | ||
13 | |||
14 | inherit gtk-doc gnome pkgconfig | ||
15 | |||
16 | SRCREV = "6a364b6a4a9beed3da9ca6f5b0dac81eb99dea2a" | ||
17 | SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" | ||
22 | |||
23 | do_configure_prepend() { | ||
24 | gnome-doc-prepare --automake | ||
25 | sed -i -e s:help:: ${S}/Makefile.am | ||
26 | } | ||
27 | |||
28 | pkg_postinst_append () { | ||
29 | gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ | ||
30 | --direct --load /etc/gconf/schemas/panel-default-setup.entries | ||
31 | } | ||
32 | |||
33 | PACKAGES =+ "libpanel-applet" | ||
34 | FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" | ||
35 | |||
36 | FILES_${PN} =+ "${datadir}/gnome* \ | ||
37 | ${datadir}/dbus-1 \ | ||
38 | ${datadir}/icons \ | ||
39 | ${datadir}/PolicyKit \ | ||
40 | ${libdir}/bonobo \ | ||
41 | " | ||
42 | |||
43 | |||