[neon/kde/marble/Neon/release-lts] debian/patches: obsolete patch

Jonathan Riddell null at kde.org
Thu Apr 22 14:57:48 BST 2021


Git commit 51c1c5d8badd8867b077ae363024bb1d2a5cec9e by Jonathan Riddell.
Committed on 22/04/2021 at 13:57.
Pushed by jriddell into branch 'Neon/release-lts'.

obsolete patch

D  +0    -20   debian/patches/install-marble-maps.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/marble/commit/51c1c5d8badd8867b077ae363024bb1d2a5cec9e

diff --git a/debian/patches/install-marble-maps.diff b/debian/patches/install-marble-maps.diff
deleted file mode 100644
index 30ef22b..0000000
--- a/debian/patches/install-marble-maps.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Install marble-maps
- Install marble-maps again after the upstream refactoring targeted at Android
- (commit 1e87366b30d554ee54acd266ad0524b1f4d95e2a).
-Forwarded: no
-Last-Update: 2020-04-26
-
---- a/src/apps/marble-maps/CMakeLists.txt
-+++ b/src/apps/marble-maps/CMakeLists.txt
-@@ -42,3 +42,10 @@ target_link_libraries (
- 
- FILE(GLOB QML_FILES *.qml)
- add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
-+
-+if (NOT ANDROID)
-+    if(APPS_INSTALL_DIR)
-+        install(PROGRAMS org.kde.marble.maps.desktop DESTINATION ${APPS_INSTALL_DIR})
-+    endif(APPS_INSTALL_DIR)
-+    install(TARGETS marble-maps RUNTIME DESTINATION bin)
-+endif()
diff --git a/debian/patches/series b/debian/patches/series
index 8146714..16aa8eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 do_not_install_private_headers
 allow-svg-bookmark-icons.patch
-install-marble-maps.diff


More information about the Neon-commits mailing list