Accepting request 1307747 from GNOME:Apps

Update to version 1.6.2 (forwarded request 1307461 from xanders)

OBS-URL: https://build.opensuse.org/request/show/1307747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cherrytree?expand=0&rev=40

_service

@@ -3,11 +3,11 @@
     <param name="url">https://github.com/giuspen/cherrytree.git</param>
     <param name="scm">git</param>
     <param name="submodules">enable</param>
-    <param name="revision">master</param>
+    <param name="revision">eb9031255feb1db4455df70a7df34c75496ae3aa</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">cherrytree</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-pattern">v?(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
   <service mode="buildtime" name="tar" />

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/giuspen/cherrytree.git</param>
-              <param name="changesrevision">51f6e649aa063944293e33fb98b658abadf8d4a7</param></service></servicedata>
+              <param name="changesrevision">eb9031255feb1db4455df70a7df34c75496ae3aa</param></service></servicedata>

cherrytree-1.1.4+18.obscpio

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

cherrytree-1.6.2.obscpio

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

cherrytree-fix-metainfo-write.patch

@@ -0,0 +1,14 @@
+diff --git a/scripts/metainfo_xml_write.py b/scripts/metainfo_xml_write.py
+index d199038..0d3ada5 100755
+--- a/scripts/metainfo_xml_write.py
++++ b/scripts/metainfo_xml_write.py
+@@ -39,7 +39,7 @@ def main(args):
+     assert len(releases) == 1
+     releases[0].text = "\n  "
+     release_Element = ET.SubElement(releases[0], "release", version=VERSION, date=DATE)
+-    tree.write(METAINFO_XML_FILEPATH)
++    tree.write(METAINFO_XML_FILEPATH, xml_declaration=True, method='xml', encoding='UTF-8')
+ 
+ if __name__ == '__main__':
+     import sys
+

cherrytree.changes

@@ -1,3 +1,133 @@
+-------------------------------------------------------------------
+Sat Sep 20 00:30:10 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.6.2:
+  * fixed regression links to anchors no longer scrolling to the
+    target (#2768, #2766, #2389)
+  * fixed warningCtNodeData defined as struct but forward-declared
+    as class
+  * default for searching multiple words is back to 'exact match'
+    as much faster, last value set to be preserved across sessions
+    (#2767)
+  * msys2_prepare_standalone.sh fix
+
+-------------------------------------------------------------------
+Fri Sep 19 09:48:46 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.6.1:
+  * fixed search results reporting link content not limited in size
+    causing crash in all matches dialog
+  * trying to support silent mode in inno setup script (#2763)
+  * fixed create_ppa_package.py no longer working on 18.04 bionic
+  * fixed changelog indentation; removed oracular from ppa script
+    as no longer supported
+  * ro -> 100%
+  * de -> 100%
+  * updated supporters record
+  * fixed copying from code and pasting to rich text sometimes not
+    retaining syntax highlighting colours
+
+-------------------------------------------------------------------
+Thu Sep 11 12:23:24 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.6.0:
+  * fixed changelog indentation; removed oracular from ppa script
+    as no longer supported
+  * v1.6.0
+  * ro -> 100%
+  * de -> 100%
+  * updated supporters record
+  * fixed copying from code and pasting to rich text sometimes
+    not retaining syntax highlighting colours
+  * table light interface, fixed moving a column does not move
+    the column width
+  * es, pl -> 100%
+  * ko, pt, pt_BR, zh_TW -> 100%
+  * uk -> 100%
+
+-------------------------------------------------------------------
+Sat Jun 07 02:32:21 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.5.0:
+  + fixed cursor stops blinking (#2714)
+  + replace html non breaking spaces characters with normal spaces
+    when the target is xml (e.g. paste from clipboard)
+  + fixed Ctrl+V issues on ArchLinux (#2705)
+  + fixed Ctrl+V issues on ArchLinux (#2705)
+  + added tree icon for locale/language
+  + added SignPath credit (#2651)
+  + explorer tree search by typing to use the quick node selection
+    dialog (#1974)
+  + fr 100%
+  + fixed insert TOC not marking the text buffer for update if
+    empty (#1484)
+
+-------------------------------------------------------------------
+Fri Mar 28 07:38:37 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.4.0:
+  + increased default height of the dialogs to select an element
+    from a list
+  + settings to expand codeboxes automatically now separated for
+    width and height
+  + fixed on windows copy table and paste into microsoft word
+    results in plain text paste
+  + collapsible headers, when copy/cut a collapsed header ensure
+    that the hidden section is also set in the clipboard (#2389)
+  + collapsible headers, when copy/cut a collapsed header ensure
+    that the hidden section is also set in the clipboard
+  + use constants defined globally rather than copy/paste string
+    literals
+  + remove text formtting to also remove TOC anchors (#2389)
+  + collapsible headers, changed expanded/collapsed icon to arrows
+    (#2389)
+  + collapsible headers, expand automatically when moving a row of
+    text into a collapsed secion (#2389)
+- Remove update-desktop-files BuildRequies and
+  %suse_update_desktop_file from spec file.
+- Implement metainfo and .desktop checks, add desktop-file-utils
+  and appstream-glib to BuildRequires
+- Added cherrytree-fix-metainfo-write.patch to fix metainfo XML
+  header generation during build
+
+-------------------------------------------------------------------
+Fri Feb 28 10:20:06 UTC 2025 - gumsley_6@hotmail.com
+
+- Update to version 1.3.0+0:
+  + fixed table export to csv with empty cells (#2028)
+  + pt_BR 100%
+  + multifile storage, option of static embedded file path, fix 
+    insert in new node that was never saved (#2354)
+  + remove use of libcpputest-dev (#2645)
+  + es 100%
+  + tr 100%
+  + fixed search missing first match after a codebox (#2631)
+  + bg, ro 100%
+  + codebox toolbar button 'Copy Code' now marked for translation
+    (##2641)
+
+-------------------------------------------------------------------
+Tue Oct 15 06:44:50 UTC 2024 - gumsley_6@hotmail.com
+
+- Update to version 1.2.0:
+  * fixed crash pressing Ctrl+Z while editing table light cell
+  * trying to use gtksourceview to convert any encoding to utf8 and
+    lose libfribidi dependency
+  * trying to use gtksourceview to convert any encoding to utf8 and
+    lose libfribidi dependency
+  * do not prefix http:// when a URL-like prefix already exists
+    (#2570)
+  * updated create_ppa_package.py -22.10/mantic +24.10/oracular
+  * fixed links to nodes not working when exporting to html, single
+    file (#2570)
+  * fixed crash when moving (heavy) table row/column after porting
+    to libgtksourceview4 (#2562)
+  * implemented quick node selection typing part of the node name,
+    default keyboard shortcut to Ctrl+Shift+G
+    (#2552, work of @ericguin)
+  * implemented collapsible headers support when TOC is generated
+    (#2389)
+
 -------------------------------------------------------------------
 Thu Sep 12 10:59:13 UTC 2024 - dimstar@opensuse.org
 

cherrytree.obsinfo

@@ -1,4 +1,4 @@
 name: cherrytree
-version: 1.1.4+18
-mtime: 1725992357
-commit: 51f6e649aa063944293e33fb98b658abadf8d4a7
+version: 1.6.2
+mtime: 1758291821
+commit: eb9031255feb1db4455df70a7df34c75496ae3aa

cherrytree.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cherrytree
 #
-# 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,7 +17,7 @@
 
 
 Name:           cherrytree
-Version:        1.1.4+18
+Version:        1.6.2
 Release:        0
 Summary:        A hierarchical note taking application
 License:        GPL-3.0-or-later AND LGPL-2.1-only
@@ -26,12 +26,14 @@ URL:            https://www.giuspen.com/cherrytree/
 Source0:        %{name}-%{version}.tar.xz
 #PATCH-FIX-OPENSUSE cherrytree-set-git-version.patch malcolmlewis@opensuse.org -- Set git version in help about.
 Patch0:         cherrytree-set-git-version.patch
+Patch1:         cherrytree-fix-metainfo-write.patch
+BuildRequires:  appstream-glib
 BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
 BuildRequires:  python3-lxml
-BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(gspell-1)
 BuildRequires:  pkgconfig(gtkmm-3.0)
@@ -64,12 +66,12 @@ file with extension ".ctd".
 %cmake_install
 # Remove old mime registration files
 rm %{buildroot}%{_datadir}/mime-info/cherrytree.*
-%suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor
 %find_lang %{name} %{?no_lang_C}
 %fdupes -s %{buildroot}%{_datadir}
 
 %check
-## Empty section added as per rpmlint report
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %files
 %license license.txt