diff options
author | Denis Kozadaev <denis@dilos.org> | 2020-01-30 22:13:12 +0300 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2020-03-08 15:40:43 +0100 |
commit | f53be2a5db8dc889056420689a1913aeff7b0af5 (patch) | |
tree | 80c8bacab0e649d3a42a4525426ad1512f91c438 /dilos/tdesdk/debian/patches/dilos.patch | |
parent | fc267b3a7e513cfa519c60aab4c340a9588e60cb (diff) | |
download | tde-packaging-f53be2a5db8dc889056420689a1913aeff7b0af5.tar.gz tde-packaging-f53be2a5db8dc889056420689a1913aeff7b0af5.zip |
DilOS: tdesdk build pack
Signed-off-by: Denis Kozadaev <denis@dilos.org>
(cherry picked from commit e803ab9f23e7657fa39666791169e1670f6ce3cf)
Diffstat (limited to 'dilos/tdesdk/debian/patches/dilos.patch')
-rw-r--r-- | dilos/tdesdk/debian/patches/dilos.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dilos/tdesdk/debian/patches/dilos.patch b/dilos/tdesdk/debian/patches/dilos.patch new file mode 100644 index 000000000..5f1bd3ea0 --- /dev/null +++ b/dilos/tdesdk/debian/patches/dilos.patch @@ -0,0 +1,26 @@ +Index: tdesdk/cmake/modules/TDEMacros.cmake +=================================================================== +--- tdesdk.orig/cmake/modules/TDEMacros.cmake ++++ tdesdk/cmake/modules/TDEMacros.cmake +@@ -833,7 +833,7 @@ macro( tde_add_library _arg_target ) + + # set embedded archives + if( _embed ) +- list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive ) ++ list( INSERT _link 0 -Wl,-zallextract ${_embed} -Wl,-zdefaultextract ) + endif( _embed ) + + # set link libraries +Index: tdesdk/umbrello/umbrello/associationwidget.cpp +=================================================================== +--- tdesdk.orig/umbrello/umbrello/associationwidget.cpp ++++ tdesdk/umbrello/umbrello/associationwidget.cpp +@@ -1893,7 +1893,7 @@ void AssociationWidget::constrainTextPos + const int y0 = p0.y(); + const int x1 = p1.x(); + const int y1 = p1.y(); +- double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2; ++ double r = sqrt((double)(x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2; + if (textWidth > r) + r = textWidth; + // swap textCenter{X,Y} to convert from TQt coord.system. |