Accepting request 1233301 from science

OBS-URL: https://build.opensuse.org/request/show/1233301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/molsketch?expand=0&rev=10

Molsketch-0.8.0-src.tar.gz

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

Molsketch-0.8.1-src.tar.gz

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

molsketch-cmake-qt5-add-translation.patch

@@ -1,13 +0,0 @@
-Index: Molsketch-0.7.2/generateTranslations.cmake
-===================================================================
---- Molsketch-0.7.2.orig/generateTranslations.cmake
-+++ Molsketch-0.7.2/generateTranslations.cmake
-@@ -4,7 +4,7 @@ function(addTranslationResources _resour
- 
-   file(GLOB_RECURSE translationFiles *.ts)
-   set_source_files_properties(${translationFiles} PROPERTIES OUTPUT_LOCATION ${qmDir})
--  qt_add_translation(qmFileList ${translationFiles})
-+  qt5_add_translation(qmFileList ${translationFiles})
- 
-   set(qmResourcesFile "${qmDir}/${resourceFileName}.qrc")
-   file(WRITE ${qmResourcesFile} "<!DOCTYPE RCC><RCC version=\"1.0\">\n  <qresource prefix=\"i18n\">\n")

molsketch-include-numeric-header.patch

@@ -1,25 +0,0 @@
-Index: Molsketch-0.8.0/libmolsketch/painting/paintableaggregate.cpp
-===================================================================
---- Molsketch-0.8.0.orig/libmolsketch/painting/paintableaggregate.cpp
-+++ Molsketch-0.8.0/libmolsketch/painting/paintableaggregate.cpp
-@@ -22,6 +22,7 @@
- #include <QDebug>
- #include <QPainter>
- #include <algorithm>
-+#include <numeric>
- 
- namespace Molsketch {
- 
-Index: Molsketch-0.8.0/libmolsketch/CMakeLists.txt
-===================================================================
---- Molsketch-0.8.0.orig/libmolsketch/CMakeLists.txt
-+++ Molsketch-0.8.0/libmolsketch/CMakeLists.txt
-@@ -24,7 +24,7 @@ else(MSK_STATIC_LIB)
-         add_library(molsketch_LIB SHARED ${libmolsketch_SRCS} ${libmolsketch_UIS_H} ${libmolsketch_QM})
- endif(MSK_STATIC_LIB)
- set_target_properties(molsketch_LIB PROPERTIES OUTPUT_NAME "molsketch")
--set_property(TARGET molsketch_LIB PROPERTY CXX_STANDARD 14)
-+set_property(TARGET molsketch_LIB PROPERTY CXX_STANDARD 17)
- target_link_libraries(molsketch_LIB ${QT_LIBRARIES})
- 
- # Install the executable and the library

molsketch.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Dec 21 14:32:29 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 0.8.1:
+  * Fix color of newly inserted atoms and bonds.
+  * Fix color of radical electrons.
+  * Fix color of lone pairs.
+- Drop no longer needed patches:
+  * molsketch-cmake-qt5-add-translation.patch
+  * molsketch-include-numeric-header.patch
+- Switch to Qt6 for builds on openSUSE Tumbleweed.
+- Drop use of deprecated %suse_update_desktop_files.
+
 -------------------------------------------------------------------
 Tue Jul 11 10:16:01 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 

molsketch.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package molsketch
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,37 +18,35 @@
 
 %if 0%{?suse_version} < 1599
 %define gcc_ver 9
+%define qt_ver 5
+%else
+%define qt_ver 6
 %endif
 %define srcname Molsketch
 %define sover 1
 %define soname %{sover}
 Name:           molsketch
-Version:        0.8.0
+Version:        0.8.1
 Release:        0
 Summary:        2D molecular structures editor
 License:        GPL-2.0-or-later
 Group:          Productivity/Scientific/Chemistry
 URL:            https://molsketch.sourceforge.net
 Source0:        https://downloads.sourceforge.net/molsketch/Molsketch-%{version}-src.tar.gz
-# PATCH-FIX-UPSTREAM molsketch-cmake-qt5-add-translation.patch badshah400@gmail.com -- Use qt5_add_translation instead of qt_add_translation with cmake
-Patch0:         molsketch-cmake-qt5-add-translation.patch
-# PATCH-FIX-UPSTREAM molsketch-include-numeric-header.patch badshah400@gmail.com -- Include numeric header for transform_reduce
-Patch1:         molsketch-include-numeric-header.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc%{?gcc_ver}-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  rsvg-convert
-BuildRequires:  update-desktop-files
 BuildRequires:  (pkgconfig(openbabel-2.0) or pkgconfig(openbabel-3))
-BuildRequires:  cmake(Qt5LinguistTools)
-BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  pkgconfig(Qt5Svg)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  cmake(Qt%{qt_ver}LinguistTools)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Core)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Gui)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Network)
+BuildRequires:  pkgconfig(Qt%{qt_ver}PrintSupport)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Svg)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Test)
+BuildRequires:  pkgconfig(Qt%{qt_ver}Widgets)
 
 %description
 The purpose of this editor to help drawing molecules.
@@ -88,6 +86,9 @@ Help documentation for %{name}.
 %cmake \
 %if 0%{?gcc_ver}
   -DCMAKE_CXX_COMPILER:STRING=g++-%{gcc_ver} \
+%endif
+%if %{qt_ver} >= 6
+  -DMSK_QT6:BOOL=ON \
 %endif
   -DMSK_INSTALL_DOCS:PATH="/share/doc/packages/%{name}" \
 %{nil}
@@ -104,8 +105,6 @@ do
   install -m0644 %{name}-${sz}.png %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps/%{name}.png
 done
 
-%suse_update_desktop_file -c %{name} %{name} "2D molecular structures editor" %{name} Education Chemistry
-
 %fdupes -s %{buildroot}%{_datadir}
 
 %files