intltool: add patch from http://bugzilla.gnome.org/show_bug.cgi?id=462312

          we need this to compile the latest version of packagekit.

diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch
new file mode 100644 (file)
index 0000000..2d89fbe
--- /dev/null
+++ b/packages/intltool/files/intltool-0.35.5-polkit.patch
@@ -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

diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
index fc71317..092689b 100644 (file)
--- a/packages/intltool/intltool_0.35.5.bb
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -3,8 +3,10 @@ require intltool.inc
 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"