On Friday 18 June 2010 08:54:13 pm Khem Raj wrote:
> On Fri, Jun 18, 2010 at 11:37 AM, John Willis
>
> hmmm I think I pushed first version of your patch accidentally. Can
> you rebase the new patch on top of what got pushed.
>
> Thx
> -Khem
My newbe spamming causes confusion - I promise to send better quality & less
retries next time...
Khem:
To check what you have checked in I did:
git-pull
git-checkout -b checkpatch 7565ef3e4a53f715f16bdf6237061bcb9d6da33b
(creating a local branch 'checkpatch' right before my patch and check it out)
git-apply <last-patch-send-and-acked>
git-add .
git-commit -a -m "Foo"
git-diff org.openembedded.dev recipes/xfce-base/ > Diff
I attach 'Diff'. As far as I can see the only lines added are caused by space /
tab replacement.
I think you committed the correct contents.
diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
index 41c2a58..ccc20c4 100644
--- a/recipes/xfce-base/exo_0.3.107.bb
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -8,18 +8,18 @@ inherit xfce46 python-dir
XFCE_VERSION = "4.6.2"
SRC_URI += " \
- file://exo-no-tests.patch \
- file://configure.patch \
+ Â Â file://exo-no-tests.patch \
+ Â Â file://configure.patch \
"
# Note: Python checking is broken
do_configure_prepend() {
- sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+Â Â Â Â Â Â Â sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
}
FILES_${PN} += "${datadir}/xfce4/ \
- ${PYTHON_SITEPACKAGES_DIR}/* \
- ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+ Â Â Â Â Â Â Â Â ${PYTHON_SITEPACKAGES_DIR}/* \
+ Â Â Â Â Â Â Â Â ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
"
FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
index d35c44d..69626da 100644
--- a/recipes/xfce-base/thunar_1.0.2.bb
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -17,11 +17,11 @@ S = "${WORKDIR}/Thunar-${PV}/"
EXTRA_OECONF += "--disable-dependency-tracking --enable-dbus"
FILES_${PN} += "${libdir}/thunarx-1/*.so \
- ${libdir}/thunarx-1/*.la \
- ${datadir}/dbus-1 \
- ${datadir}/thumbnailers \
- ${datadir}/Thunar \
- ${datadir}/xfce4"
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ${libdir}/thunarx-1/*.la \
+ Â Â Â Â Â Â Â Â ${datadir}/dbus-1 \
+ Â Â Â Â Â Â Â Â ${datadir}/thumbnailers \
+ Â Â Â Â Â Â Â Â ${datadir}/Thunar \
+ Â Â Â Â Â Â Â Â ${datadir}/xfce4"
FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
SRC_URI[md5sum] = "c91073202d373a1f9951a1240083c36d"
diff --git a/recipes/xfce-base/xfce-utils_4.6.2.bb b/recipes/xfce-base/xfce-utils_4.6.2.bb
index 08048c4..e0245b7 100644
--- a/recipes/xfce-base/xfce-utils_4.6.2.bb
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -6,25 +6,25 @@ PR = "r0"
inherit xfce46
FILES_${PN} += " \
- ${bindir}/* \
- ${datadir}/dbus-1/* \
- ${datadir}/xfce4/AUTHORS \
- ${datadir}/xfce4/BSD \
- ${datadir}/xfce4/COPYING \
- ${datadir}/xfce4/GPL \
- ${datadir}/xfce4/INFO* \
- ${datadir}/xfce4/LGPL \
- ${datadir}/xfce4/AUTHORS.html \
- ${datadir}/xfce4/BSD.html \
- ${datadir}/xfce4/COPYING.html \
- ${datadir}/xfce4/GPL.html \
- ${datadir}/xfce4/INFO.html \
- ${datadir}/xfce4/LGPL.html \
- ${datadir}/xsessions/xfce.desktop \
+ Â Â Â Â ${bindir}/* \
+ Â Â Â Â ${datadir}/dbus-1/* \
+ Â Â Â Â ${datadir}/xfce4/AUTHORS \
+ Â Â Â Â ${datadir}/xfce4/BSD \
+ Â Â Â Â ${datadir}/xfce4/COPYING \
+ Â Â Â Â ${datadir}/xfce4/GPL \
+Â Â Â Â Â Â Â ${datadir}/xfce4/INFO* \
+ Â Â Â Â ${datadir}/xfce4/LGPL \
+ Â Â Â Â ${datadir}/xfce4/AUTHORS.html \
+ Â Â Â Â ${datadir}/xfce4/BSD.html \
+ Â Â Â Â ${datadir}/xfce4/COPYING.html \
+ Â Â Â Â ${datadir}/xfce4/GPL.html \
+Â Â Â Â Â Â Â ${datadir}/xfce4/INFO.html \
+ Â Â Â Â ${datadir}/xfce4/LGPL.html \
+ Â Â Â Â ${datadir}/xsessions/xfce.desktop \
"
-# NOTE: This package takes a --with-browser for the default browser
-# NOTE: Works with gdm also gtkhtml
+# NOTE: Â This package takes a --with-browser for the default browser
+# NOTE: Â Works with gdm also gtkhtml
SRC_URI[md5sum] = "5d23407700d7e8c9751e17a5bc955109"
SRC_URI[sha256sum] = "54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a"
diff --git a/recipes/xfce-base/xfce4-panel_4.6.4.bb b/recipes/xfce-base/xfce4-panel_4.6.4.bb
index fe402b8..fbbb17d 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.4.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -13,18 +13,18 @@ SRC_URI[sha256sum] = "cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a
EXTRA_OECONF += " --enable-startup-notification"
do_install() {
- oe_runmake DESTDIR=${D} install
+ Â Â oe_runmake DESTDIR=${D} install
}
python populate_packages_prepend() {
- plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d)
- plugin_name = bb.data.expand('${PN}-plugin-%s', d)
- do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
- '${PN} plugin for %s', extra_depends='', prepend=True,
- aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop',
- '${sysconfdir}/xdg/xfce/panel/%s-*',
- '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
- '${bindir}/*%s*'])
+Â Â Â Â Â Â Â plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d)
+Â Â Â Â Â Â Â plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+Â Â Â Â Â Â Â do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '${PN} plugin for %s', extra_depends='', prepend=True,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop',
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '${sysconfdir}/xdg/xfce/panel/%s-*',
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '${bindir}/*%s*'])
}
PACKAGES_DYNAMIC = "${PN}-plugin-*"
diff --git a/recipes/xfce-base/xfdesktop_4.6.2.bb b/recipes/xfce-base/xfdesktop_4.6.2.bb
index c3a3bca..e476956 100644
--- a/recipes/xfce-base/xfdesktop_4.6.2.bb
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -8,13 +8,13 @@ PR = "r0"
inherit xfce46
do_configure() {
- oe_runconf
+ Â oe_runconf
}
FILES_xfdesktop-backdrops = "${datadir}/xfce4/backdrops/*"
FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \
- ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
- ${datadir}/xfce4/panel-plugins/*.desktop"
+ Â Â Â Â Â Â Â Â ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+ Â Â Â Â Â Â Â Â ${datadir}/xfce4/panel-plugins/*.desktop"
FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug"
SRC_URI[md5sum] = "e800ea9fee7a5c5eaf2ae96e23a83e3a"
diff --git a/recipes/xfce-base/xfwm4_4.6.2.bb b/recipes/xfce-base/xfwm4_4.6.2.bb
index 3ea7f52..313097a 100644
--- a/recipes/xfce-base/xfwm4_4.6.2.bb
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -16,8 +16,8 @@ EXTRA_OECONF += " --enable-startup-notification"
PACKAGES_DYNAMIC += "xfwm4-theme-*"
python populate_packages_prepend () {
- themedir = bb.data.expand('${datadir}/themes', d)
- do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+Â Â Â Â Â Â Â themedir = bb.data.expand('${datadir}/themes', d)
+Â Â Â Â Â Â Â do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
}
ALTERNATIVE_NAME = "x-window-manager"
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
