[oe-commits] org.oe.dev intltool: add patch from http://bugzilla.gnome.org/show_bug.cgi?id=462312

[john_lee commit]

intltool: add patch from http://bugzilla.gnome.org/show_bug.cgi?id=462312
          we need this to compile the latest version of packagekit.
* also set preferred version for openmoko to use the newer version

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 0d17ad29322334484f8cfa5e6b418887f5d33b2f
ViewMTN: http://monotone.openembedded.org/revision/info/0d17ad29322334484f8cfa5e6b418887f5d33b2f
Files:
1
packages/intltool/files/intltool-0.35.5-polkit.patch
conf/distro/include/preferred-om-2008-versions.inc
packages/intltool/intltool_0.35.5.bb
Diffs:

#
# mt diff -r575c8b2dbeef56a8201aff4e1ccb6054532b152d -r0d17ad29322334484f8cfa5e6b418887f5d33b2f
#
#
#
# add_file "packages/intltool/files/intltool-0.35.5-polkit.patch"
#  content [72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [e76b4f1d90a877c2f946524c27d7e7035df3d66b]
#    to [7f74b3f6c95f6b50d191cec8f892ed782b183e7b]
# 
# patch "packages/intltool/intltool_0.35.5.bb"
#  from [3988342f58d7e4721fe3ce448611d40b792d577c]
#    to [10a0f98d1497cd9141a619a9e75f44c063075ce0]
#
============================================================
--- packages/intltool/files/intltool-0.35.5-polkit.patch	72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d
+++ packages/intltool/files/intltool-0.35.5-polkit.patch	72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d
@@ -0,0 +1,32 @@
+diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
+--- intltool-0.35.5/intltool.m4.polkit	2007-07-31 17:23:52.000000000 -0400
++++ intltool-0.35.5/intltool.m4	2007-07-31 17:24:20.000000000 -0400
+@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ 
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
+ AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+ AC_SUBST(INTLTOOL_THEME_RULE)
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+ 
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
+--- intltool-0.35.5/intltool-update.in.in.polkit	2007-07-31 17:10:52.000000000 -0400
++++ intltool-0.35.5/intltool-update.in.in	2007-07-31 17:21:45.000000000 -0400
+@@ -71,7 +71,8 @@ my $xml_support =
+ "sheet(?:\\.in)+|".	# ?
+ "schemas(?:\\.in)+|".	# GConf specific
+ "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+";	# GOK specific. 
++"kbd(?:\\.in)+|".	# GOK specific. 
++"policy(?:\\.in)+";	# PolicyKit files
+ 
+ my $ini_support =
+ "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	e76b4f1d90a877c2f946524c27d7e7035df3d66b
+++ conf/distro/include/preferred-om-2008-versions.inc	7f74b3f6c95f6b50d191cec8f892ed782b183e7b
@@ -5,8 +5,9 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_gnash = "0.8.1"
 PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
 PREFERRED_VERSION_libtool = "1.5.24"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
-
============================================================
--- packages/intltool/intltool_0.35.5.bb	3988342f58d7e4721fe3ce448611d40b792d577c
+++ packages/intltool/intltool_0.35.5.bb	10a0f98d1497cd9141a619a9e75f44c063075ce0
@@ -3,8 +3,10 @@ RDEPENDS = "perl-module-text-wrap perl-m
 DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
 
-PR = "r1"
+PR = "r2"
 
 RRECOMMENDS = "perl-modules"
 
 DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"