metacity-clutter: Fix after recent updates

This commit is contained in:
Richard Purdie
2009-01-27 14:15:13 +00:00
parent deadb5259f
commit d9c8f31557
2 changed files with 35 additions and 1 deletions

View File

@@ -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

View File

@@ -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
}