Skip to contentSkip to conversation

gnome-desktop: don't try to copy omf.make

PATCH New Martin Jansa 1 participant 1 message Jan 7, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gnome-desktop: don't try to copy omf.make

* omf.make was removed from gnome-common in:
https://git.gnome.org/browse/gnome-common/commit/?id=a912a74ba7999fe3ed49b07bab86685a5d117f82
which is included in gnome-common-3.18, so this was broken since:
commit f459f890cb7c0e11d92b80f0d5a65117428cc87f
Author: Jussi Kukkonen <[email protected]>
Date: Thu Nov 26 13:46:48 2015 +0200

    gnome-common: Upgrade 3.14.0 -> 3.18.0

but hopefully we don't need omf.make with --disable-desktop-docs in EXTRA_OECONF

---
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 1 -
 1 file changed, 1 deletion(-)
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +0 -1
index 6256396..4fedbe6 100644
@@ -17,7 +17,6 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
 do_configure_prepend () {
-    cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S}
     sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
 }
 
Signature · 1 line
2.7.0