From a815976a0aebcb84d0d4290b4f17f015f7212436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 31 Oct 2020 01:41:46 +0100 Subject: FreeBSD: Update for final release R14.0.9. Switch several applications to CMake. Add ports for several applications. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- freebsd/tdepim/distinfo | 6 +- ...ch-bp000-fix-korganizer-round-redefinition.diff | 66 ++++++++++++++++++++++ freebsd/tdepim/pkg-plist | 4 ++ 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 freebsd/tdepim/files/patch-bp000-fix-korganizer-round-redefinition.diff (limited to 'freebsd/tdepim') diff --git a/freebsd/tdepim/distinfo b/freebsd/tdepim/distinfo index a49165055..869a7e876 100644 --- a/freebsd/tdepim/distinfo +++ b/freebsd/tdepim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586737024 -SHA256 (TDE/tdepim-trinity_14.0.8.orig.tar.xz) = 4627eeda1a99ffa1a31228dbc76a7667be117f8dd45a0bbb3da16b026021d819 -SIZE (TDE/tdepim-trinity_14.0.8.orig.tar.xz) = 9357184 +TIMESTAMP = 1602989421 +SHA256 (TDE/tdepim-trinity_14.0.9.orig.tar.xz) = bfc0de15f814b8f7d567d63e0a11ee3a8f44d5810a492d1274a4421360b7a2b6 +SIZE (TDE/tdepim-trinity_14.0.9.orig.tar.xz) = 9406140 diff --git a/freebsd/tdepim/files/patch-bp000-fix-korganizer-round-redefinition.diff b/freebsd/tdepim/files/patch-bp000-fix-korganizer-round-redefinition.diff new file mode 100644 index 000000000..aa5e1e5cc --- /dev/null +++ b/freebsd/tdepim/files/patch-bp000-fix-korganizer-round-redefinition.diff @@ -0,0 +1,66 @@ +commit 1762272863a8f3440d8b3f5e8afd1c221bab552d +Author: Slávek Banko +Date: Thu Oct 29 01:03:10 2020 +0100 + + Fix FTBFS due to redefine the 'round' symbol in korganizer. + + Signed-off-by: Slávek Banko + +diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp +index 9eecda39..c094ad84 100644 +--- a/korganizer/printing/calprintpluginbase.cpp ++++ b/korganizer/printing/calprintpluginbase.cpp +@@ -38,7 +38,7 @@ + + #ifndef KORG_NOPRINTER + +-inline int round(const double x) ++inline int roundToInt(const double x) + { + return int(x > 0.0 ? x + 0.5 : x - 0.5); + } +@@ -1178,7 +1178,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect + + // Fill the remaining space (if a month has less days than others) with a crossed-out pattern + if ( daysinmonthsetYMD( day, dt.year(), dt.month(), d+1 ); +- TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + round(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); ++ TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + roundToInt(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); + // FIXME: When using a border width of 0 for event boxes, don't let the rectangles overlap, i.e. subtract 1 from the top or bottom! +- dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) - 1 ); ++ dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) - 1 ); + + p.setBrush( isWorkingDay( day )?workdayColor:holidayColor ); + p.drawRect( dayBox ); +@@ -1314,9 +1314,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect + int minsToEnd = starttime.secsTo( placeItem->end() )/60; + + TQRect eventBox( xstartcont + placeItem->subCell()*17, +- daysBox.top() + round( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), ++ daysBox.top() + roundToInt( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), + 14, 0 ); +- eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); ++ eventBox.setBottom( daysBox.top() + roundToInt( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); + drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() ); + newxstartcont = TQMAX( newxstartcont, eventBox.right() ); + } +@@ -1327,9 +1327,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect + for ( int d=0; d