From ed76ffa529c7abaebf6ccd2898fa31d5915ffedd Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 15 Jun 2025 18:51:57 +0200 Subject: [PATCH] Refresh all patches. --- debian/changelog | 1 + debian/patches/cmake-installs.patch | 18 ++++++++++++++---- debian/patches/do-not-phone-home.patch | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16b4676..c2e5933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ vym (2.9.576-1) UNRELEASED; urgency=medium The files generated by vym are incompatible with release before 2.9.500. * Move Build-Depends from Qt5 to Qt6. + * Refresh all patches. -- Sven Hoexter Sun, 15 Jun 2025 18:38:56 +0200 diff --git a/debian/patches/cmake-installs.patch b/debian/patches/cmake-installs.patch index b1ceb59..2c3f859 100644 --- a/debian/patches/cmake-installs.patch +++ b/debian/patches/cmake-installs.patch @@ -1,13 +1,13 @@ -Description: Install only doc folder content and do not install - the superfluous license file. +Description: Install only doc folder content, and Install Icons + Debian specific changes for our own packaging. Author: Sven Hoexter -Last-Update: 2024-05-03 +Last-Update: 2025-06-015 Forwarded: not-needed Index: vym/CMakeLists.txt =================================================================== --- vym.orig/CMakeLists.txt +++ vym/CMakeLists.txt -@@ -160,9 +160,9 @@ add_custom_target(make-translations-dire +@@ -169,16 +169,16 @@ add_custom_target(make-translations-dire add_dependencies(vym make-translations-directory) install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) @@ -19,3 +19,13 @@ Index: vym/CMakeLists.txt install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) if(UNIX) + install(FILES icons/vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps) +- # Disabling PR #109 for now: +- # file(CREATE_LINK ../apps/vym.png application-x-vym.png SYMBOLIC) +- # install(FILES ${CMAKE_BINARY_DIR}/application-x-vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes) ++ # Debian special, install icons and hicolor theme links ++ file(CREATE_LINK ../apps/vym.png application-x-vym.png SYMBOLIC) ++ install(FILES ${CMAKE_BINARY_DIR}/application-x-vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes) + install(FILES config/vym.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages) + install(FILES config/vym.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + endif() diff --git a/debian/patches/do-not-phone-home.patch b/debian/patches/do-not-phone-home.patch index 3f79575..bfc3d8b 100644 --- a/debian/patches/do-not-phone-home.patch +++ b/debian/patches/do-not-phone-home.patch @@ -6,7 +6,7 @@ Index: vym/src/mainwindow.cpp =================================================================== --- vym.orig/src/mainwindow.cpp +++ vym/src/mainwindow.cpp -@@ -7259,6 +7259,7 @@ void Main::checkReleaseNotes () +@@ -7926,6 +7926,7 @@ void Main::checkReleaseNotes () bool Main::downloadsEnabled(bool userTriggered) { -- 2.47.3