[oe-commits] org.oe.dev merge of '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'

[hrw commit]

merge of '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
     and '8d78f48d5027db6d0772303acb59044c4fbcfdbb'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6e404b0729a59d47868eceeec95ed68998b51090
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6e404b0729a59d47868eceeec95ed68998b51090
Files:
1
packages/xorg-app/xrandr_1.2.0.bb
packages/xorg-util/makedepend-native_1.0.1.bb
Diffs:

#
# mt diff -r5825a3b31a4da8bd899bac6fef5c9f16e34dc883 -r6e404b0729a59d47868eceeec95ed68998b51090
#
# 
# 
# patch "packages/xorg-app/xrandr_1.2.0.bb"
#  from [ee85b371d620be9dba06122f7122eb39a90a578d]
#    to [b36e8f4f8737452cdb1d9a618dd6b339c0afd60c]
# 
============================================================
--- packages/xorg-app/xrandr_1.2.0.bb	ee85b371d620be9dba06122f7122eb39a90a578d
+++ packages/xorg-app/xrandr_1.2.0.bb	b36e8f4f8737452cdb1d9a618dd6b339c0afd60c
@@ -5,6 +5,5 @@ PE = "1"
 
 DEPENDS += " libxrandr libxrender virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"


#
# mt diff -r8d78f48d5027db6d0772303acb59044c4fbcfdbb -r6e404b0729a59d47868eceeec95ed68998b51090
#
# 
# 
# patch "packages/xorg-util/makedepend-native_1.0.1.bb"
#  from [78b179556261b85dcff7b1d824cb47fda685c5a8]
#    to [2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7]
# 
============================================================
--- packages/xorg-util/makedepend-native_1.0.1.bb	78b179556261b85dcff7b1d824cb47fda685c5a8
+++ packages/xorg-util/makedepend-native_1.0.1.bb	2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7
@@ -1,7 +1,8 @@ DESCRIPTION = "create dependencies in ma
 require xorg-util-common.inc
 inherit native
 
 DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto-native"
 PR = "r1"
 PE = "1"