Merge commit '5e8a9456a21fda9ef1f2e5fce02229774f18e280' of https://gi…

…thub.com/kovidgoyal/calibre

Changelog.txt

@@ -23,6 +23,58 @@
 # - title by author
 # }}}
 
+{{{ 7.13.0 2024-06-28
+
+:: new features
+
+- [2071033] When merging books add an option to store discarded or replaced covers as an alternate cover in the data folder of the target book
+
+- [2068070] Generate CSV catalog: Add a button to sort the fields by the order in which they appear in the book list
+
+:: bug fixes
+
+- [2067755] MTP driver: Preserve cover aspect ratio for thumbnail generation
+
+- [2071044] Fix identifiers not always being merged correctly when merging books
+
+- [2069541] DOCX Input: Fix extra left padding when converting lists
+
+- Amazon metadata download: Get title and comments for audiobook pages
+
+- Amazon metadata: When filtering search engine results by title ignore words of the title that are purely punctuation
+
+- When matching books on a device to book in the library assume a match if the title and any one author match, dont require all authors to match
+
+- [2069553] Update Google Images cover download plugin for website changes
+
+- [2069494] When adding new books if the timestamp is specified as undefined use the current timestamp
+
+- Content server: Fix systemd pre-activated socket not working
+
+- [2071390] Content server: Fix no KFX download link in OPDS acquisition feeds
+
+:: improved recipes
+- Harpers
+- Wall Street Journal
+- Liberation
+- How to Geek
+- Make Use Of
+- TechCrunch
+- LifeHacker
+- India Today
+- 1843
+- Reuters
+- The Week India
+- Slate
+
+:: new recipes
+- Times Literary Supplement by unkn0wn
+- Wall Street Journal Magazine by unkn0wn
+- Various Valnet Publishing Group recipes by Spicy Poison
+- VOX, The Good E-reder and The e-book Reader by SpicyPoison
+- Gates Notes, Greatist, Halthline and United Nations by SpicyPoison
+}}}
+
 {{{ 7.12.0 2024-05-30
 
 :: new features

bypy/README.rst

@@ -76,9 +76,9 @@ To build the dependencies for calibre, run::
 
     ./setup.py build_dep windows
 
-The output (after a very long time) will be in :literal:`bypy/b/windows/[32|64]`.
+The output (after a very long time) will be in :literal:`bypy/b/windows/64`.
 Now you can build the calibre windows installers with::
 
-    ./setup.py win --dont-sign
+    ./setup.py win64 --dont-sign
 
 The output will be in :file:`dist`

bypy/sources.json

@@ -67,8 +67,8 @@
     {
         "name": "zlib",
         "unix": {
-            "filename": "zlib-1.3.tar.xz",
-            "hash": "sha256:8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7",
+            "filename": "zlib-1.3.1.tar.xz",
+            "hash": "sha256:38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32",
             "urls": ["https://zlib.net/{filename}"]
         }
     },

bypy/windows.conf

@@ -1,7 +1,26 @@
 # Requires installation of Visual Studio 2022 Community Edition, .NET SDK, WiX Toolset, Git, Ruby (without devkit), NodeJS, Python and Perl
+#
+# Visual Studio 2022 Components:
+# .NET SDK
+# C++ ATL for latest vXXX build tools (x86 & x64)
+# C++ Clang Compiler for Windows
+# C++ CMake tools for Windows
+# C++/CLI support for vXXX build tools
+# Git for Windows (can also be installed from web)
+# MSBuild
+# MSBuild support for LLVM (clang-cl) toolset
+# MSVC vXXX - VS 2022 C++ x64/x86 build tools
+# Python 3 (can also be installed from web)
+# Windows 11 SDK
+#
+# Add the following directories to ENV Path:
+# C:\Program Files (x86)\Microsoft Visual Studio\Installer
+# C:\Program Files\Microsoft Visual Studio\VC\Tools\MSVC\14.40.33807\bin\Hostx64\x64
+# C:\Program Files\Microsoft Visual Studio\VC\Tools\Llvm\bin
+#
 # git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM to build Qt WebEngine
-# Install certifi in python 3 with:
-# py.exe -m pip install certifi
+# Install certifi and html5lib in python 3 with:
+# py.exe -m pip install certifi html5lib
 # Copy opengl32sw.dll from
 # https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
 # to C:/mesa/64

bypy/windows/wix.py

@@ -37,6 +37,12 @@ def create_installer(env, compression_level='9'):
     with open(j(d(__file__), 'wix-template.xml'), 'rb') as f:
         template = f.read().decode('utf-8')
 
+    cmd = [WIX, '--version']
+    WIXVERSION = run(*cmd, get_output=True).decode('utf-8').split('.')[0]
+    if int(WIXVERSION) >= 5:
+        # Virtual Symbol "WixUISupportPerUser" needs to be overridden in WIX V5 https://wixtoolset.org/docs/fivefour/
+        template = template.replace('WixUISupportPerUser', 'override WixUISupportPerUser')
+
     components, smap = get_components_from_files(env)
     wxs = template.format(
         app=calibre_constants['appname'],