diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2009-01-27 14:15:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-27 14:15:13 +0000 |
| commit | d9c8f31557504b38b0b084791e49539b07334f1e (patch) | |
| tree | c326aca883d1e577d65afe2f1c05dd60292bb835 /meta/packages/gnome | |
| parent | deadb5259f307aaad70c5cb2ed9b60ff13a52bac (diff) | |
| download | openembedded-core-d9c8f31557504b38b0b084791e49539b07334f1e.tar.gz | |
metacity-clutter: Fix after recent updates
Diffstat (limited to 'meta/packages/gnome')
| -rw-r--r-- | meta/packages/gnome/metacity-clutter/nodocs.patch | 29 | ||||
| -rw-r--r-- | meta/packages/gnome/metacity-clutter_git.bb | 7 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/packages/gnome/metacity-clutter/nodocs.patch b/meta/packages/gnome/metacity-clutter/nodocs.patch new file mode 100644 index 0000000000..98f43be5e8 --- /dev/null +++ b/meta/packages/gnome/metacity-clutter/nodocs.patch @@ -0,0 +1,29 @@ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am 2009-01-27 13:26:12.000000000 +0000 ++++ git/Makefile.am 2009-01-27 14:07:13.000000000 +0000 +@@ -1,5 +1,5 @@ + +-SUBDIRS=src po doc ++SUBDIRS=src po + + EXTRA_DIST = HACKING MAINTAINERS rationales.txt \ + intltool-extract.in intltool-merge.in intltool-update.in +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2009-01-27 13:26:12.000000000 +0000 ++++ git/configure.in 2009-01-27 14:11:16.000000000 +0000 +@@ -538,12 +538,9 @@ + + # Warnings are there for a reason + if test "x$GCC" = "xyes"; then +- CFLAGS="$CFLAGS -Wall -Werror -ansi" ++ CFLAGS="$CFLAGS -Wall -ansi" + fi + +-# Use gnome-doc-utils: +-GNOME_DOC_INIT([0.8.0]) +- + AC_CONFIG_FILES([ + Makefile + doc/Makefile diff --git a/meta/packages/gnome/metacity-clutter_git.bb b/meta/packages/gnome/metacity-clutter_git.bb index 2abaef12d9..94e25a8b4a 100644 --- a/meta/packages/gnome/metacity-clutter_git.bb +++ b/meta/packages/gnome/metacity-clutter_git.bb @@ -2,11 +2,12 @@ SECTION = "x11/wm" DESCRIPTION = "Metacity is the boring window manager for the adult in you." LICENSE = "GPL" DEPENDS = "startup-notification gtk+ gconf clutter-0.8 gdk-pixbuf-csource-native intltool" -PR = "r5" +PR = "r7" PV = "2.25.1+git${SRCREV}" inherit gnome update-alternatives SRC_URI = "git://git.o-hand.com/metacity-clutter.git;protocol=git;branch=clutter \ + file://nodocs.patch;patch=1 \ file://fix_pkgconfig.patch;patch=1" S = "${WORKDIR}/git" @@ -22,6 +23,10 @@ EXTRA_OECONF += "--disable-verbose \ FILES_${PN} += "${datadir}/themes ${libdir}/metacity/plugins/clutter/*.so" FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*" +do_configure_prepend () { + echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make +} + do_stage () { autotools_stage_all } |