Accepting request 1311568 from Publishing

OBS-URL: https://build.opensuse.org/request/show/1311568
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texmaker?expand=0&rev=56

0001-Fix-build-with-Qt-6.10.patch

@@ -0,0 +1,30 @@
+From a4a067e5846f8ffe93bcd9540692d7f207ce8700 Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Tue, 14 Oct 2025 13:20:26 +0200
+Subject: [PATCH] Fix build with Qt 6.10
+
+The Qt 6 private targets have been split into separate CMake files since
+6.9 and must be found since Qt 6.10
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef6a4e6..f15af97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -388,6 +388,10 @@ set(CMAKE_AUTORCC ON)
+ 
+ find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)
+ 
++if(Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10)
++  find_package(Qt6 REQUIRED COMPONENTS CorePrivate)
++endif()
++
+ qt_standard_project_setup()
+ 
+ if (UNIX AND NOT APPLE)
+-- 
+2.51.0
+

CVE-2025-50952.patch

@@ -0,0 +1,18 @@
+---
+ 3rdparty/pdfium/third_party/libopenjpeg20/dwt.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: texmaker-6.0.1/3rdparty/pdfium/third_party/libopenjpeg20/dwt.c
+===================================================================
+--- texmaker-6.0.1.orig/3rdparty/pdfium/third_party/libopenjpeg20/dwt.c
++++ texmaker-6.0.1/3rdparty/pdfium/third_party/libopenjpeg20/dwt.c
+@@ -574,6 +574,9 @@ static OPJ_BOOL opj_dwt_decode_tile(cons
+ 	OPJ_UINT32 rh = (OPJ_UINT32)(tr->y1 - tr->y0);	/* height of the resolution level computed */
+ 
+ 	OPJ_UINT32 w = (OPJ_UINT32)(tilec->x1 - tilec->x0);
++	if (numres == 1U || w == 0) {
++		return OPJ_TRUE;
++	}
+ 
+ 	h.mem_count = opj_dwt_max_resolution(tr, numres);
+ 	if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof(OPJ_INT32) < (OPJ_UINT32)h.mem_count) {

texmaker-6.0.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:977ce580e25c1ab6e0bc3da103be0b43ebf60b8ce0d27273104fdd7f586177fc
-size 14920994

texmaker-6.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8c235df0cd8fd7714cd70d3b5ee363163b0254a9dea9180781b8f0e2e46caf6
+size 14932651

texmaker.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Oct 14 11:21:09 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add patch:
+  * 0001-Fix-build-with-Qt-6.10.patch
+
+-------------------------------------------------------------------
+Sun Sep 28 16:36:00 UTC 2025 - Olivier Belleux <o.g.m.belleux@gmail.com>
+
+- change %define gcc_ver 8 to %define gcc_ver 13 
+- add leap 16.0
+
+-------------------------------------------------------------------
+Fri Aug  8 10:37:30 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Add CVE-2025-50952.patch: guard against zero offset to a
+  potential nullptr (bsc#1247798,CVE-2025-50952); patch based on
+  upstream git master commit 0f3ca81 (gh#uclouvain/openjpeg#1510).
+
+-------------------------------------------------------------------
+Fri May  9 21:01:36 UTC 2025 - RN <R_Nik_C@proton.me>
+
+- Update to version 6.0.1:
+  * a trouble about the "open terminal" and "texdoc" has been fixed
+  * cs and pl tranlations have been updated
+  * a bug related to the non use of % !TEX root = has been fixed
+  * the combobox of the find/replace widgets are now case sensitive
+  * after comment/indent a selected text, all the corresponding
+    paragraphs are selected from the beginning of the first line
+    (user request)
+  * a trouble with the "reset/replace settings file" commands on Qt6
+    has been fixed
+  * a trouble with the "recent files" menu on Qt6 has been fixed
+
 -------------------------------------------------------------------
 Thu Sep  5 18:12:58 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

texmaker.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package texmaker
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,28 @@
 
 
 %if %{?is_opensuse} && 0%{?suse_version} <= 1650
-%define gcc_ver 8
+%define gcc_ver 13
 %endif
+
+
 Name:           texmaker
-Version:        6.0.0
+Version:        6.0.1
 Release:        0
 Summary:        LaTeX editor
 License:        BSD-3-Clause AND GPL-2.0-or-later
 Group:          Productivity/Publishing/TeX/Frontends
 URL:            http://www.xm1math.net/texmaker/
 Source:         http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM CVE-2025-50952.patch bsc#1247798 badshah400@gmail.com -- Guard against 0 offset to nullptr in openjpeg bundled with pdfium
+Patch0:         CVE-2025-50952.patch
+# PATCH-FIX-UPSTREAM 0001-Fix-build-with-Qt-6.10.patch -- Qt 6.10 compatibility fix
+Patch1:         0001-Fix-build-with-Qt-6.10.patch
 BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc%{?gcc_ver}-c++
 BuildRequires:  pkgconfig
 BuildRequires:  qt6-base-private-devel
-BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt6Concurrent)
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Core5Compat)