public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/alizams] main: Release 1.10.3 |Use Qt6 |Fix License tag
@ 2026-09-08 20:00 Antonio Trande
  0 siblings, 0 replies; only message in thread
From: Antonio Trande @ 2026-09-08 20:00 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/alizams
Branch : main
Commit : 68d05f9814151c5ad4b316257802aa6d31a8efd0
Author : Antonio Trande <sagitter@fedoraproject.org>
Date   : 2026-09-08T21:59:58+02:00
Stats  : +70/-10 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/alizams/c/68d05f9814151c5ad4b316257802aa6d31a8efd0?branch=main

Log:
Release 1.10.3 |Use Qt6 |Fix License tag

---
diff --git a/.gitignore b/.gitignore
index a7e2222..ab26026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /AlizaMS-1.9.7.tar.gz
 /AlizaMS-1.9.9.tar.gz
 /AlizaMS-1.9.10.tar.gz
+/AlizaMS-1.10.3.tar.gz

diff --git a/alizams-find_CharLS.patch b/alizams-find_CharLS.patch
new file mode 100644
index 0000000..ace7c0e
--- /dev/null
+++ b/alizams-find_CharLS.patch
@@ -0,0 +1,44 @@
+--- a/CMakeLists.orig.txt	2026-08-19 17:00:20.000000000 +0200
++++ b/CMakeLists.txt	2026-09-04 14:33:52.629300232 +0200
+@@ -277,8 +277,8 @@
+ set(MDCM_LJPEG_LIBRARIES mdcmjpeg8 mdcmjpeg12 mdcmjpeg16)
+ 
+ if(MDCM_USE_SYSTEM_CHARLS)
+-  find_package(CharLS REQUIRED)
+-  set(MDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARIES})
++  find_package(charls REQUIRED)
++  set(MDCM_CHARLS_LIBRARIES charls)
+ else()
+   set(MDCM_CHARLS_LIBRARIES mdcmcharls)
+ endif()
+--- a/CMake/FindCharLS.orig.cmake	2026-08-19 17:00:20.000000000 +0200
++++ b/CMake/FindCharLS.cmake	2026-09-04 15:27:57.130244474 +0200
+@@ -7,7 +7,7 @@
+   set(CHARLS_LOW FALSE)
+ else()
+   find_path(CHARLS_LOW_INCLUDE_DIR charls/charls.h /usr/include /usr/local/include)
+-  find_library(CHARLS_LOW_LIBRARY NAMES charls PATHS /usr/lib /usr/local/lib)
++  find_library(CHARLS_LOW_LIBRARY NAMES charls PATHS ${LIB_INSTALL_DIR} /usr/local/lib)
+   if(CHARLS__LOWLIBRARY AND CHARLS_LOW_INCLUDE_DIR)
+     set(CHARLS_LIBRARIES    ${CHARLS_LOW_LIBRARY})
+     set(CHARLS_INCLUDE_DIRS ${CHARLS_LOW_INCLUDE_DIR})
+@@ -19,7 +19,7 @@
+ endif()
+ 
+ if(CHARLS_FOUND)
+-  message(STATUS "Found CharLS library: ${CHARLS_LIBRARY}, headers: ${CHARLS_INCLUDE_DIR}")
++  message(STATUS "Found CharLS library: ${CHARLS_LIBRARIES}, headers: ${CHARLS_INCLUDE_DIR}")
+ else()
+   message(FATAL_ERROR "CharLS not found")
+ endif()
+--- a/mdcm/Utilities/mdcm_charls.orig.h	2026-08-19 17:00:20.000000000 +0200
++++ b/mdcm/Utilities/mdcm_charls.h	2026-09-04 15:14:23.818186680 +0200
+@@ -27,7 +27,7 @@
+ #ifdef MDCM_CHARLS_LOW
+ #include <charls/charls.h>
+ #else
+-#include <CharLS/charls.h>
++#include <charls/charls.h>
+ #endif
+ #else
+ #include "mdcmcharls/charls.h"

diff --git a/alizams-find_system_openjpeg_before.patch b/alizams-find_system_openjpeg_before.patch
new file mode 100644
index 0000000..4af4f97
--- /dev/null
+++ b/alizams-find_system_openjpeg_before.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.orig.txt	2026-09-08 21:00:06.408288903 +0200
++++ b/CMakeLists.txt	2026-09-08 21:01:12.140813383 +0200
+@@ -1002,7 +1002,7 @@
+ endif()
+ 
+ if(MDCM_USE_SYSTEM_OPENJPEG)
+-  target_include_directories(${ALIZAMS_TARGET} SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS})
++  target_include_directories(${ALIZAMS_TARGET} SYSTEM BEFORE PRIVATE ${OPENJPEG_INCLUDE_DIRS})
+ else()
+   target_include_directories(${ALIZAMS_TARGET} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/mdcm/Utilities/mdcmopenjpeg")
+   target_include_directories(${ALIZAMS_TARGET} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/mdcm/Utilities/mdcmopenjpeg/src/lib/openjp2")

diff --git a/alizams.spec b/alizams.spec
index 8d67df3..c6c1b09 100644
--- a/alizams.spec
+++ b/alizams.spec
@@ -1,25 +1,31 @@
 %global forgeurl https://github.com/AlizaMedicalImaging/AlizaMS
 
 Name:    alizams
-Version: 1.9.10
+Version: 1.10.3
 
 %forgemeta
 
 Release: %autorelease
 Summary: Aliza MS DICOM Viewer
-# Automatically converted from old format: GPLv3 - review is highly recommended.
-License: GPL-3.0-only
+# Mixed licensed source files:
+# GPL-3.0-only is the main license;
+# vectormath/sse/*, vectormath/scalar/* and GUI/qxtspanslider*.h are BSD-3-Clause;
+# common/colorspace/colorspace.cpp is BSD 2-Clause License;
+# common/codecutils.* are Apache-2.0
+License: GPL-3.0-only AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause
 URL:     %{forgeurl}
 Source0: %{forgesource}
+Patch0:  alizams-find_CharLS.patch
+Patch1:  alizams-find_system_openjpeg_before.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  g++
 BuildRequires:  libuuid-devel
 BuildRequires:  zlib-devel
-BuildRequires:  qt5-qtsvg-devel
+BuildRequires:  qt6-qtsvg-devel
 BuildRequires:  vxl-devel
-BuildRequires:  openjpeg2-devel >= 2.0
+BuildRequires:  openjpeg-devel
 BuildRequires:  CharLS-devel
 BuildRequires:  cmake(LIBMINC)
 BuildRequires:  cmake(ITK)
@@ -30,8 +36,6 @@ BuildRequires:  bullet-devel
 BuildRequires:  lcms2-devel
 
 Requires:       hicolor-icon-theme
-Requires:       qt5-qtsvg
-
 Provides:       bundled(vectormath)
 Provides:       bundled(colorspace)
 
@@ -64,8 +68,8 @@ rm -fr CG/glew/
 
 %build
 %cmake \
-  -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-  -DALIZA_QT_VERSION:STRING=5 \
+  -DCMAKE_BUILD_TYPE:STRING=Release \
+  -DALIZA_QT_VERSION:STRING=6 \
   -DALIZA_USE_SYSTEM_BULLET:BOOL=ON \
   -DALIZA_USE_SYSTEM_LCMS2:BOOL=ON \
   -DMDCM_USE_SYSTEM_ZLIB:BOOL=ON \

diff --git a/sources b/sources
index 6046dad..716b989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (AlizaMS-1.9.10.tar.gz) = 75e654119f80fb4cc27c5df059f89cef1bff2251d92b683e738ce46236beff6219cc811aa36a27b44e3063a225090b76b602c1bee84c47980f3ed59e979be320
+SHA512 (AlizaMS-1.10.3.tar.gz) = 21846cb26713ce83f0c1dd4368a2b5a1a2110c0417f74e9fa45f2366789320408abb3040fe44628b465e5f8c8b15d6634ac13b8ba1e74891214ae461c7318232

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-08 20:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-08 20:00 [rpms/alizams] main: Release 1.10.3 |Use Qt6 |Fix License tag Antonio Trande

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox