Control: tags 1038737 + pending Dear maintainer,
I've prepared an NMU for photoqt (versioned as 3.3+ds-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru photoqt-3.3+ds/debian/changelog photoqt-3.3+ds/debian/changelog --- photoqt-3.3+ds/debian/changelog 2023-06-19 10:17:44.000000000 +0300 +++ photoqt-3.3+ds/debian/changelog 2023-07-10 01:28:08.000000000 +0300 @@ -1,3 +1,12 @@ +photoqt (3.3+ds-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Increase the timeout for the PyChromecast test and enable + PyChromecast on all architectures. (Closes: #1038737) + * Enable FreeImage on all architectures. (see #1002610) + + -- Adrian Bunk <b...@debian.org> Mon, 10 Jul 2023 01:28:08 +0300 + photoqt (3.3+ds-1) unstable; urgency=medium * New upstream version. diff -Nru photoqt-3.3+ds/debian/control photoqt-3.3+ds/debian/control --- photoqt-3.3+ds/debian/control 2023-06-19 10:17:44.000000000 +0300 +++ photoqt-3.3+ds/debian/control 2023-07-10 01:28:08.000000000 +0300 @@ -11,7 +11,7 @@ libgraphicsmagick1-dev, libgraphicsmagick++1-dev, libraw-dev, - libfreeimageplus-dev [!hppa !powerpc !ppc64], + libfreeimageplus-dev, libdevil-dev, libvips-dev, libmpv-dev, @@ -23,7 +23,7 @@ python3-pip, python3-dev, python3-requests, - python3-pychromecast [!ia64 !kfreebsd-amd64 !kfreebsd-i386 !sparc64 !sh4 !riscv64 !m68k !hppa !mips64el], + python3-pychromecast, qtbase5-dev, qt5-qmake, qttools5-dev, diff -Nru photoqt-3.3+ds/debian/patches/0001-Increase-the-timeout-for-the-PyChromecast-test.patch photoqt-3.3+ds/debian/patches/0001-Increase-the-timeout-for-the-PyChromecast-test.patch --- photoqt-3.3+ds/debian/patches/0001-Increase-the-timeout-for-the-PyChromecast-test.patch 1970-01-01 02:00:00.000000000 +0200 +++ photoqt-3.3+ds/debian/patches/0001-Increase-the-timeout-for-the-PyChromecast-test.patch 2023-07-10 01:27:27.000000000 +0300 @@ -0,0 +1,32 @@ +From ab3886b0086f05adaa6cfe275c3a33ca42ee229b Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <b...@debian.org> +Date: Mon, 10 Jul 2023 01:06:39 +0300 +Subject: Increase the timeout for the PyChromecast test + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 37123697..b27292c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -370,13 +370,13 @@ 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 60) + if(NOT ${EXIT_CODE} EQUAL 0) + 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) ++ execute_process(COMMAND ${Python3_EXECUTABLE} -c "import pychromecast" RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET TIMEOUT 60) + if(NOT ${EXIT_CODE} EQUAL 0) + message(FATAL_ERROR "** Unable to locate Python3 module pychromecast. Please first install it or disable Chromecast support.") + else() +-- +2.30.2 + diff -Nru photoqt-3.3+ds/debian/patches/disable-pychromecast photoqt-3.3+ds/debian/patches/disable-pychromecast --- photoqt-3.3+ds/debian/patches/disable-pychromecast 2022-04-08 10:02:42.000000000 +0300 +++ photoqt-3.3+ds/debian/patches/disable-pychromecast 1970-01-01 02:00:00.000000000 +0200 @@ -1,56 +0,0 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - photoqt (2.6-1) unstable; urgency=medium - . - * New upstream version. -Author: Gürkan Myczko <t...@debian.org> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: 2022-04-08 - ---- photoqt-2.6.orig/CMakeLists.txt -+++ photoqt-2.6/CMakeLists.txt -@@ -318,17 +318,17 @@ if(CHROMECAST) - 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) -- 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.") -- else() -- message(">> Success!") -- endif() -- endif() -+# 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.") -+# else() -+# message(">> Success!") -+# endif() -+# endif() - include_directories(${Python3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} ${Python3_LIBRARIES}) - message("** Chromecast support enabled") diff -Nru photoqt-3.3+ds/debian/patches/series photoqt-3.3+ds/debian/patches/series --- photoqt-3.3+ds/debian/patches/series 2023-06-19 10:17:44.000000000 +0300 +++ photoqt-3.3+ds/debian/patches/series 2023-07-10 01:27:46.000000000 +0300 @@ -1 +1 @@ -#disable-pychromecast +0001-Increase-the-timeout-for-the-PyChromecast-test.patch diff -Nru photoqt-3.3+ds/debian/rules photoqt-3.3+ds/debian/rules --- photoqt-3.3+ds/debian/rules 2023-06-19 10:17:44.000000000 +0300 +++ photoqt-3.3+ds/debian/rules 2023-07-10 01:28:08.000000000 +0300 @@ -13,21 +13,6 @@ ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd) MAGICK = -DGRAPHICSMAGICK=OFF -DIMAGEMAGICK=OFF endif -ifeq ($(DEB_BUILD_ARCH_OS),ia64) - CHROMECAST = -DCHROMECAST=OFF -endif -ifeq ($(DEB_BUILD_ARCH_OS),x86_64) - CHROMECAST = -DCHROMECAST=OFF -endif -ifeq ($(DEB_BUILD_ARCH_OS),hppa) - FI = -DFREEIMAGE=OFF -endif -ifeq ($(DEB_BUILD_ARCH_OS),powerpc) - FI = -DFREEIMAGE=OFF -endif -ifeq ($(DEB_BUILD_ARCH_OS),ppc64) - FI = -DFREEIMAGE=OFF -endif %: dh $@ @@ -38,6 +23,4 @@ -DVIDEO_MPV=ON \ -DLIBVIPS=ON \ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - $(MAGICK) \ - $(CHROMECAST) \ - $(FI) + $(MAGICK)