- updated to 3.3 (ready for exiv2 0.28)

diff --git a/photoqt-pychromecast.patch b/photoqt-pychromecast.patch
index 9d7d29896a6822064329c5e4ab591e1987b62245..d45a98c7628089e7d8b689e7d58daa66a1eff1cd 100644 (file)
--- a/photoqt-pychromecast.patch
+++ b/photoqt-pychromecast.patch
@@ -1,20 +1,25 @@
---- photoqt-3.1/CMakeLists.txt.orig    2023-03-08 01:12:44.000000000 +0100
-+++ photoqt-3.1/CMakeLists.txt 2023-03-26 22:07:55.517322764 +0200
-@@ -349,17 +349,9 @@ if(CHROMECAST)
+--- photoqt-3.3/CMakeLists.txt.orig    2023-07-28 19:02:47.757061621 +0200
++++ photoqt-3.3/CMakeLists.txt 2023-07-28 19:05:21.542895158 +0200
+@@ -370,22 +370,10 @@ if(CHROMECAST)
      elseif(NOT ${Python3_Interpreter_FOUND})
          message(FATAL_ERROR "** Unable to locate Python3 Interpreter... is it installed?")
      else()
 -        execute_process(COMMAND ${Python3_EXECUTABLE} -c "import pychromecast" RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 2)
 +        execute_process(COMMAND ${Python3_EXECUTABLE} -c "import pychromecast" RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 10)
          if(NOT ${EXIT_CODE} EQUAL 0)
--            # try installing it with pip
--            message(">> Attempt to install pychromecast locally using pip...")
--            execute_process(COMMAND ${Python3_EXECUTABLE} -m pip install pychromecast --user RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 2)
--            execute_process(COMMAND ${Python3_EXECUTABLE} -c "import pychromecast" RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 2)
--            if(NOT ${EXIT_CODE} EQUAL 0)
-                 message(FATAL_ERROR "** Unable to locate Python3 module pychromecast. Please first install it or disable Chromecast support.")
+-            if(CHROMECAST_PIPINSTALL)
+-                # try installing it with pip
+-                message(">> Attempt to install pychromecast locally using pip...")
+-                execute_process(COMMAND ${Python3_EXECUTABLE} -m pip install pychromecast)
+-                execute_process(COMMAND ${Python3_EXECUTABLE} -c "import pychromecast" RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 2)
+-                if(NOT ${EXIT_CODE} EQUAL 0)
+-                    message(FATAL_ERROR "** Unable to locate Python3 module pychromecast. Please first install it or disable Chromecast support.")
+-                else()
+-                    message(">> Success!")
+-                endif()
 -            else()
--                message(">> Success!")
+                 message(FATAL_ERROR "** Unable to import PyChromecast, make sure it is installed. "
+                                     "Enabling the CHROMECAST_PIPINSTALL option allows CMake to try to install it locally using pip.")
 -            endif()
          endif()
          include_directories(${Python3_INCLUDE_DIRS})

diff --git a/photoqt.spec b/photoqt.spec
index 2671097622e568785ee8d3885b3be59cab65aa60..575841778554028315acac1efdab7ef9f6782927 100644 (file)
--- a/photoqt.spec
+++ b/photoqt.spec
@@ -1,3 +1,6 @@
+# TODO:
+# VIDEO_MPV (upstream on by default) (BR: libmpv)
+# LIBVIPS (upstream off by default) (BR: glib2, vips, vips-cpp)
 #
 # Conditional build:
 %bcond_without gmagick         # GraphicsMagick support
@@ -6,19 +9,19 @@
 Summary:       Simple but powerful Qt-based image viewer
 Summary(pl.UTF-8):     Prosta, ale mająca duże możliwości przeglądarka obrazków oparta na Qt
 Name:          photoqt
-Version:       3.1
+Version:       3.3
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 #Source0Download: http://photoqt.org/down/
 Source0:       https://photoqt.org/downloads/source/%{name}-%{version}.tar.gz
-# Source0-md5: fdc30d88a147b6639e73cffea98d2c44
+# Source0-md5: d06988f0c505266bffbd187b6a4e8379
 Patch0:                %{name}-pychromecast.patch
 URL:           https://photoqt.org/
-# TODO (upstream off by default): mpv, vips(+glib2)
 BuildRequires: DevIL-devel
 BuildRequires: FreeImage-devel
 %{?with_gmagick:BuildRequires: GraphicsMagick-c++-devel}
+BuildRequires: Qt5Concurrent-devel >= %{qt_ver}
 BuildRequires: Qt5Core-devel >= %{qt_ver}
 BuildRequires: Qt5DBus-devel >= %{qt_ver}
 BuildRequires: Qt5Gui-devel >= %{qt_ver}
@@ -30,7 +33,7 @@ BuildRequires:        Qt5Svg-devel >= %{qt_ver}
 BuildRequires: Qt5Widgets-devel >= %{qt_ver}
 BuildRequires: Qt5Xml-devel >= %{qt_ver}
 BuildRequires: cmake >= 3.16
-BuildRequires: exiv2-devel
+BuildRequires: exiv2-devel >= 0.26
 BuildRequires: libarchive-devel
 BuildRequires: libraw-devel
 BuildRequires: libstdc++-devel >= 6:4.7
@@ -68,13 +71,12 @@ Prosta, ale mająca duże możliwości przeglądarka obrazków oparta na Qt.
 %patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
        -DEXIV2=ON \
-       %{!?with_gmagick:-DGM=OFF}
+       %{!?with_gmagick:-DGM=OFF} \
+       -DVIDEO_MPV=OFF
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT