[tor-bugs] #10064 [Tor bundles/installation]: Current maint-2.4 TBB build breaks build on systems with patch >= 2.7

[Tor Bug Tracker & Wiki]

#10064: Current maint-2.4 TBB build breaks build on systems with patch >= 2.7
--------------------------------------+---------------------------
 Reporter:  sqrt2                     |          Owner:  mikeperry
     Type:  defect                    |         Status:  new
 Priority:  normal                    |      Milestone:
Component:  Tor bundles/installation  |        Version:
 Keywords:                            |  Actual Points:
Parent ID:                            |         Points:
--------------------------------------+---------------------------
 I tried compiling TBB from the maint-2.4 branch in torbrowser.git, and
 make -f linux.mk errors with the message

 >File browser/branding/official/background.png: git binary diffs are not
 supported.

 and the same for a number of other image files. These image files recently
 (revision 427d12c3) became binary diffs in 0011-Rebrand-Firefox-to-
 TorBrowser.patch. GNU patch 2.7 introduced the ability to handle git
 diffs, with these words:

 >Support for most features of the "diff --git" format, including renames
 and copies, permission changes, and symlink diffs. Binary diffs are not
 supported yet; patch will complain and skip them.

 It appears this is what is happening here, so I propose going back simply
 copying the images from the branding directory (which is probably the
 intended procedure anyway).

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/10064>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online