mozc-officialize.patch

diff --git src/build_mozc.py src/build_mozc.py
index b972602..83300c2 100644
--- src/build_mozc.py
+++ src/build_mozc.py
@@ -209,6 +209,7 @@ def GetGypFileNames(options):
   # Include subdirectory of rewriter
   gyp_file_names.extend(glob.glob('%s/rewriter/*/*.gyp' % SRC_DIR))
   # Include subdirectory of win32 and breakpad for Windows
+  gyp_file_names.extend(glob.glob('%s/unix/emacs/*.gyp' % SRC_DIR)) # add mozc_emacs_helper
   if options.target_platform == 'Windows':
     gyp_file_names.extend(glob.glob('%s/win32/*/*.gyp' % SRC_DIR))
   elif options.target_platform == 'Linux':
diff --git src/data_manager/packed/packed_data_manager.gyp src/data_manager/packed/packed_data_manager.gyp
index fb39b7f..1e75aea 100644
--- src/data_manager/packed/packed_data_manager.gyp
+++ src/data_manager/packed/packed_data_manager.gyp
@@ -40,7 +40,7 @@
       },
       'includes': [ 'packed_data_manager.gypi' ],
     }],
-    ['branding=="Mozc"', {
+    ['branding=="GoogleJapaneseInput" or branding=="Mozc"', {
       'variables': {
         'dataset_dir': 'oss',
         'dataset_tag': 'oss',
diff --git src/mac/mac.gyp src/mac/mac.gyp
index ccb1645..17e36d0 100644
--- src/mac/mac.gyp
+++ src/mac/mac.gyp
@@ -581,15 +581,7 @@
             'UninstallGoogleJapaneseInput',
             'gen_packproj_files',
             'gen_launchd_confs',
-          ],
-          'conditions': [
-            ['branding=="GoogleJapaneseInput"', {
-              'dependencies': [
-                'DevConfirmPane',
-                'codesign_client',
-              ],
-            }],
-          ],
+          ]
         },
       ],
     }],