diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-05-03 22:44:02 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-05-03 22:44:02 +0000 |
| commit | 6a9276de8f5d2f6f1f4826659b4fbb00cd4b694f (patch) | |
| tree | 0439e152089ee7167a75f1038a18bdb7b6fe3359 /packages | |
| parent | 02c3dce797180ae9392503ff75f984f9d5599016 (diff) | |
| parent | 873d048d895290f6784e2d6a42721361834f6ad8 (diff) | |
merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libxsettings-client/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libxsettings-client/files/make_pkgconfig_x11.patch (renamed from packages/libxsettings-client/make_pkgconfig_x11.patch) | 0 | ||||
| -rw-r--r-- | packages/libxsettings-client/files/no-host-includes.patch (renamed from packages/libxsettings-client/no-host-includes.patch) | 0 | ||||
| -rw-r--r-- | packages/libxsettings-client/libxsettings-client.inc | 2 | ||||
| -rw-r--r-- | packages/libxsettings-client/libxsettings-client_0.16.bb | 3 | ||||
| -rw-r--r-- | packages/xserver-common/files/kdrive-1.4-fixes.patch | 2 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.22.bb | 2 |
7 files changed, 6 insertions, 3 deletions
diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxsettings-client/files/.mtn2git_empty diff --git a/packages/libxsettings-client/make_pkgconfig_x11.patch b/packages/libxsettings-client/files/make_pkgconfig_x11.patch index 3a386672d2..3a386672d2 100644 --- a/packages/libxsettings-client/make_pkgconfig_x11.patch +++ b/packages/libxsettings-client/files/make_pkgconfig_x11.patch diff --git a/packages/libxsettings-client/no-host-includes.patch b/packages/libxsettings-client/files/no-host-includes.patch index 137c5269f1..137c5269f1 100644 --- a/packages/libxsettings-client/no-host-includes.patch +++ b/packages/libxsettings-client/files/no-host-includes.patch diff --git a/packages/libxsettings-client/libxsettings-client.inc b/packages/libxsettings-client/libxsettings-client.inc index 319a4f192d..bfcf1245f6 100644 --- a/packages/libxsettings-client/libxsettings-client.inc +++ b/packages/libxsettings-client/libxsettings-client.inc @@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "bz2" inherit autotools pkgconfig gpe SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ - file://Makefile-am.patch;patch=1" +" headers = "xsettings-client.h xsettings-common.h" do_stage () { diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 725172b944..dff73c3422 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,3 +1,6 @@ require libxsettings-client.inc +SRC_URI += " file://Makefile-am.patch;patch=1" + + PR="r2" diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch index 07b82c3a98..dea824e19f 100644 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch @@ -13,7 +13,7 @@ + ARGS="$ARGS -mouse tslib" +else + if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then -+ ARGS="$ARGS -mouse /dev/input/mice" ++ ARGS="$ARGS -mouse mouse" + fi fi diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index cbc199b81c..018ca71adb 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "all" |