Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vnote for openSUSE:Factory checked in at 2026-07-02 20:12:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vnote (Old) and /work/SRC/openSUSE:Factory/.vnote.new.1982 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vnote" Thu Jul 2 20:12:31 2026 rev:7 rq:1363524 version:3.20.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vnote/vnote.changes 2021-12-07 00:02:01.212004635 +0100 +++ /work/SRC/openSUSE:Factory/.vnote.new.1982/vnote.changes 2026-07-02 20:16:20.715680448 +0200 @@ -1,0 +2,8 @@ +Sun Jun 28 21:40:16 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 3.20.1. Check the installed changes.md file for the + full list of changes. +- Add upstream change: + * 0001-fix-build-with-cmake-4.patch + +------------------------------------------------------------------- Old: ---- hunspell-efb0389.zip sonnet-403863f.zip syntax-highlighting-807895f.zip vnote-3.10.1.tar.gz vtextedit-08b440d.zip New: ---- 0001-fix-build-with-cmake-4.patch QHotkey.tar.xz _service vnote-3.20.1.tar.gz vtextedit.tar.xz ----------(New B)---------- New:- Add upstream change: * 0001-fix-build-with-cmake-4.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vnote.spec ++++++ --- /var/tmp/diff_new_pack.uN0pIe/_old 2026-07-02 20:16:21.643712550 +0200 +++ /var/tmp/diff_new_pack.uN0pIe/_new 2026-07-02 20:16:21.647712688 +0200 @@ -1,7 +1,7 @@ # # spec file for package vnote # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2026 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,90 +17,74 @@ Name: vnote -Version: 3.10.1 +Version: 3.20.1 Release: 0 Summary: A Vim-inspired note-taking application, especially for Markdown License: LGPL-3.0-only Group: Productivity/Text/Editors URL: https://github.com/tamlok/vnote Source0: https://github.com/tamlok/vnote/archive/v%{version}.tar.gz#/vnote-%{version}.tar.gz -Source1: vtextedit-08b440d.zip -Source2: hunspell-efb0389.zip -Source3: sonnet-403863f.zip -Source4: syntax-highlighting-807895f.zip -BuildRequires: libqt5-qtbase-devel >= 5.12 -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qtwebengine-devel -BuildRequires: unzip -BuildRequires: update-desktop-files -Recommends: libssl44 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source1: vtextedit.tar.xz +Source2: QHotkey.tar.xz +# PATCH-FIX-UPSTREAM 0001-fix-build-with-cmake-4.patch -- Fix build with CMake 4 +Patch0: 0001-fix-build-with-cmake-4.patch +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Sql) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Test) +BuildRequires: cmake(Qt6WebChannel) +BuildRequires: cmake(Qt6WebEngineWidgets) +BuildRequires: cmake(Qt6Widgets) +Provides: bundled(vtextedit) +Requires: qt6-sql-sqlite +# vnote doesn't install development files, moving the bundled library to a separate package isn't useful +Obsoletes: libVTextEdit1 < 3.20.1 +ExclusiveArch: %{x86_64} aarch64 riscv64 %description VNote is a note-taking application, designed especially for Markdown. VNote provides both note management and Markdown edit experience. -%package -n libVSyntaxHighlighting1 -Summary: Library files for vnote -Group: System/Libraries - -%description -n libVSyntaxHighlighting1 -This package provides library files for vnote. - -%package -n libVTextEdit1 -Summary: Library files for vnote -Group: System/Libraries - -%description -n libVTextEdit1 -This package provides library files for vnote. - %prep -%setup -q - +%autosetup -p1 cd libs -rm -r vtextedit -unzip %{_sourcedir}/vtextedit-08b440d.zip -mv vtextedit-* vtextedit - -cd vtextedit/src/libs -rm -r hunspell sonnet syntax-highlighting -unzip %{_sourcedir}/hunspell-efb0389.zip -mv hunspell-* hunspell -unzip %{_sourcedir}/sonnet-403863f.zip -mv sonnet-* sonnet -unzip %{_sourcedir}/syntax-highlighting-807895f.zip -mv syntax-highlighting-* syntax-highlighting +rmdir QHotkey vtextedit +/usr/lib/rpm/rpmuncompress -x %{SOURCE1} +/usr/lib/rpm/rpmuncompress -x %{SOURCE2} +cd .. + +# Useless and broken +sed -i '/Packaging.cmake/d' src/CMakeLists.txt + +# Use a less generic location for translations +sed -i 's#app:translations#app:vnote/translations#' src/main.cpp %build -mkdir build && cd build -qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP="/bin/true" ../vnote.pro -make %{?_smp_mflags} +%cmake_qt6 -DCMAKE_SKIP_RPATH:BOOL=TRUE + +%qt6_build %install -cd build -make install INSTALL_ROOT="%{buildroot}" -rm %{buildroot}%{_prefix}/lib/libVSyntaxHighlighting.so -rm %{buildroot}%{_prefix}/lib/libVTextEdit.so -%suse_update_desktop_file -r vnote Utility TextEditor +%qt6_install -%post -n libVSyntaxHighlighting1 -p /sbin/ldconfig -%postun -n libVSyntaxHighlighting1 -p /sbin/ldconfig +# Move translations to a less generic location +mkdir -p %{buildroot}%{_datadir}/vnote +mv %{buildroot}%{_datadir}/translations %{buildroot}%{_datadir}/vnote/translations -%post -n libVTextEdit1 -p /sbin/ldconfig -%postun -n libVTextEdit1 -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root) +%license COPYING.LESSER +%doc README.md changes.md %{_bindir}/vnote -%{_bindir}/vnote_extra.rcc %{_datadir}/applications/vnote.desktop %{_datadir}/icons/hicolor -%doc README.md changes.md -%license COPYING.LESSER - -%files -n libVSyntaxHighlighting1 -%{_prefix}/lib/libVSyntaxHighlighting.so* - -%files -n libVTextEdit1 -%{_prefix}/lib/libVTextEdit.so* +%{_datadir}/vnote_extra.rcc +%{_datadir}/vnote/ +%{_libdir}/libVTextEdit.so ++++++ 0001-fix-build-with-cmake-4.patch ++++++ >From ad4660e9ee50d8f646e8c1e00fa5e892328ac13c Mon Sep 17 00:00:00 2001 From: Quentin Frey <[email protected]> Date: Tue, 2 Dec 2025 08:32:34 +0100 Subject: [PATCH] fix build with cmake 4 (#2671) --- src/CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f37430f..c7387f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,14 +31,6 @@ set_source_files_properties(${VX_APP_ICON_MACOS} PROPERTIES # Translations set(VX_TS_FILES data/core/translations/vnote_zh_CN.ts data/core/translations/vnote_ja.ts) -if((QT_DEFAULT_MAJOR_VERSION EQUAL 6)) - if((Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.7.0)) - qt_add_lupdate(TS_FILES ${VX_TS_FILES} - SOURCE_TARGETS vnote) - else() - qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES}) - endif() -endif() # Generate .qm files from .ts files (lrelease) set_source_files_properties(${VX_TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/translations") @@ -68,6 +60,16 @@ add_executable(vnote WIN32 MACOSX_BUNDLE ${VX_APP_ICON_RC_WIN} ${VX_APP_ICON_MACOS} ${VX_RESOURCE_FILES} ) +# Translations +if((QT_DEFAULT_MAJOR_VERSION EQUAL 6)) + if((Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.7.0)) + qt_add_lupdate(TS_FILES ${VX_TS_FILES} + SOURCE_TARGETS vnote) + else() + qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES}) + endif() +endif() + add_dependencies(vnote VX_EXTRA_RESOURCE) set(VX_LIBS_FOLDER ../libs) -- 2.54.0 ++++++ _service ++++++ <services> <!-- git submodules used by vnote --> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/vnotex/vtextedit.git</param> <param name="revision">b38bac974</param> <param name="version">_none_</param> </service> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/vnotex/QHotkey.git</param> <param name="version">_none_</param> </service> <service name="tar" mode="disabled"/> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ vnote-3.10.1.tar.gz -> vnote-3.20.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/vnote/vnote-3.10.1.tar.gz /work/SRC/openSUSE:Factory/.vnote.new.1982/vnote-3.20.1.tar.gz differ: char 12, line 1
