[SCM] cantata/master: Use packaged font-awesome

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b5822a5f97d8642588e7b4d861190d4c5b68c64e
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Aug 2 13:44:45 2017 +1000

    Use packaged font-awesome

diff --git a/debian/control b/debian/control
index c959505..ccad910 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ fonts-font-awesome,
  libqt5sql5-sqlite
 Recommends:
  liburi-perl
diff --git a/debian/copyright b/debian/copyright
index db1b983..97d5e00 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,7 @@ Files-Excluded:
     3rdparty/qtsingleapplication
     3rdparty/qxt
     windows/icu
+    support/fontawesome-webfont.ttf
 Comment: Unneeded 3rd party source code removed
 License: GPL-3+
 
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..e88f82b
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+/usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf /usr/share/cantata/fonts/fontawesome-webfont.ttf
diff --git a/debian/patches/package-font-awesome.patch b/debian/patches/package-font-awesome.patch
new file mode 100644
index 0000000..0b6e0e8
--- /dev/null
+++ b/debian/patches/package-font-awesome.patch
@@ -0,0 +1,20 @@
+Description: Use packaged version of fontawesome-webfont.ttf
+ Don't try to install a local copy of fontawesome, instead relying on
+ a symlink to the font that will be dropped into place.
+Author: Stuart Prescott <stuart at debian.org>
+--- a/support/CMakeLists.txt
++++ b/support/CMakeLists.txt
+@@ -12,13 +12,6 @@
+      pagewidget.cpp combobox.cpp configdialog.cpp monoicon.cpp)
+ 
+ set(SUPPORT_MOC_HDRS fancytabwidget.h messagewidget.h inputdialog.h pagewidget.h action.h actioncollection.h configdialog.h)
+-if (APPLE)
+-    install(FILES fontawesome-webfont.ttf DESTINATION ${MACOSX_BUNDLE_RESOURCES}/fonts)
+-elseif (WIN32)
+-    install(FILES fontawesome-webfont.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/fonts)
+-else ()
+-    install(FILES fontawesome-webfont.ttf DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/fonts)
+-endif ()
+ 
+ set(SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} combobox.h)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6e2866a..dcf6a34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+package-font-awesome.patch
 ebur128-location.patch

-- 
cantata packaging