mirror of
				https://github.com/kovidgoyal/calibre.git
				synced 2025-11-04 03:27:00 -05:00 
			
		
		
		
	Fix #1087816 (Calibre 0.9.9 64bit startup)
This commit is contained in:
		
							parent
							
								
									fa0b3854a4
								
							
						
					
					
						commit
						3128c81b8b
					
				@ -598,6 +598,10 @@ class Win32Freeze(Command, WixMixIn):
 | 
				
			|||||||
                        # from files
 | 
					                        # from files
 | 
				
			||||||
                        'unrar.pyd', 'wpd.pyd', 'podofo.pyd',
 | 
					                        'unrar.pyd', 'wpd.pyd', 'podofo.pyd',
 | 
				
			||||||
                        'progress_indicator.pyd',
 | 
					                        'progress_indicator.pyd',
 | 
				
			||||||
 | 
					                        # As per this https://bugs.launchpad.net/bugs/1087816
 | 
				
			||||||
 | 
					                        # on some systems magick.pyd fails to load from memory
 | 
				
			||||||
 | 
					                        # on 64 bit
 | 
				
			||||||
 | 
					                        'magick.pyd',
 | 
				
			||||||
                        }:
 | 
					                        }:
 | 
				
			||||||
                        self.add_to_zipfile(zf, pyd, x)
 | 
					                        self.add_to_zipfile(zf, pyd, x)
 | 
				
			||||||
                        os.remove(self.j(x, pyd))
 | 
					                        os.remove(self.j(x, pyd))
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user