From c0e2e48db48c8870aefa1f60a9d6031cb5e3b99a Mon Sep 17 00:00:00 2001
From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com>
Date: Fri, 4 Sep 2020 19:29:37 -0500
Subject: [PATCH] Fix CMake Package and DBUS Names (#819)

* Fix CMake Packaging to properly package assets.
---
 CMakeLists.txt                                |  1 +
 data/dbus/make/org.dharkael.Flameshot.service |  2 +-
 ...meshot.xml => org.flameshot.Flameshot.xml} |  2 +-
 ...ervice => org.flameshot.Flameshot.service} |  2 +-
 src/CMakeLists.txt                            | 30 +++++++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)
 rename data/dbus/{org.dharkael.Flameshot.xml => org.flameshot.Flameshot.xml} (98%)
 rename data/dbus/package/{org.dharkael.Flameshot.service => org.flameshot.Flameshot.service} (57%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75877649..6a307a5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
+#cmake_policy(SET CMP0076 OLD)
 
 project(
   flameshot
diff --git a/data/dbus/make/org.dharkael.Flameshot.service b/data/dbus/make/org.dharkael.Flameshot.service
index 4a24495b..9866f785 100644
--- a/data/dbus/make/org.dharkael.Flameshot.service
+++ b/data/dbus/make/org.dharkael.Flameshot.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.dharkael.Flameshot
+Name=org.flameshot.Flameshot
 Exec=/usr/local/bin/flameshot
diff --git a/data/dbus/org.dharkael.Flameshot.xml b/data/dbus/org.flameshot.Flameshot.xml
similarity index 98%
rename from data/dbus/org.dharkael.Flameshot.xml
rename to data/dbus/org.flameshot.Flameshot.xml
index ab51fbbe..9a4f4860 100644
--- a/data/dbus/org.dharkael.Flameshot.xml
+++ b/data/dbus/org.flameshot.Flameshot.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.dharkael.Flameshot">
+  <interface name="org.flameshot.Flameshot">
 
       <!--
         graphicCapture:
diff --git a/data/dbus/package/org.dharkael.Flameshot.service b/data/dbus/package/org.flameshot.Flameshot.service
similarity index 57%
rename from data/dbus/package/org.dharkael.Flameshot.service
rename to data/dbus/package/org.flameshot.Flameshot.service
index 6b11aac6..354eed21 100644
--- a/data/dbus/package/org.dharkael.Flameshot.service
+++ b/data/dbus/package/org.flameshot.Flameshot.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.dharkael.Flameshot
+Name=org.flameshot.Flameshot
 Exec=/usr/bin/flameshot
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04b7896f..74efb17a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,7 +121,37 @@ endforeach()
 include(GNUInstallDirs)
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Flameshot)
 
+# Install binary
 install(
   TARGETS flameshot
   EXPORT flameshot-targets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# Install desktop files, completion and dbus files
+configure_file(${CMAKE_SOURCE_DIR}/docs/desktopEntry/package/flameshot.desktop
+               ${CMAKE_CURRENT_BINARY_DIR}/share/applications/flameshot.desktop COPYONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/docs/bash-completion/flameshot
+               ${CMAKE_CURRENT_BINARY_DIR}/share/bash-completions/completions/flameshot COPYONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/data/dbus/org.flameshot.Flameshot.xml
+               ${CMAKE_CURRENT_BINARY_DIR}/share/dbus-1/interfaces/org.flameshot.Flameshot.xml COPYONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/data/dbus/package/org.flameshot.Flameshot.service
+               ${CMAKE_CURRENT_BINARY_DIR}/share/dbus-1/services/org.flameshot.Flameshot.service COPYONLY)
+
+# Install Icons
+configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/flameshot.png
+               ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/48x48/apps/flameshot.png COPYONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/flameshot.png
+               ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/128x128/apps/flameshot.png COPYONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/flameshot.svg
+               ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY)
+
+# Install assets
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+
+# Install Translations
+install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/flameshot/translations)