cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various bugfixes from the KOffice-1.4.x branch.

Browse Source 
Submitted by: Raphael Langerhorst <raphael-langerhorst@gmx.at>
This commit is contained in:
Michael Nottebrock 2005-07-10 17:45:56 +00:00
parent 1172f6c062
commit 3eab162b94
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=138819
15 changed files with 15183 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editors/calligra/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.4.0a
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}

5060
editors/calligra/files/patch-1.4.0_patchset_1.diff Normal file
View File

File diff suppressed because it is too large Load Diff

11
editors/calligra/files/patch-filters-kspread-excel-sidewinder-excel.cpp
View File

@ -1,11 +0,0 @@
--- filters/kspread/excel/sidewinder/excel.cpp.orig Wed Jun 29 02:06:17 2005
+++ filters/kspread/excel/sidewinder/excel.cpp Wed Jun 29 02:04:06 2005
@@ -5412,7 +5412,7 @@
case 10: valueFormat = "0.00%"; break;
case 11: valueFormat = "0.00E+00"; break;
case 12: valueFormat = "#?/?"; break;
- case 13: valueFormat = "#\?\?\/\?\?"; break;
+ case 13: valueFormat = "#\?\?/\?\?"; break;
case 14: valueFormat = "M/D/YY"; break;
case 15: valueFormat = "D-MMM-YY"; break;
case 16: valueFormat = "D-MMM"; break;

11
editors/calligra/files/patch-krita-plugins-cimg-CImg.h
View File

@ -1,11 +0,0 @@
--- krita/plugins/cimg/CImg.h.orig Tue Jun 28 02:31:30 2005
+++ krita/plugins/cimg/CImg.h Tue Jun 28 02:32:10 2005
@@ -5135,7 +5135,7 @@
if (ny1<0 || ny0>=dimy()) return *this;
if (ny0<0) { nx0-=ny0*(nx1-nx0)/(ny1-ny0); ny0=0; }
if (ny1>=dimy()) { nx1+=(ny1-dimy())*(nx0-nx1)/(ny1-ny0); ny1=dimy()-1;}
- const unsigned int dmax = (unsigned int)cimg::max(std::abs(nx1-nx0),ny1-ny0), whz = width*height*depth;
+ const unsigned int dmax = (unsigned int)cimg::max(std::abs((long int)(nx1-nx0)),(long int)(ny1-ny0)), whz = width*height*depth;
const float px = dmax?(nx1-nx0)/(float)dmax:0, py = dmax?(ny1-ny0)/(float)dmax:0;
float x = (float)nx0, y = (float)ny0;
if (opacity>=1) for (unsigned int t=0; t<=dmax; t++) {

13
editors/calligra/files/patch-kspread-dialogs-kspread_dlg_database.cc
View File

@ -1,13 +0,0 @@
--- kspread/dialogs/kspread_dlg_database.cc.orig Tue Jun 28 03:42:22 2005
+++ kspread/dialogs/kspread_dlg_database.cc Tue Jun 28 03:48:20 2005
@@ -600,8 +600,8 @@
// An update command must also be followed by a space, or it would be parsed
// as an identifier.
// For sanity, also check that there is a SELECT
- QRegExp couldModifyDB( "(^|[( \s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
- QRegExp couldQueryDB( "(^|[( \s])(SELECT) ", false /* cs */ );
+ QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
+ QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ );
if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 )
{

1
editors/koffice-kde3/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.4.0a
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}

5060
editors/koffice-kde3/files/patch-1.4.0_patchset_1.diff Normal file
View File

File diff suppressed because it is too large Load Diff

11
editors/koffice-kde3/files/patch-filters-kspread-excel-sidewinder-excel.cpp
View File

@ -1,11 +0,0 @@
--- filters/kspread/excel/sidewinder/excel.cpp.orig Wed Jun 29 02:06:17 2005
+++ filters/kspread/excel/sidewinder/excel.cpp Wed Jun 29 02:04:06 2005
@@ -5412,7 +5412,7 @@
case 10: valueFormat = "0.00%"; break;
case 11: valueFormat = "0.00E+00"; break;
case 12: valueFormat = "#?/?"; break;
- case 13: valueFormat = "#\?\?\/\?\?"; break;
+ case 13: valueFormat = "#\?\?/\?\?"; break;
case 14: valueFormat = "M/D/YY"; break;
case 15: valueFormat = "D-MMM-YY"; break;
case 16: valueFormat = "D-MMM"; break;

11
editors/koffice-kde3/files/patch-krita-plugins-cimg-CImg.h
View File

@ -1,11 +0,0 @@
--- krita/plugins/cimg/CImg.h.orig Tue Jun 28 02:31:30 2005
+++ krita/plugins/cimg/CImg.h Tue Jun 28 02:32:10 2005
@@ -5135,7 +5135,7 @@
if (ny1<0 || ny0>=dimy()) return *this;
if (ny0<0) { nx0-=ny0*(nx1-nx0)/(ny1-ny0); ny0=0; }
if (ny1>=dimy()) { nx1+=(ny1-dimy())*(nx0-nx1)/(ny1-ny0); ny1=dimy()-1;}
- const unsigned int dmax = (unsigned int)cimg::max(std::abs(nx1-nx0),ny1-ny0), whz = width*height*depth;
+ const unsigned int dmax = (unsigned int)cimg::max(std::abs((long int)(nx1-nx0)),(long int)(ny1-ny0)), whz = width*height*depth;
const float px = dmax?(nx1-nx0)/(float)dmax:0, py = dmax?(ny1-ny0)/(float)dmax:0;
float x = (float)nx0, y = (float)ny0;
if (opacity>=1) for (unsigned int t=0; t<=dmax; t++) {

13
editors/koffice-kde3/files/patch-kspread-dialogs-kspread_dlg_database.cc
View File

@ -1,13 +0,0 @@
--- kspread/dialogs/kspread_dlg_database.cc.orig Tue Jun 28 03:42:22 2005
+++ kspread/dialogs/kspread_dlg_database.cc Tue Jun 28 03:48:20 2005
@@ -600,8 +600,8 @@
// An update command must also be followed by a space, or it would be parsed
// as an identifier.
// For sanity, also check that there is a SELECT
- QRegExp couldModifyDB( "(^|[( \s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
- QRegExp couldQueryDB( "(^|[( \s])(SELECT) ", false /* cs */ );
+ QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
+ QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ );
if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 )
{

1
editors/koffice-kde4/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.4.0a
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}

5060
editors/koffice-kde4/files/patch-1.4.0_patchset_1.diff Normal file
View File

File diff suppressed because it is too large Load Diff

11
editors/koffice-kde4/files/patch-filters-kspread-excel-sidewinder-excel.cpp
View File

@ -1,11 +0,0 @@
--- filters/kspread/excel/sidewinder/excel.cpp.orig Wed Jun 29 02:06:17 2005
+++ filters/kspread/excel/sidewinder/excel.cpp Wed Jun 29 02:04:06 2005
@@ -5412,7 +5412,7 @@
case 10: valueFormat = "0.00%"; break;
case 11: valueFormat = "0.00E+00"; break;
case 12: valueFormat = "#?/?"; break;
- case 13: valueFormat = "#\?\?\/\?\?"; break;
+ case 13: valueFormat = "#\?\?/\?\?"; break;
case 14: valueFormat = "M/D/YY"; break;
case 15: valueFormat = "D-MMM-YY"; break;
case 16: valueFormat = "D-MMM"; break;

11
editors/koffice-kde4/files/patch-krita-plugins-cimg-CImg.h
View File

@ -1,11 +0,0 @@
--- krita/plugins/cimg/CImg.h.orig Tue Jun 28 02:31:30 2005
+++ krita/plugins/cimg/CImg.h Tue Jun 28 02:32:10 2005
@@ -5135,7 +5135,7 @@
if (ny1<0 || ny0>=dimy()) return *this;
if (ny0<0) { nx0-=ny0*(nx1-nx0)/(ny1-ny0); ny0=0; }
if (ny1>=dimy()) { nx1+=(ny1-dimy())*(nx0-nx1)/(ny1-ny0); ny1=dimy()-1;}
- const unsigned int dmax = (unsigned int)cimg::max(std::abs(nx1-nx0),ny1-ny0), whz = width*height*depth;
+ const unsigned int dmax = (unsigned int)cimg::max(std::abs((long int)(nx1-nx0)),(long int)(ny1-ny0)), whz = width*height*depth;
const float px = dmax?(nx1-nx0)/(float)dmax:0, py = dmax?(ny1-ny0)/(float)dmax:0;
float x = (float)nx0, y = (float)ny0;
if (opacity>=1) for (unsigned int t=0; t<=dmax; t++) {

13
editors/koffice-kde4/files/patch-kspread-dialogs-kspread_dlg_database.cc
View File

@ -1,13 +0,0 @@
--- kspread/dialogs/kspread_dlg_database.cc.orig Tue Jun 28 03:42:22 2005
+++ kspread/dialogs/kspread_dlg_database.cc Tue Jun 28 03:48:20 2005
@@ -600,8 +600,8 @@
// An update command must also be followed by a space, or it would be parsed
// as an identifier.
// For sanity, also check that there is a SELECT
- QRegExp couldModifyDB( "(^|[( \s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
- QRegExp couldQueryDB( "(^|[( \s])(SELECT) ", false /* cs */ );
+ QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
+ QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ );
if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 )
{