Justin

Sometimes you just need to:

  template("patch_file") {
    assert(defined(invoker.patch_path),
           "patch_path must be defined for $target_name")
    assert(defined(invoker.source_file),
           "source_file must be defined for $target_name")

    action(target_name) {
      forward_variables_from(invoker,
                             [
                               "testonly",
                               "visibility",
                             ])

      script = "patch.py"
      sources = [
        invoker.patch_path,
        invoker.source_file,
      ]
      outputs = [ "$target_gen_dir/" + invoker.source_file ]

      args = rebase_path(sources, root_build_dir) +
             rebase_path(outputs, root_build_dir)
    }
  }

  patch_file("patch_SomeFile_m") {
    patch_path = "patches/path_to_SomeFile.m.diff"
    source_file = "src/path/to/SomeFile.m"
  }

And then you need to:

    sources -= [ "src/path/to/SomeFile.m" ]
    sources += get_target_outputs(":patch_SomeFile_m")
    deps += [ ":patch_SomeFile_m" ]

For fun and profit.

https://nvd.nist.gov/vuln/detail/CVE-2024-27879

Every time I try to do a quick print of photos for CVS I need to locally convert the ones I choose from HEIC to jpg.

Brainless convert:

for i in *.HEIC(:r) ; sips -s format jpeg "$i.HEIC" --out "$i.jpg"

Stolen from here from LongZheng

I’ve finally fixed it! I found a bunch of errors related to “AutoUnlock” in the Console that was hinting to me that there was some invalid state on my Mac with keys and plists not being reset properly. After clearing/resetting them, I can now successfully pair my watchOS 7 Series 3 to macOS 10.15.6.

Steps (follow at your own discretion)

1. Open “Keychain Access” -> Passwords.
2. In “View”, enable “Show Invisible Items”
   
   
3. Search for “Auto Unlock”
4. You should see a whole bunch of application passwords for “Auto Unlock: XXXX’s …”
   
5. Select all records and delete (this will reset/disable auto unlock on other Macs if you use multiple Macs)
6. Whilst still in “Keychain Access”, search for “AutoUnlock” (no space)
7. There should be 4 entries for “tlk” “tlk-nonsync” “classA” “classC”
   
8. Select 4 records and delete (don’t worry if they re-appear, the system repairs this automatically)
9. Open “Finder” and navigate to “~/Library/Sharing/AutoUnlock”
10. There should be two files “ltk.plist” and “pairing-records.plist”
    
11. Delete both files
    (Some users have reported better success restarting macOS at this stage)
12. Open “System Preferences” and try enabling auto unlock. You may need to enable it twice, the first attempt will fail.

TL;DR: when using multiple branches, prefer to use “git rebase –onto origin/master origin/master ${branch}” if you want to checkout and then rebase a branch.

Let’s say you have the working history:

       /-*-* A
*-*-*-*-*-*-* origin/master
        \-*-*-* B

and you want to push the branch A because your CL has been approved. You have to rebase A on origin/master, then build and run test and do git cl push. Once this is done, you now have the following history:

*-*-*-*-*-*-*-@ origin/master (after push)
        \-*-*-* B

Now you want to go back to work on B. Until recently, I used the following commands (striked-ed out as I now consider them broken):

$ git checkout B
$ git rebase origin/master

This has the disadvantage of marking as dirty all the files that are in the delta between the point B diverged from origin/master in addition to all the files modified in B since the branch was created.

There is however a better way:

$ git rebase –onto origin/master origin/master B

This will still rebase B on top of origin/master, but will not checkout B first, so only the files that have been modified in B will be touched and considered dirty by the build. Depending on how large the change in origin/master have been, this can be the difference between rebuilding thousand of files and rebuilding just a few tens.