diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
| commit | ae09e2d5082b42d6ea608b07f2e207789a00cd9f (patch) | |
| tree | b31ae7f0f1fb06ce248a29823583408f3ed6b3c4 /packages/gnome | |
| parent | 781a49f886ad413031e273be8458ec4b77ad2322 (diff) | |
| parent | 4b276fbe128b0eeb6e4fb43c5d2896287487265c (diff) | |
merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'
and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/gnome-desktop/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop/scrollkeeper.patch | 17 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop_2.16.1.bb | 3 | ||||
| -rw-r--r-- | packages/gnome/gnome-doc-utils_0.7.1.bb | 2 |
4 files changed, 22 insertions, 0 deletions
diff --git a/packages/gnome/gnome-desktop/.mtn2git_empty b/packages/gnome/gnome-desktop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/gnome-desktop/.mtn2git_empty diff --git a/packages/gnome/gnome-desktop/scrollkeeper.patch b/packages/gnome/gnome-desktop/scrollkeeper.patch new file mode 100644 index 0000000000..c1b7f3b44a --- /dev/null +++ b/packages/gnome/gnome-desktop/scrollkeeper.patch @@ -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 + diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 647e751c57..1e3e814d17 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -6,6 +6,9 @@ inherit gnome pkgconfig 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 () { diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 18d6d3012a..f190a5ae13 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -5,6 +5,8 @@ PR = "r1" inherit gnome +EXTRA_OECONF = "--disable-scrollkeeper" + FILES_${PN} += "${datadir}/xml*" do_stage() { |