.github/workflows/ci.yml

@@ -81,6 +81,8 @@ jobs:
     steps:
       - name: Install compiler ${{ matrix.compiler.compiler }}
         run: |
+          # Remove azure mirror because it is unreliable and sometimes unpredictably leads to failed CI
+          sudo sed -i 's/azure\.//' /etc/apt/sources.list
           sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
           sudo add-apt-repository -y universe
           sudo add-apt-repository -y multiverse
@@ -235,6 +237,8 @@ jobs:
     steps:
       - name: Install compiler ${{ matrix.compiler.compiler }}
         run: |
+          # Remove azure mirror because it is unreliable and sometimes unpredictably leads to failed CI
+          sudo sed -i 's/azure\.//' /etc/apt/sources.list
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
           sudo add-apt-repository -y universe
           sudo add-apt-repository -y multiverse

README.md

@@ -174,7 +174,7 @@ Optional dependencies (minimum version):
 * libgphoto2 2.5 *(for camera tethering)*
 * Imath 3.1.0 *(for 16-bit "half" float TIFF export and faster import)*
 * libavif 0.8.2 *(for AVIF import & export)*
-* libheif 1.9.0 *(for HEIF/HEIC/HIF import; also for AVIF import if no libavif)*
+* libheif 1.13.0 *(for HEIF/HEIC/HIF import; also for AVIF import if no libavif)*
 * libjxl 0.7.0 *(for JPEG XL import & export)*
 * WebP 0.3.0 *(for WebP import & export)*
 

cmake/modules/FindJXL.cmake

@@ -11,26 +11,24 @@ include(LibFindMacros)
 pkg_check_modules(JXL_PKGCONF QUIET libjxl)
 
 find_path(JXL_INCLUDE_DIR
-  NAMES jxl/encode.h
-  HINTS ${JXL_PKGCONF_INCLUDE_DIRS}
-)
+  NAMES jxl/decode.h jxl/encode.h
+  HINTS ${JXL_PKGCONF_INCLUDE_DIRS})
+mark_as_advanced(JXL_INCLUDE_DIR)
 
 find_library(JXL_LIBRARY
   NAMES jxl
-  HINTS ${JXL_PKGCONF_LIBRARY_DIRS}
-)
+  HINTS ${JXL_PKGCONF_LIBRARY_DIRS})
+mark_as_advanced(JXL_LIBRARY)
 
 find_library(JXL_THREADS_LIBRARY
   NAMES jxl_threads
-  HINTS ${JXL_PKGCONF_LIBRARY_DIRS}
-)
+  HINTS ${JXL_PKGCONF_LIBRARY_DIRS})
+mark_as_advanced(JXL_THREADS_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(JXL DEFAULT_MSG JXL_LIBRARY JXL_INCLUDE_DIR)
-
-if(JXL_PKGCONF_VERSION VERSION_LESS JXL_FIND_VERSION)
-  set(JXL_FOUND false)
-endif()
+find_package_handle_standard_args(JXL
+  REQUIRED_VARS JXL_LIBRARY JXL_THREADS_LIBRARY JXL_INCLUDE_DIR
+  VERSION_VAR JXL_PKGCONF_VERSION)
 
 if(JXL_FOUND)
   set(JXL_LIBRARIES ${JXL_LIBRARY} ${JXL_THREADS_LIBRARY})

po/POTFILES.in

@@ -87,7 +87,7 @@ build/lib/darktable/plugins/introspection_vignette.c
 build/lib/darktable/plugins/introspection_watermark.c
 build/lib/darktable/plugins/introspection_zonesystem.c
 build/lib/darktable/plugins/lighttable/tools/darktable_authors.h
-build/share/darktable/darktable.desktop.in
+build/share/darktable/org.darktable.darktable.desktop.in
 data/org.darktable.darktable.appdata.xml.in
 data/org.darktable.darktable.desktop.in
 src/bauhaus/bauhaus.c