diff options
| -rw-r--r-- | meta/packages/gnome/metacity-clutter_git.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gnome/metacity/no-csource.patch | 25 | ||||
| -rw-r--r-- | meta/packages/gnome/metacity_2.22.0.bb | 6 |
3 files changed, 3 insertions, 30 deletions
diff --git a/meta/packages/gnome/metacity-clutter_git.bb b/meta/packages/gnome/metacity-clutter_git.bb index 5c9b1dd6d9..d32927147c 100644 --- a/meta/packages/gnome/metacity-clutter_git.bb +++ b/meta/packages/gnome/metacity-clutter_git.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SECTION = "x11/wm" | 1 | SECTION = "x11/wm" |
| 2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." | 2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." |
| 3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
| 4 | DEPENDS = "startup-notification gtk+ gconf clutter" | 4 | DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native" |
| 5 | PR = "r0" | 5 | PR = "r0" |
| 6 | PV = "2.25.1+gitr${SRCREV}" | 6 | PV = "2.25.1+gitr${SRCREV}" |
| 7 | inherit gnome update-alternatives | 7 | inherit gnome update-alternatives |
diff --git a/meta/packages/gnome/metacity/no-csource.patch b/meta/packages/gnome/metacity/no-csource.patch deleted file mode 100644 index 9359ada6dc..0000000000 --- a/meta/packages/gnome/metacity/no-csource.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | --- | ||
| 2 | configure.in | 8 -------- | ||
| 3 | 1 file changed, 8 deletions(-) | ||
| 4 | |||
| 5 | --- metacity-2.22.0.orig/configure.in | ||
| 6 | +++ metacity-2.22.0/configure.in | ||
| 7 | @@ -449,18 +449,10 @@ fi | ||
| 8 | AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") | ||
| 9 | |||
| 10 | HOST_ALIAS=$host_alias | ||
| 11 | AC_SUBST(HOST_ALIAS) | ||
| 12 | |||
| 13 | -AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) | ||
| 14 | - | ||
| 15 | -if test x"$GDK_PIXBUF_CSOURCE" = xno; then | ||
| 16 | - AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK]) | ||
| 17 | -fi | ||
| 18 | - | ||
| 19 | -AC_SUBST(GDK_PIXBUF_CSOURCE) | ||
| 20 | - | ||
| 21 | if test x$enable_gconf = xyes; then | ||
| 22 | AC_PATH_PROG(GCONFTOOL, gconftool-2, no) | ||
| 23 | if test x"$GCONFTOOL" = xno; then | ||
| 24 | AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
| 25 | fi | ||
diff --git a/meta/packages/gnome/metacity_2.22.0.bb b/meta/packages/gnome/metacity_2.22.0.bb index ee95c6245d..43212c523b 100644 --- a/meta/packages/gnome/metacity_2.22.0.bb +++ b/meta/packages/gnome/metacity_2.22.0.bb | |||
| @@ -1,13 +1,11 @@ | |||
| 1 | SECTION = "x11/wm" | 1 | SECTION = "x11/wm" |
| 2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." | 2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." |
| 3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
| 4 | DEPENDS = "startup-notification gtk+ gconf" | 4 | DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-csource-native" |
| 5 | PR = "r2" | 5 | PR = "r3" |
| 6 | 6 | ||
| 7 | inherit gnome update-alternatives | 7 | inherit gnome update-alternatives |
| 8 | 8 | ||
| 9 | SRC_URI += "file://no-csource.patch;patch=1" | ||
| 10 | |||
| 11 | ALTERNATIVE_NAME = "x-window-manager" | 9 | ALTERNATIVE_NAME = "x-window-manager" |
| 12 | ALTERNATIVE_LINK = "${bindir}/x-window-manager" | 10 | ALTERNATIVE_LINK = "${bindir}/x-window-manager" |
| 13 | ALTERNATIVE_PATH = "${bindir}/metacity" | 11 | ALTERNATIVE_PATH = "${bindir}/metacity" |
