maj de chromium-6#6.0.472.63-1

6 files changed, 113 insertions, 107 deletions

diff --git a/extra/chromium/.footprint b/extra/chromium/.footprint
index b7ecce4eb..e24f6f16d 100644
--- a/extra/chromium/.footprint
+++ b/extra/chromium/.footprint
@@ -9,6 +9,7 @@ drwxr-xr-x	root/root	usr/lib/chromium/
 lrwxrwxrwx	root/root	usr/lib/chromium/libavcodec.so.52 -> /usr/lib/libavcodec.so.52
 lrwxrwxrwx	root/root	usr/lib/chromium/libavformat.so.52 -> /usr/lib/libavformat.so.52
 lrwxrwxrwx	root/root	usr/lib/chromium/libavutil.so.50 -> /usr/lib/libavutil.so.50
+-rwxr-xr-x	root/root	usr/lib/chromium/libffmpegsumo.so
 drwxr-xr-x	root/root	usr/lib/chromium/locales/
 -rw-r--r--	root/root	usr/lib/chromium/locales/am.pak
 -rw-r--r--	root/root	usr/lib/chromium/locales/ar.pak
@@ -61,56 +62,30 @@ drwxr-xr-x	root/root	usr/lib/chromium/locales/
 -rw-r--r--	root/root	usr/lib/chromium/locales/vi.pak
 -rw-r--r--	root/root	usr/lib/chromium/locales/zh-CN.pak
 -rw-r--r--	root/root	usr/lib/chromium/locales/zh-TW.pak
+-rw-r--r--	root/root	usr/lib/chromium/resources.pak
 drwxr-xr-x	root/root	usr/lib/chromium/resources/
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/css/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/bmm.css
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/bmm.css.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/list.css
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/menu.css
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/tree.css
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/css/tree.css.js
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/images/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/bookmark_bar_folder_mac.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/bookmark_manager_recent.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/bookmark_manager_search.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/bookmarks_favicon.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/bookmarks_section.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/folder_closed.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/folder_closed_rtl.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/folder_open.png
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/images/folder_open_rtl.png
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/js/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/bmm.js
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/js/bmm/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmarklist.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmarktree.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/bmm/treeiterator.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr.js
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/event.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/eventtarget.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/promise.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui.js
-drwxr-xr-x	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/command.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/contextmenuhandler.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/list.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/listitem.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/listselectionmodel.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menu.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menubutton.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menuitem.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/splitpane.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/cr/ui/tree.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/i18ntemplate.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/localstrings.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/js/util.js
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/main.html
--rw-r--r--	root/root	usr/lib/chromium/resources/bookmark_manager/manifest.json
+drwxr-xr-x	root/root	usr/lib/chromium/resources/calendar_app/
+-rw-r--r--	root/root	usr/lib/chromium/resources/calendar_app/128.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/calendar_app/24.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/calendar_app/32.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/calendar_app/48.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/calendar_app/manifest.json
+drwxr-xr-x	root/root	usr/lib/chromium/resources/docs_app/
+-rw-r--r--	root/root	usr/lib/chromium/resources/docs_app/128.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/docs_app/24.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/docs_app/32.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/docs_app/48.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/docs_app/manifest.json
+drwxr-xr-x	root/root	usr/lib/chromium/resources/gmail_app/
+-rw-r--r--	root/root	usr/lib/chromium/resources/gmail_app/128.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/gmail_app/24.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/gmail_app/32.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/gmail_app/48.png
+-rw-r--r--	root/root	usr/lib/chromium/resources/gmail_app/manifest.json
 drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/DevTools.js
 drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/applicationCache.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/auditsIcon.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/back.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/breakpointBorder.png
@@ -199,16 +174,13 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/searchSmallWhite.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segment.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentChromium.png
--rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentChromium2.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segmentEnd.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segmentHover.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentHoverChromium.png
--rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentHoverChromium2.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segmentHoverEnd.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentHoverEndChromium.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segmentSelected.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentSelectedChromium.png
--rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentSelectedChromium2.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/segmentSelectedEndChromium.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/sessionStorage.png
@@ -217,14 +189,12 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/splitviewDividerBackground.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarBackground.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium.png
--rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium2.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarBottomBackground.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarButtons.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarButtonsChromium.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarMenuButton.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonChromium.png
--rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonChromium2.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelected.png
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
@@ -282,28 +252,12 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/audits.css
 -rwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/helpScreen.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspector.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspector.html
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorSyntaxHighlight.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/popover.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/textViewer.css
-drwxr-xr-x	root/root	usr/lib/chromium/resources/net_internals/
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/detailsview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/dnsview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/index.html
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/loggrouper.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/logviewpainter.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/main.css
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/main.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/proxyview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/requestsview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/resizableverticalsplitview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/sourceentry.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/tabswitcherview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/timelineviewpainter.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/topmidbottomview.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/util.js
--rw-r--r--	root/root	usr/lib/chromium/resources/net_internals/view.js
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.md5sum b/extra/chromium/.md5sum
index 4de986be2..1e32309af 100644
--- a/extra/chromium/.md5sum
+++ b/extra/chromium/.md5sum
@@ -1,6 +1,4 @@
-8e10809ea7f592290b033a8539babd10  chromium-5.0.375.127.tar.bz2
-897de25e9c25a01f8b1b67abe554a6b7  chromium.desktop
-93cd6f5f53b15546dc9d3de49118534c  chromium.sh
-dfbc18bb26dffa2dc6d4d3a857730902  drop_sse2.patch
-ae9e26e6c2d164e6af0e513dae2273a3  ffmpeg_branding_mime.patch
-bb75bfdfe85db26639abbea9054b85f9  libpng-1.4.patch
+f13b45635ed3f1938602e7ca99212543  chromium-6.0.472.63.tar.bz2
+c5e849fcb1101149977355c99d8ff78f  chromium.desktop
+096a46ef386817988250d2d7bddd1b34  chromium.sh
+6ac578c512c6a75357d7532211213a92  gyp-make.patch
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index b33376683..0ba91f152 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -2,15 +2,15 @@
 # URL: http://www.google.com
 # Maintainer: NuTyX core team
 # Packager: sibelle at free dot fr
-# Depends on: python, perl, gperf, mesa, yasm, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libevent
+# Depends on: pythion, perl, gperf, yasm, mesa3d, libgnome-keyring, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libevent, xorg-libxscrnsaver, libjpeg, libpng, cups, zlib
 
 name=chromium
-version=5.0.375.127
+version=6.0.472.63
 release=1
 
 source=(http://build.chromium.org/buildbot/official/$name-$version.tar.bz2 \
 	chromium.desktop chromium.sh \
-	ffmpeg_branding_mime.patch drop_sse2.patch libpng-1.4.patch)
+	gyp-make.patch)
 
 build() {
 
@@ -22,53 +22,75 @@ build() {
 	# workaround for gcc 4.5
   	# see http://code.google.com/p/chromium/issues/detail?id=41887
 	export CFLAGS="${CFLAGS} -fno-ipa-cp"
-	patch -p1 -i $SRC/ffmpeg_branding_mime.patch
-	[ "${CARCH}" == 'i686' ] && (patch -p1 -i $SRC/drop_sse2.patch)
-	patch -p1 -i $SRC/libpng-1.4.patch
+
+	patch -p0 -i $SRC/gyp-make.patch
 
 ### Configure
 	build/gyp_chromium -f make build/all.gyp --depth=. \
-	    -Dgcc_version=45 \
-	    -Dno_strict_aliasing=1 \
-	    -Dwerror= \
-	    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-	    -Dlinux_strip_binary=1 \
-	    -Drelease_extra_cflags="${CFLAGS}" \
-	    -Dffmpeg_branding=Chrome \
-	    -Duse_system_libjpeg=1 \
-	    -Duse_system_libxslt=0 \
-	    -Duse_system_libxml=0 \
-	    -Duse_system_bzip2=1 \
-	    -Duse_system_zlib=1 \
-	    -Duse_system_libpng=1 \
-	    -Duse_system_ffmpeg=0 \
-	    -Duse_system_yasm=1 \
-	    -Duse_system_libevent=1 \
-	    -Duse_system_ssl=0
+		-Dgcc_version=45 \
+    		-Dno_strict_aliasing=1 \
+    		-Dwerror= \
+    		-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+    		-Dlinux_strip_binary=1 \
+    		-Drelease_extra_cflags="${CFLAGS}" \
+    		-Dffmpeg_branding=Chrome \
+    		-Dproprietary_codecs=1 \
+		-Duse_cups=1 \
+		-Dlinux_link_gnome_keyring=1 \
+    		-Duse_system_libjpeg=1 \
+    		-Duse_system_libxslt=0 \
+    		-Duse_system_libxml=0 \
+    		-Duse_system_bzip2=1 \
+    		-Duse_system_zlib=1 \
+    		-Duse_system_libpng=1 \
+    		-Duse_system_ffmpeg=0 \
+    		-Duse_system_yasm=1 \
+    		-Duse_system_libevent=1 \
+    		-Duse_system_ssl=0 \
+		-Dtarget_arch=ia32 \
+		-Denable_gpu=0 \
+		-Dlinux_use_tcmalloc=0 \
+		-Dv8_use_snapshot=0 \
+    		$([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1')
 
 
         make  chrome chrome_sandbox BUILDTYPE=Release  
 
 	cd $SRC/$name-$version
 
-        install -m 0755 -D out/Release/chrome $PKG/usr/lib/chromium/chromium
-        install -m 4555 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/chromium/chromium-sandbox
-        install -m 0644 -D out/Release/chrome.pak $PKG/usr/lib/chromium/chrome.pak
-
+        install -m 0755 -D out/Release/chrome \
+		$PKG/usr/lib/chromium/chromium
+        install -m 4555 -o root -g root -D out/Release/chrome_sandbox \
+		$PKG/usr/lib/chromium/chromium-sandbox
+        install -m 0644 -D out/Release/chrome.pak \
+		$PKG/usr/lib/chromium/chrome.pak
+	install -m 0644 -D out/Release/resources.pak \
+    		$PKG/usr/lib/chromium/resources.pak
+  	install -m 0755 -D out/Release/libffmpegsumo.so \
+    		$PKG/usr/lib/chromium/libffmpegsumo.so
+	
+	# these links are only needed when building with system ffmpeg
         ln -s /usr/lib/libavcodec.so.52 $PKG/usr/lib/chromium/libavcodec.so.52
         ln -s /usr/lib/libavformat.so.52 $PKG/usr/lib/chromium/libavformat.so.52
         ln -s /usr/lib/libavutil.so.50 $PKG/usr/lib/chromium/libavutil.so.50
-        cp -a out/Release/locales out/Release/resources $PKG/usr/lib/chromium/
+
+        cp -a out/Release/locales out/Release/resources \
+		$PKG/usr/lib/chromium/
+
         find $PKG/usr/lib/chromium/ -name '*.d' -type f -delete
-        install -m 0644 -D out/Release/chrome.1 $PKG/usr/share/man/man1/chromium.1
 
-        install -m 0644 -D ../chromium.desktop $PKG/usr/share/applications/chromium.desktop
+        install -m 0644 -D out/Release/chrome.1 \
+		$PKG/usr/share/man/man1/chromium.1
+
+        install -m 0644 -D ../chromium.desktop \
+		$PKG/usr/share/applications/chromium.desktop
 
         for size in 16 32 48 256; do
                 install -m 0644 -D \
                         chrome/app/theme/chromium/product_logo_${size}.png \
                         $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
         done
+
         install -m 0755 -D ../chromium.sh $PKG/usr/bin/chromium
 
         install -m 0644 -D LICENSE $PKG/usr/share/licenses/chromium/LICENSE
diff --git a/extra/chromium/chromium.desktop b/extra/chromium/chromium.desktop
index f04c819ce..4bb6981cf 100644
--- a/extra/chromium/chromium.desktop
+++ b/extra/chromium/chromium.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=Chromium
 # Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
 # From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
@@ -110,5 +109,5 @@ Exec=chromium %U
 Terminal=false
 Icon=chromium
 Type=Application
-Categories=Application;Network;WebBrowser;
+Categories=GTK;Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml_xml;
diff --git a/extra/chromium/chromium.sh b/extra/chromium/chromium.sh
index 989bd3476..e1c3388e5 100644
--- a/extra/chromium/chromium.sh
+++ b/extra/chromium/chromium.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export CHROME_WRAPPER=/usr/lib/chromium/chromium
 export CHROME_DESKTOP=chromium.desktop
-exec /usr/lib/chromium/chromium $@
+exec /usr/lib/chromium/chromium "$@"
diff --git a/extra/chromium/gyp-make.patch b/extra/chromium/gyp-make.patch
new file mode 100644
index 000000000..7fa9d639a
--- /dev/null
+++ b/extra/chromium/gyp-make.patch
@@ -0,0 +1,33 @@
+--- tools/gyp/pylib/gyp/generator/make.py	(revision 839)
++++ tools/gyp/pylib/gyp/generator/make.py	(working copy)
+@@ -497,6 +497,12 @@
+   return string
+ 
+ 
++def StringToMakefileVariable(string):
++  """Convert a string to a value that is acceptable as a make variable name."""
++  # TODO: replace other metacharacters that we encounter.
++  return string.replace(' ', '_')
++
++
+ srcdir_prefix = ''
+ def Sourceify(path):
+   """Convert a path to its source directory form."""
+@@ -656,7 +662,7 @@
+     part_of_all: flag indicating this target is part of 'all'
+     """
+     for action in actions:
+-      name = self.target + '_' + action['action_name']
++      name = self.target + '_' + StringToMakefileVariable(action['action_name'])
+       self.WriteLn('### Rules for action "%s":' % action['action_name'])
+       inputs = action['inputs']
+       outputs = action['outputs']
+@@ -725,7 +731,7 @@
+     part_of_all: flag indicating this target is part of 'all'
+     """
+     for rule in rules:
+-      name = self.target + '_' + rule['rule_name']
++      name = self.target + '_' + StringToMakefileVariable(rule['rule_name'])
+       count = 0
+       self.WriteLn('### Generated for rule %s:' % name)
+