aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorfluffy <fluffy@FreeBSD.org>2009-11-29 15:24:11 +0800
committerfluffy <fluffy@FreeBSD.org>2009-11-29 15:24:11 +0800
commit24029df115153087041c1c491ed9b79c18098383 (patch)
tree75d7b63c851cdaa532573a02e74a59fece34244d /editors
parent270acfa6dfb5cab51f5d3839c78d1cbaa58ca285 (diff)
downloadfreebsd-ports-gnome-24029df115153087041c1c491ed9b79c18098383.tar.gz
freebsd-ports-gnome-24029df115153087041c1c491ed9b79c18098383.tar.zst
freebsd-ports-gnome-24029df115153087041c1c491ed9b79c18098383.zip
- Update twxtproc/wv2 to latest release, 0.4.2
- Chase wv2 core change for koffice-kde3 Approved by: tabthorpe (co-mentor)
Diffstat (limited to 'editors')
-rw-r--r--editors/calligra/Makefile4
-rw-r--r--editors/calligra/files/patch-filters-kword-msword14
-rw-r--r--editors/koffice-kde3/Makefile4
-rw-r--r--editors/koffice-kde3/files/patch-filters-kword-msword14
-rw-r--r--editors/koffice-kde4/Makefile4
-rw-r--r--editors/koffice-kde4/files/patch-filters-kword-msword14
6 files changed, 48 insertions, 6 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index be942e9d1c82..36d08acd55a9 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
@@ -28,7 +28,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
paper.2:${PORTSDIR}/print/libpaper \
poppler-qt.2:${PORTSDIR}/graphics/poppler-qt \
wpd-0.8.8:${PORTSDIR}/textproc/libwpd \
- wv2.3:${PORTSDIR}/textproc/wv2
+ wv2.4:${PORTSDIR}/textproc/wv2
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
USE_AUTOTOOLS= libtool:22
diff --git a/editors/calligra/files/patch-filters-kword-msword b/editors/calligra/files/patch-filters-kword-msword
index 6fbec03cc5a2..070bdacc3903 100644
--- a/editors/calligra/files/patch-filters-kword-msword
+++ b/editors/calligra/files/patch-filters-kword-msword
@@ -67,3 +67,17 @@
m_tap->rgtc[ m_column + 1 ].brcLeft
: tc.brcRight;
+--- filters/kword/msword/texthandler.cpp.orig 2007-05-31 08:39:22.000000000 +1100
++++ filters/kword/msword/texthandler.cpp 2009-10-11 15:50:25.000000000 +1100
+@@ -322,9 +322,9 @@
+ format.setAttribute( "pos", pos );
+ format.setAttribute( "len", len );
+
+- if ( !refChp || refChp->ico != chp->ico )
++ if ( !refChp || refChp->cv != chp->cv )
+ {
+- QColor color = Conversion::color( chp->ico, -1 );
++ QColor color = Conversion::color( chp->cv, -1 );
+ QDomElement colorElem( mainDocument().createElement( "COLOR" ) );
+ colorElem.setAttribute( "red", color.red() );
+ colorElem.setAttribute( "blue", color.blue() );
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index be942e9d1c82..36d08acd55a9 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
@@ -28,7 +28,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
paper.2:${PORTSDIR}/print/libpaper \
poppler-qt.2:${PORTSDIR}/graphics/poppler-qt \
wpd-0.8.8:${PORTSDIR}/textproc/libwpd \
- wv2.3:${PORTSDIR}/textproc/wv2
+ wv2.4:${PORTSDIR}/textproc/wv2
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
USE_AUTOTOOLS= libtool:22
diff --git a/editors/koffice-kde3/files/patch-filters-kword-msword b/editors/koffice-kde3/files/patch-filters-kword-msword
index 6fbec03cc5a2..070bdacc3903 100644
--- a/editors/koffice-kde3/files/patch-filters-kword-msword
+++ b/editors/koffice-kde3/files/patch-filters-kword-msword
@@ -67,3 +67,17 @@
m_tap->rgtc[ m_column + 1 ].brcLeft
: tc.brcRight;
+--- filters/kword/msword/texthandler.cpp.orig 2007-05-31 08:39:22.000000000 +1100
++++ filters/kword/msword/texthandler.cpp 2009-10-11 15:50:25.000000000 +1100
+@@ -322,9 +322,9 @@
+ format.setAttribute( "pos", pos );
+ format.setAttribute( "len", len );
+
+- if ( !refChp || refChp->ico != chp->ico )
++ if ( !refChp || refChp->cv != chp->cv )
+ {
+- QColor color = Conversion::color( chp->ico, -1 );
++ QColor color = Conversion::color( chp->cv, -1 );
+ QDomElement colorElem( mainDocument().createElement( "COLOR" ) );
+ colorElem.setAttribute( "red", color.red() );
+ colorElem.setAttribute( "blue", color.blue() );
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index be942e9d1c82..36d08acd55a9 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
@@ -28,7 +28,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
paper.2:${PORTSDIR}/print/libpaper \
poppler-qt.2:${PORTSDIR}/graphics/poppler-qt \
wpd-0.8.8:${PORTSDIR}/textproc/libwpd \
- wv2.3:${PORTSDIR}/textproc/wv2
+ wv2.4:${PORTSDIR}/textproc/wv2
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
USE_AUTOTOOLS= libtool:22
diff --git a/editors/koffice-kde4/files/patch-filters-kword-msword b/editors/koffice-kde4/files/patch-filters-kword-msword
index 6fbec03cc5a2..070bdacc3903 100644
--- a/editors/koffice-kde4/files/patch-filters-kword-msword
+++ b/editors/koffice-kde4/files/patch-filters-kword-msword
@@ -67,3 +67,17 @@
m_tap->rgtc[ m_column + 1 ].brcLeft
: tc.brcRight;
+--- filters/kword/msword/texthandler.cpp.orig 2007-05-31 08:39:22.000000000 +1100
++++ filters/kword/msword/texthandler.cpp 2009-10-11 15:50:25.000000000 +1100
+@@ -322,9 +322,9 @@
+ format.setAttribute( "pos", pos );
+ format.setAttribute( "len", len );
+
+- if ( !refChp || refChp->ico != chp->ico )
++ if ( !refChp || refChp->cv != chp->cv )
+ {
+- QColor color = Conversion::color( chp->ico, -1 );
++ QColor color = Conversion::color( chp->cv, -1 );
+ QDomElement colorElem( mainDocument().createElement( "COLOR" ) );
+ colorElem.setAttribute( "red", color.red() );
+ colorElem.setAttribute( "blue", color.blue() );
generated by cgit (git 2.34.1) at 2024-12-23 22:30:09 +0800