[oe-commits] org.oe.dev merge of '8ae04a59083ddef3523a8a711e1226189fac6419'

[rwhitby commit]

merge of '8ae04a59083ddef3523a8a711e1226189fac6419'
     and 'e09a09e07f8744e8484e7b3351be29f7775bb030'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0c9c587dcc0862dfec12fe2f8a20fe0a88de65b1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c9c587dcc0862dfec12fe2f8a20fe0a88de65b1
Files:
1
packages/gnome/gnome-desktop
packages/gnome/gnome-desktop/scrollkeeper.patch
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-doc-utils_0.7.1.bb
Diffs:

#
# mt diff -r8ae04a59083ddef3523a8a711e1226189fac6419 -r0c9c587dcc0862dfec12fe2f8a20fe0a88de65b1
#
# 
# no changes
# 


#
# mt diff -re09a09e07f8744e8484e7b3351be29f7775bb030 -r0c9c587dcc0862dfec12fe2f8a20fe0a88de65b1
#
# 
# 
# add_dir "packages/gnome/gnome-desktop"
# 
# add_file "packages/gnome/gnome-desktop/scrollkeeper.patch"
#  content [0eee093790d7497e225a9667e98afe60d45e3634]
# 
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
#  from [317dfbfabd3493ba680be7680e2de6dd8c759551]
#    to [00c0726a9a2e3855908aa0e3482be7ff06a7a677]
# 
# patch "packages/gnome/gnome-doc-utils_0.7.1.bb"
#  from [2baa3cdd3a21e078c7b8bc3ecc28bb7434ed5a43]
#    to [20041d84ef0cc9aeae12802d43820966a313b667]
# 
============================================================
--- packages/gnome/gnome-desktop/scrollkeeper.patch	0eee093790d7497e225a9667e98afe60d45e3634
+++ packages/gnome/gnome-desktop/scrollkeeper.patch	0eee093790d7497e225a9667e98afe60d45e3634
@@ -0,0 +1,17 @@
+Index: gnome-desktop-2.16.1/configure.in
+===================================================================
+--- gnome-desktop-2.16.1.orig/configure.in	2006-10-02 19:00:52.000000000 +0000
++++ gnome-desktop-2.16.1/configure.in	2007-04-12 21:12:36.000000000 +0000
+@@ -113,9 +113,9 @@
+ dnl scrollkeeper checks
+ 
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
+-fi
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
++dnl fi
+ 
+ dnl Language Support
+ 
============================================================
--- packages/gnome/gnome-desktop_2.16.1.bb	317dfbfabd3493ba680be7680e2de6dd8c759551
+++ packages/gnome/gnome-desktop_2.16.1.bb	00c0726a9a2e3855908aa0e3482be7ff06a7a677
@@ -6,6 +6,9 @@ DEPENDS = "gnome-common gnome-doc-utils 
 
 DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
 
+SRC_URI += "file://scrollkeeper.patch;patch=1"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
 EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
 
 do_configure_prepend () {
============================================================
--- packages/gnome/gnome-doc-utils_0.7.1.bb	2baa3cdd3a21e078c7b8bc3ecc28bb7434ed5a43
+++ packages/gnome/gnome-doc-utils_0.7.1.bb	20041d84ef0cc9aeae12802d43820966a313b667
@@ -5,6 +5,8 @@ inherit gnome
 
 inherit gnome
 
+EXTRA_OECONF = "--disable-scrollkeeper"
+
 FILES_${PN} += "${datadir}/xml*"
 
 do_stage() {