Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpi-imager for openSUSE:Factory checked in at 2024-11-01 21:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpi-imager (Old) and /work/SRC/openSUSE:Factory/.rpi-imager.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpi-imager" Fri Nov 1 21:04:29 2024 rev:10 rq:1219905 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rpi-imager/rpi-imager.changes 2024-04-08 17:51:38.348284015 +0200 +++ /work/SRC/openSUSE:Factory/.rpi-imager.new.2020/rpi-imager.changes 2024-11-01 21:04:46.263419740 +0100 @@ -1,0 +2,25 @@ +Sun Oct 27 15:36:23 UTC 2024 - Mikhail Paulyshka <m...@mixaill.net> + +- adding 0000-remove-vendoring.patch +- update dependencies +- version 1.9.0 + * appstream metainfo: Fix appstream-builder generation by @joebonrichie in #792 + * Add a message when there are no storage devices. Fixes #798 by @jedahan in #801 + * Update Italian language by @bovirus in #802 + * imagewriter: Use QCoreApplication::translate by @tdewey-rpi in #805 + * Update Italian language by @bovirus in #806 + * Exposing 'DRIVELIST_FILTER_SYSTEM_DRIVES' as a cmake variable by @MrSmoer in #816 + * OS Customisation: Validate usernames by @tdewey-rpi in #819 + * Update issue creation templates by @tdewey-rpi in #823 + * Update French translation by @martignoni in #833 + * cli: Add disable-eject by @tdewey-rpi in #860 + * Corrected the spelling for Kyiv by @diminDDL in #871 + * Fix timeout on systems with large numbers of loops by @waveform80 in #872 + * localectl doesn't work on modern Debian/Ubuntu by @waveform80 in #867 + * Update zh-CN (Simplified Chinese) translation by @ykla in #879 + * BCM2712d0 support by @tdewey-rpi in #884 + * Fix GPT signature test by @jadonk in #895 + * Linux/OSX: Fix reversed fsync check by @ali1234 in #903 + * v1.9.0: Roll-up by @tdewey-rpi in #920 + +------------------------------------------------------------------- Old: ---- rpi-imager-1.8.5.tar.gz New: ---- 0000-remove-vendoring.patch rpi-imager-1.9.0.tar.gz BETA DEBUG BEGIN: New: - adding 0000-remove-vendoring.patch - update dependencies BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpi-imager.spec ++++++ --- /var/tmp/diff_new_pack.7eCcvS/_old 2024-11-01 21:04:48.323505831 +0100 +++ /var/tmp/diff_new_pack.7eCcvS/_new 2024-11-01 21:04:48.335506333 +0100 @@ -17,37 +17,38 @@ Name: rpi-imager -Version: 1.8.5 +Version: 1.9.0 Release: 0 Summary: Raspberry Pi Imaging Utility License: Apache-2.0 Group: Hardware/Other URL: https://github.com/raspberrypi/rpi-imager Source: https://github.com/raspberrypi/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0000-remove-vendoring.patch + BuildRequires: cmake -BuildRequires: fdupes -BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: git -BuildRequires: libqt5-qtquickcontrols2 +BuildRequires: libarchive-devel +BuildRequires: libcurl-devel +BuildRequires: libgnutls-devel BuildRequires: lzma-devel -BuildRequires: openssl-devel -BuildRequires: pkgconfig -BuildRequires: update-desktop-files +BuildRequires: qt6-concurrent-devel +BuildRequires: qt6-core-devel +BuildRequires: qt6-dbus-devel +BuildRequires: qt6-linguist-devel +BuildRequires: qt6-quick-devel +BuildRequires: qt6-svg-devel +BuildRequires: qt6-widgets-devel BuildRequires: util-linux-systemd -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5QuickTest) -BuildRequires: pkgconfig(Qt5QuickWidgets) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(libcurl) -ExcludeArch: s390x + +Requires: dosfstools +Requires: udisks2 +Requires: util-linux-systemd + Recommends: polkit-gnome +ExcludeArch: s390x + %description Raspberry Pi Imager is the quick and easy way to install Raspberry Pi OS and other operating systems to a microSD card, ready to use with your Raspberry @@ -66,23 +67,14 @@ %build pushd src -%cmake -DENABLE_CHECK_VERSION=0 -DENABLE_TELEMETRY=0 +%cmake -DENABLE_CHECK_VERSION=OFF -DENABLE_TELEMETRY=OFF -DENABLE_VENDORING=OFF %cmake_build +popd %install pushd src %cmake_install - -mkdir -p %{buildroot}%{_datadir}/icons -cp icons/rpi-imager.png %{buildroot}%{_datadir}/icons/. - -pwd -pushd linux -desktop-file-install --dir %{buildroot}%{_datadir}/applications/ org.raspberrypi.rpi-imager.desktop -%suse_update_desktop_file org.raspberrypi.rpi-imager -r Settings HardwareSettings -%suse_update_desktop_file org.raspberrypi.rpi-imager -G Imager - -%fdupes %{buildroot} +popd %files %doc README.md ++++++ 0000-remove-vendoring.patch ++++++ >From 0bd585fa0b54a2b85cea6a6768c7e1d953b24334 Mon Sep 17 00:00:00 2001 From: Dmytro Aleksandrov <alker...@gmail.com> Date: Sat, 14 Sep 2024 16:49:35 -0400 Subject: [PATCH] Add possibility to opt-out from using vendored dependencies on Unix systems This is to allow Linux distribution maintainers to keep delivering the project using the distro-provided libs --- src/CMakeLists.txt | 259 ++++++++++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 121 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87286c17..68de7c25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.15) OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON) OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON) OPTION (DRIVELIST_FILTER_SYSTEM_DRIVES "Filter System drives from displayed drives" ON) +OPTION (ENABLE_VENDORING "Use vendored dependencies" ON) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Which macOS architectures to build for") @@ -38,127 +39,143 @@ endif(APPLE) # Bundled code will occasionally use identical options - eg, BUILD_TESTING. set(BUILD_TESTING OFF) -# Bundled liblzma -set(XZ_MICROLZMA_DECODER OFF) -set(XZ_MICROLZMA_ENCODER OFF) -set(XZ_LZIP_DECODER OFF) -set(XZ_ENABLE_SANDBOX OFF) -set(XZ_BUILD_SHARED_LIBS OFF) -set(XZ_ENABLE_DOXYGEN OFF) -set(XZ_DECODERS - lzma1 - lzma2 - delta -) -set(XZ_ENCODERS "") -set(CREATE_LZMA_SYMLINKS OFF) -set(CREATE_XZ_SYMLINKS OFF) -add_subdirectory(dependencies/xz-5.6.2) -set(LIBLZMA_FOUND true) -set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.6.2/src/liblzma/api FORCE) -set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.6.2/src/liblzma/api FORCE) -set(LIBLZMA_LIBRARY liblzma) -set(LIBLZMA_LIBRARIES liblzma) - -# Bundled zstd -set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE) -set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE) -set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE) -set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE) -add_subdirectory(dependencies/zstd-1.5.6/build/cmake) -set(Zstd_FOUND true) -set(ZSTD_FOUND true) -set(Zstd_VERSION "1.5.6") -set(ZSTD_VERSION "1.5.6") -set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) -set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) -set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) -set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) -set(Zstd_LIBRARIES libzstd_static) -set(ZSTD_LIBRARIES libzstd_static) - -# Bundled zlib -set(ZLIB_BUILD_EXAMPLES OFF) -add_subdirectory(dependencies/zlib-1.3.1) -set(ZLIB_FOUND TRUE) -set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.3.1 CACHE PATH "zlib include dir") -set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.3.1 CACHE PATH "zlib include dir") -set(ZLIB_LIBRARY zlibstatic) -set(ZLIB_LIBRARIES zlibstatic) - -# Bundled libarchive -set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "") -set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "") -set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "") -add_subdirectory(dependencies/libarchive-3.7.4) -set(LibArchive_FOUND true) -set(LibArchive_LIBRARIES archive_static) -set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.4/libarchive) - -# Bundled libcurl -set(CMAKE_CURL_INCLUDES) -set(BUILD_STATIC_CURL true) -set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) -set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE) -set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE) -set(CURL_DISABLE_ALTSVC ON) -set(CURL_DISABLE_KERBEROS_AUTH ON) -set(CURL_DISABLE_DICT ON) -set(CURL_DISABLE_DISABLE_FORM_API ON) -set(CURL_DISABLE_FTP ON) -set(CURL_DISABLE_GOPHER ON) -set(CURL_DISABLE_IMAP ON) -set(CURL_DISABLE_LDAP ON) -set(CURL_DISABLE_LDAPS ON) -set(CURL_DISABLE_MQTT ON) -set(CURL_DISABLE_NETRC ON) -set(CURL_DISABLE_POP3 ON) -set(CURL_DISABLE_RTSP ON) -set(CURL_DISABLE_SMTP ON) -set(CURL_DISABLE_TELNET ON) -set(CURL_DISABLE_TFTP ON) -set(CURL_ZSTD ON) -set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE) -if (APPLE) - # TODO: SecureTransport is a deprecated API in macOS, supporting - # only up to TLS v1.2. cURL has not implemented the replacement, - # Network.framework, and so we will need to select an alternative. - # Best recommendation: Libressl, as used by Apple in the curl binary - # on macOS. - set(CURL_USE_SECTRANSP ON) - set(CURL_DEFAULT_SSL_BACKEND "secure-transport") -else() - if (WIN32) - set(CURL_USE_SCHANNEL ON) - set(CURL_DEFAULT_SSL_BACKEND "schannel") - else () - set(CURL_USE_GNUTLS ON) - set(CURL_DEFAULT_SSL_BACKEND "gnutls") - endif(WIN32) -endif(APPLE) - -add_subdirectory(dependencies/curl-8.8.0) -set(CURL_FOUND true) -set(CURL_LIBRARIES libcurl_static) -set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.8.0/include) -set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.8.0/include) +if(ENABLE_VENDORING) + # Bundled liblzma + set(XZ_MICROLZMA_DECODER OFF) + set(XZ_MICROLZMA_ENCODER OFF) + set(XZ_LZIP_DECODER OFF) + set(XZ_ENABLE_SANDBOX OFF) + set(XZ_BUILD_SHARED_LIBS OFF) + set(XZ_ENABLE_DOXYGEN OFF) + set(XZ_DECODERS + lzma1 + lzma2 + delta + ) + set(XZ_ENCODERS "") + set(CREATE_LZMA_SYMLINKS OFF) + set(CREATE_XZ_SYMLINKS OFF) + add_subdirectory(dependencies/xz-5.6.2) + set(LIBLZMA_FOUND true) + set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.6.2/src/liblzma/api FORCE) + set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.6.2/src/liblzma/api FORCE) + set(LIBLZMA_LIBRARY liblzma) + set(LIBLZMA_LIBRARIES liblzma) + + # Bundled zstd + set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE) + set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE) + set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE) + set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE) + add_subdirectory(dependencies/zstd-1.5.6/build/cmake) + set(Zstd_FOUND true) + set(ZSTD_FOUND true) + set(Zstd_VERSION "1.5.6") + set(ZSTD_VERSION "1.5.6") + set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) + set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) + set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) + set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.6/lib) + set(Zstd_LIBRARIES libzstd_static) + set(ZSTD_LIBRARIES libzstd_static) + + # Bundled zlib + set(ZLIB_BUILD_EXAMPLES OFF) + add_subdirectory(dependencies/zlib-1.3.1) + set(ZLIB_FOUND TRUE) + set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.3.1 CACHE PATH "zlib include dir") + set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.3.1 CACHE PATH "zlib include dir") + set(ZLIB_LIBRARY zlibstatic) + set(ZLIB_LIBRARIES zlibstatic) + + # Bundled libarchive + set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "") + set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "") + set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "") + add_subdirectory(dependencies/libarchive-3.7.4) + set(LibArchive_FOUND true) + set(LibArchive_LIBRARIES archive_static) + set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.4/libarchive) + + # Bundled libcurl + set(CMAKE_CURL_INCLUDES) + set(BUILD_STATIC_CURL true) + set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) + set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE) + set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE) + set(CURL_DISABLE_ALTSVC ON) + set(CURL_DISABLE_KERBEROS_AUTH ON) + set(CURL_DISABLE_DICT ON) + set(CURL_DISABLE_DISABLE_FORM_API ON) + set(CURL_DISABLE_FTP ON) + set(CURL_DISABLE_GOPHER ON) + set(CURL_DISABLE_IMAP ON) + set(CURL_DISABLE_LDAP ON) + set(CURL_DISABLE_LDAPS ON) + set(CURL_DISABLE_MQTT ON) + set(CURL_DISABLE_NETRC ON) + set(CURL_DISABLE_POP3 ON) + set(CURL_DISABLE_RTSP ON) + set(CURL_DISABLE_SMTP ON) + set(CURL_DISABLE_TELNET ON) + set(CURL_DISABLE_TFTP ON) + set(CURL_ZSTD ON) + set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE) + if (APPLE) + # TODO: SecureTransport is a deprecated API in macOS, supporting + # only up to TLS v1.2. cURL has not implemented the replacement, + # Network.framework, and so we will need to select an alternative. + # Best recommendation: Libressl, as used by Apple in the curl binary + # on macOS. + set(CURL_USE_SECTRANSP ON) + set(CURL_DEFAULT_SSL_BACKEND "secure-transport") + else() + if (WIN32) + set(CURL_USE_SCHANNEL ON) + set(CURL_DEFAULT_SSL_BACKEND "schannel") + else () + set(CURL_USE_GNUTLS ON) + set(CURL_DEFAULT_SSL_BACKEND "gnutls") + endif(WIN32) + endif(APPLE) + + add_subdirectory(dependencies/curl-8.8.0) + set(CURL_FOUND true) + set(CURL_LIBRARIES libcurl_static) + set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.8.0/include) + set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.8.0/include) + +elseif (NOT ENABLE_VENDORING AND UNIX) + # Find the libraries that were subject to vendoring in the system instead, + # To keep the possibility of delivery via Linux distro packages + find_package(ZLIB) + if(ZLIB_FOUND) + set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB) + endif() + find_package(LibLZMA) + if(LIBLZMA_FOUND) + set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA) + endif() + find_package(CURL 7.32.0 REQUIRED) + find_package(LibArchive 3.7.4 REQUIRED) +endif() # Adding headers explicity so they are displayed in Qt Creator set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h ++++++ rpi-imager-1.8.5.tar.gz -> rpi-imager-1.9.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/rpi-imager/rpi-imager-1.8.5.tar.gz /work/SRC/openSUSE:Factory/.rpi-imager.new.2020/rpi-imager-1.9.0.tar.gz differ: char 12, line 1
