[neon/snap-packaging/k-calc-6] /: remove it all

Carlos De Maine null at kde.org
Tue May 7 09:37:24 BST 2024


Git commit 73824e241dc953973b77d7db317346a1e53682eb by Carlos De Maine.
Committed on 03/05/2024 at 01:30.
Pushed by carlosdem into branch 'master'.

remove it all

D  +0    -14   snap/local/dontusefullpathinsymlink.patch
M  +0    -3    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/k-calc-6/-/commit/73824e241dc953973b77d7db317346a1e53682eb

diff --git a/snap/local/dontusefullpathinsymlink.patch b/snap/local/dontusefullpathinsymlink.patch
deleted file mode 100644
index 3fdb3490..00000000
--- a/snap/local/dontusefullpathinsymlink.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 354ab6f..ab46bde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,7 +170,7 @@ install( FILES kcalc.kcfg  DESTINATION ${KDE_INSTALL_KCFGDIR})
- install( FILES kcalcrc.upd  DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update)
- install( DIRECTORY DESTINATION "${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel" )
- install(
--    CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \"${KDE_INSTALL_FULL_APPDIR}/org.kde.kcalc.desktop\" \"\$ENV{DESTDIR}${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel/org.kde.kcalc.desktop\")"
-+    CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \"${KDE_INSTALL_APPDIR}/org.kde.kcalc.desktop\" \"\$ENV{DESTDIR}${KDE_INSTALL_FULL_DATAROOTDIR}/kglobalaccel/org.kde.kcalc.desktop\")"
- )
-
- ki18n_install(po)
-
diff --git a/snapcraft.yaml b/snapcraft.yaml
index cc0b0d93..d3e34fa1 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -34,10 +34,7 @@ package-repositories:
     url: http://archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
-    patches:
     kcalc:
-        after:
-        - patches
         parse-info:
         - usr/share/metainfo/org.kde.kcalc.appdata.xml
         plugin: cmake



More information about the Neon-commits mailing list