Shayan Doust pushed to branch master at Debian Med / fast
Commits:
b750469e by Shayan Doust at 2019-09-22T20:59:08Z
Remove contrib dependency
- - - - -
77ff787e by Shayan Doust at 2019-09-22T22:41:24Z
Patch to eliminate the need for contrib fonts package
- - - - -
91a0260a by Shayan Doust at 2019-09-22T22:43:37Z
Header to patch
- - - - -
4 changed files:
- debian/control
- debian/patches/modify_assets_location.patch
- + debian/patches/remove_ubuntu_fonts_from_src.patch
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -68,8 +68,7 @@ Package: libfast-examples
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libfast0,
- ttf-ubuntu-font-family
+ libfast0
Description: example binaries for "FAST" Heterogeneous Medical Image Computing
An open-source cross-platform framework with the main goal of making it
easier to do processing and visualization of medical images on
=====================================
debian/patches/modify_assets_location.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-09-01
Index: fast/source/FAST/Config.cpp
===================================================================
---- fast.orig/source/FAST/Config.cpp 2019-09-01 14:33:47.704429399 +0100
-+++ fast/source/FAST/Config.cpp 2019-09-01 14:33:47.700429376 +0100
+--- fast.orig/source/FAST/Config.cpp 2019-09-22 22:03:18.701184884 +0100
++++ fast/source/FAST/Config.cpp 2019-09-22 22:03:18.701184884 +0100
@@ -75,10 +75,10 @@
return;
@@ -34,19 +34,3 @@ Index: fast/source/FAST/Config.cpp
mPipelinePath = getPath() + "../pipelines/";
loadConfiguration();
}
-Index: fast/source/FAST/Visualization/Window.cpp
-===================================================================
---- fast.orig/source/FAST/Visualization/Window.cpp 2019-09-01
14:33:47.704429399 +0100
-+++ fast/source/FAST/Visualization/Window.cpp 2019-09-01 14:33:47.704429399
+0100
-@@ -121,9 +121,9 @@
- QApplication::setWindowIcon(QIcon((Config::getDocumentationPath() +
"images/fast_icon.png").c_str()));
-
- // Add all fonts in fonts folder
-- for(auto&& filename :
getDirectoryList(join(Config::getDocumentationPath(), "fonts"))) {
-+ for(auto&& filename :
getDirectoryList(join("/usr/share/fonts/truetype", "ubuntu"))) {
- if(filename.substr(filename.size()-4) == ".ttf") {
--
QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "fonts",
filename).c_str());
-+
QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(),
"ubuntu", filename).c_str());
- }
- }
- } else {
=====================================
debian/patches/remove_ubuntu_fonts_from_src.patch
=====================================
@@ -0,0 +1,27 @@
+Description: eliminate the need for third party fonts
+ Fonts needed are part of ubuntu ttf package which is contrib and this is not
needed so remove this from src.
+Author: Shayan Doust <[email protected]>
+Last-Update: 2019-09-22
+---
+
+Index: fast/source/FAST/Visualization/Window.cpp
+===================================================================
+--- fast.orig/source/FAST/Visualization/Window.cpp 2019-09-22
23:41:42.852869766 +0100
++++ fast/source/FAST/Visualization/Window.cpp 2019-09-22 23:41:42.848869719
+0100
+@@ -121,11 +121,11 @@
+ QApplication::setWindowIcon(QIcon((Config::getDocumentationPath() +
"images/fast_icon.png").c_str()));
+
+ // Add all fonts in fonts folder
+- for(auto&& filename :
getDirectoryList(join(Config::getDocumentationPath(), "fonts"))) {
+- if(filename.substr(filename.size()-4) == ".ttf") {
+-
QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "fonts",
filename).c_str());
+- }
+- }
++ //for(auto&& filename :
getDirectoryList(join(Config::getDocumentationPath(), "fonts"))) {
++ // if(filename.substr(filename.size()-4) == ".ttf") {
++ //
QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "fonts",
filename).c_str());
++ //}
++ //}
+ } else {
+ Reporter::info() << "QApp already exists.." << Reporter::end();
+ }
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+remove_ubuntu_fonts_from_src.patch
modify_assets_location.patch
opencl_header.patch
fix_source_openigtlink.patch
View it on GitLab:
https://salsa.debian.org/med-team/fast/compare/37e51b5a4b1a4a3161a964fbdefdd984b6c4dfad...91a0260a710ab34149eb2120b26cc24d0e1d3fea
--
View it on GitLab:
https://salsa.debian.org/med-team/fast/compare/37e51b5a4b1a4a3161a964fbdefdd984b6c4dfad...91a0260a710ab34149eb2120b26cc24d0e1d3fea
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
