From 4bce57487d86ac4a35cda071de6ee43a79e5811c Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 12 Jul 2003 07:16:00 +0000 Subject: Update to 1.99.2. --- editors/AbiWord2/Makefile | 6 +- editors/AbiWord2/distinfo | 2 +- .../files/patch-src_text_ptbl_xp_pp_AttrProp.cpp | 79 ++++++++++++++++++++++ editors/AbiWord2/pkg-plist | 2 + editors/abiword-devel/Makefile | 6 +- editors/abiword-devel/distinfo | 2 +- .../files/patch-src_text_ptbl_xp_pp_AttrProp.cpp | 79 ++++++++++++++++++++++ editors/abiword-devel/pkg-plist | 2 + editors/abiword/Makefile | 6 +- editors/abiword/distinfo | 2 +- .../files/patch-src_text_ptbl_xp_pp_AttrProp.cpp | 79 ++++++++++++++++++++++ editors/abiword/pkg-plist | 2 + 12 files changed, 255 insertions(+), 12 deletions(-) create mode 100644 editors/AbiWord2/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp create mode 100644 editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp create mode 100644 editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp (limited to 'editors') diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 4c8acf9b2d0c..ff51fddfaa8d 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= AbiWord2 -PORTVERSION= 1.99.1 +PORTVERSION= 1.99.2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ @@ -47,8 +47,8 @@ MAKEFILE= GNUmakefile BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord2 build" .endif -.if ${HAVE_GNOME:Mnautilus2}!="" && ${HAVE_GNOME:Mgal2}!="" -USE_GNOME+= nautilus2 gal2 +.if ${HAVE_GNOME:Mnautilus2}!="" +USE_GNOME+= nautilus2 CONFIGURE_ARGS+= --enable-gnome PKGNAMESUFFIX= -gnome GNOME_ENABLED= yes diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo index f9c0cb1ad52d..eabe0670e42f 100644 --- a/editors/AbiWord2/distinfo +++ b/editors/AbiWord2/distinfo @@ -1 +1 @@ -MD5 (AbiWord/abiword-1.99.1.tar.gz) = e96b50aea36ebf935d001b436b2bc582 +MD5 (AbiWord/abiword-1.99.2.tar.gz) = 6319519f6f8b3eb70b0370bf694350d4 diff --git a/editors/AbiWord2/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp b/editors/AbiWord2/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp new file mode 100644 index 000000000000..6da5af2f452b --- /dev/null +++ b/editors/AbiWord2/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp @@ -0,0 +1,79 @@ +--- src/text/ptbl/xp/pp_AttrProp.cpp.orig Sat Jul 12 02:57:05 2003 ++++ src/text/ptbl/xp/pp_AttrProp.cpp Sat Jul 12 03:04:49 2003 +@@ -82,7 +82,7 @@ + void* tmp = const_cast (entry->first()); + FREEP(tmp); + if (entry->second()) +- delete static_cast(entry->second()); ++ delete (const PP_PropertyType*)entry->second(); + delete entry; + } + } +@@ -336,7 +336,7 @@ + + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)p->second(); + delete p; + + if(bRemove) +@@ -406,7 +406,7 @@ + if ( (i == ndx) && c.is_valid()) + { + szName = static_cast(c.key().c_str()); +- szValue = static_cast(static_cast(val)->first()); ++ szValue = (const XML_Char*)(static_cast(val)->first()); + return true; + } + return false; +@@ -421,7 +421,7 @@ + if (!pEntry) + return false; + +- szValue = static_cast(static_cast(pEntry)->first()); ++ szValue = (const XML_Char *)(static_cast(pEntry)->first()); + + return true; + } +@@ -440,12 +440,12 @@ + m_pProperties->set(szName, new UT_Pair + (pEntry->first(), + PP_PropertyType::createPropertyType(Type, +- static_cast(pEntry->first())))); ++ (const XML_Char *)(pEntry->first())))); + delete pEntry; + pEntry = static_cast(m_pProperties->pick(szName)); + } + +- return static_cast(pEntry->second()); ++ return (const PP_PropertyType *)(pEntry->second()); + } + bool PP_AttrProp::getAttribute(const XML_Char * szName, const XML_Char *& szValue) const + { +@@ -750,14 +750,14 @@ + { + const UT_Pair* p = static_cast(pEntry); + +- if(*(static_cast(p->first())) == 0) ++ if(*((const XML_Char *)(p->first())) == 0) + { + + void* tmp = const_cast (p->first()); + UT_ASSERT(!m_bIsReadOnly); + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)(p->second()); + delete p; + + m_pProperties->remove(_hc1.key(),pEntry); +@@ -985,7 +985,7 @@ + while (val != NULL) + { + s1 = static_cast(c2.key().c_str()); +- s2 = static_cast(static_cast(val)->first()); ++ s2 = (const XML_Char *)(static_cast(val)->first()); + + m_checkSum += UT_XML_strlen(s1); + m_checkSum += UT_XML_strlen(s2); diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index 0de96e71bb25..5d9a7fab1eb5 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -105,6 +105,8 @@ share/AbiSuite-2.0/AbiWord/system.profile-en-ZA share/AbiSuite-2.0/AbiWord/system.profile-es share/AbiSuite-2.0/AbiWord/system.profile-es-ES share/AbiSuite-2.0/AbiWord/system.profile-es-MX +share/AbiSuite-2.0/AbiWord/system.profile-eu +share/AbiSuite-2.0/AbiWord/system.profile-eu-ES share/AbiSuite-2.0/AbiWord/system.profile-fa-IR share/AbiSuite-2.0/AbiWord/system.profile-fi-FI share/AbiSuite-2.0/AbiWord/system.profile-fr diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 4c8acf9b2d0c..ff51fddfaa8d 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= AbiWord2 -PORTVERSION= 1.99.1 +PORTVERSION= 1.99.2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ @@ -47,8 +47,8 @@ MAKEFILE= GNUmakefile BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord2 build" .endif -.if ${HAVE_GNOME:Mnautilus2}!="" && ${HAVE_GNOME:Mgal2}!="" -USE_GNOME+= nautilus2 gal2 +.if ${HAVE_GNOME:Mnautilus2}!="" +USE_GNOME+= nautilus2 CONFIGURE_ARGS+= --enable-gnome PKGNAMESUFFIX= -gnome GNOME_ENABLED= yes diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo index f9c0cb1ad52d..eabe0670e42f 100644 --- a/editors/abiword-devel/distinfo +++ b/editors/abiword-devel/distinfo @@ -1 +1 @@ -MD5 (AbiWord/abiword-1.99.1.tar.gz) = e96b50aea36ebf935d001b436b2bc582 +MD5 (AbiWord/abiword-1.99.2.tar.gz) = 6319519f6f8b3eb70b0370bf694350d4 diff --git a/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp b/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp new file mode 100644 index 000000000000..6da5af2f452b --- /dev/null +++ b/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp @@ -0,0 +1,79 @@ +--- src/text/ptbl/xp/pp_AttrProp.cpp.orig Sat Jul 12 02:57:05 2003 ++++ src/text/ptbl/xp/pp_AttrProp.cpp Sat Jul 12 03:04:49 2003 +@@ -82,7 +82,7 @@ + void* tmp = const_cast (entry->first()); + FREEP(tmp); + if (entry->second()) +- delete static_cast(entry->second()); ++ delete (const PP_PropertyType*)entry->second(); + delete entry; + } + } +@@ -336,7 +336,7 @@ + + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)p->second(); + delete p; + + if(bRemove) +@@ -406,7 +406,7 @@ + if ( (i == ndx) && c.is_valid()) + { + szName = static_cast(c.key().c_str()); +- szValue = static_cast(static_cast(val)->first()); ++ szValue = (const XML_Char*)(static_cast(val)->first()); + return true; + } + return false; +@@ -421,7 +421,7 @@ + if (!pEntry) + return false; + +- szValue = static_cast(static_cast(pEntry)->first()); ++ szValue = (const XML_Char *)(static_cast(pEntry)->first()); + + return true; + } +@@ -440,12 +440,12 @@ + m_pProperties->set(szName, new UT_Pair + (pEntry->first(), + PP_PropertyType::createPropertyType(Type, +- static_cast(pEntry->first())))); ++ (const XML_Char *)(pEntry->first())))); + delete pEntry; + pEntry = static_cast(m_pProperties->pick(szName)); + } + +- return static_cast(pEntry->second()); ++ return (const PP_PropertyType *)(pEntry->second()); + } + bool PP_AttrProp::getAttribute(const XML_Char * szName, const XML_Char *& szValue) const + { +@@ -750,14 +750,14 @@ + { + const UT_Pair* p = static_cast(pEntry); + +- if(*(static_cast(p->first())) == 0) ++ if(*((const XML_Char *)(p->first())) == 0) + { + + void* tmp = const_cast (p->first()); + UT_ASSERT(!m_bIsReadOnly); + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)(p->second()); + delete p; + + m_pProperties->remove(_hc1.key(),pEntry); +@@ -985,7 +985,7 @@ + while (val != NULL) + { + s1 = static_cast(c2.key().c_str()); +- s2 = static_cast(static_cast(val)->first()); ++ s2 = (const XML_Char *)(static_cast(val)->first()); + + m_checkSum += UT_XML_strlen(s1); + m_checkSum += UT_XML_strlen(s2); diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist index 0de96e71bb25..5d9a7fab1eb5 100644 --- a/editors/abiword-devel/pkg-plist +++ b/editors/abiword-devel/pkg-plist @@ -105,6 +105,8 @@ share/AbiSuite-2.0/AbiWord/system.profile-en-ZA share/AbiSuite-2.0/AbiWord/system.profile-es share/AbiSuite-2.0/AbiWord/system.profile-es-ES share/AbiSuite-2.0/AbiWord/system.profile-es-MX +share/AbiSuite-2.0/AbiWord/system.profile-eu +share/AbiSuite-2.0/AbiWord/system.profile-eu-ES share/AbiSuite-2.0/AbiWord/system.profile-fa-IR share/AbiSuite-2.0/AbiWord/system.profile-fi-FI share/AbiSuite-2.0/AbiWord/system.profile-fr diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 4c8acf9b2d0c..ff51fddfaa8d 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -6,7 +6,7 @@ # PORTNAME= AbiWord2 -PORTVERSION= 1.99.1 +PORTVERSION= 1.99.2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ @@ -47,8 +47,8 @@ MAKEFILE= GNUmakefile BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord2 build" .endif -.if ${HAVE_GNOME:Mnautilus2}!="" && ${HAVE_GNOME:Mgal2}!="" -USE_GNOME+= nautilus2 gal2 +.if ${HAVE_GNOME:Mnautilus2}!="" +USE_GNOME+= nautilus2 CONFIGURE_ARGS+= --enable-gnome PKGNAMESUFFIX= -gnome GNOME_ENABLED= yes diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index f9c0cb1ad52d..eabe0670e42f 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1 +1 @@ -MD5 (AbiWord/abiword-1.99.1.tar.gz) = e96b50aea36ebf935d001b436b2bc582 +MD5 (AbiWord/abiword-1.99.2.tar.gz) = 6319519f6f8b3eb70b0370bf694350d4 diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp b/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp new file mode 100644 index 000000000000..6da5af2f452b --- /dev/null +++ b/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp @@ -0,0 +1,79 @@ +--- src/text/ptbl/xp/pp_AttrProp.cpp.orig Sat Jul 12 02:57:05 2003 ++++ src/text/ptbl/xp/pp_AttrProp.cpp Sat Jul 12 03:04:49 2003 +@@ -82,7 +82,7 @@ + void* tmp = const_cast (entry->first()); + FREEP(tmp); + if (entry->second()) +- delete static_cast(entry->second()); ++ delete (const PP_PropertyType*)entry->second(); + delete entry; + } + } +@@ -336,7 +336,7 @@ + + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)p->second(); + delete p; + + if(bRemove) +@@ -406,7 +406,7 @@ + if ( (i == ndx) && c.is_valid()) + { + szName = static_cast(c.key().c_str()); +- szValue = static_cast(static_cast(val)->first()); ++ szValue = (const XML_Char*)(static_cast(val)->first()); + return true; + } + return false; +@@ -421,7 +421,7 @@ + if (!pEntry) + return false; + +- szValue = static_cast(static_cast(pEntry)->first()); ++ szValue = (const XML_Char *)(static_cast(pEntry)->first()); + + return true; + } +@@ -440,12 +440,12 @@ + m_pProperties->set(szName, new UT_Pair + (pEntry->first(), + PP_PropertyType::createPropertyType(Type, +- static_cast(pEntry->first())))); ++ (const XML_Char *)(pEntry->first())))); + delete pEntry; + pEntry = static_cast(m_pProperties->pick(szName)); + } + +- return static_cast(pEntry->second()); ++ return (const PP_PropertyType *)(pEntry->second()); + } + bool PP_AttrProp::getAttribute(const XML_Char * szName, const XML_Char *& szValue) const + { +@@ -750,14 +750,14 @@ + { + const UT_Pair* p = static_cast(pEntry); + +- if(*(static_cast(p->first())) == 0) ++ if(*((const XML_Char *)(p->first())) == 0) + { + + void* tmp = const_cast (p->first()); + UT_ASSERT(!m_bIsReadOnly); + FREEP(tmp); + if (p->second()) +- delete static_cast(p->second()); ++ delete (const PP_PropertyType *)(p->second()); + delete p; + + m_pProperties->remove(_hc1.key(),pEntry); +@@ -985,7 +985,7 @@ + while (val != NULL) + { + s1 = static_cast(c2.key().c_str()); +- s2 = static_cast(static_cast(val)->first()); ++ s2 = (const XML_Char *)(static_cast(val)->first()); + + m_checkSum += UT_XML_strlen(s1); + m_checkSum += UT_XML_strlen(s2); diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist index 0de96e71bb25..5d9a7fab1eb5 100644 --- a/editors/abiword/pkg-plist +++ b/editors/abiword/pkg-plist @@ -105,6 +105,8 @@ share/AbiSuite-2.0/AbiWord/system.profile-en-ZA share/AbiSuite-2.0/AbiWord/system.profile-es share/AbiSuite-2.0/AbiWord/system.profile-es-ES share/AbiSuite-2.0/AbiWord/system.profile-es-MX +share/AbiSuite-2.0/AbiWord/system.profile-eu +share/AbiSuite-2.0/AbiWord/system.profile-eu-ES share/AbiSuite-2.0/AbiWord/system.profile-fa-IR share/AbiSuite-2.0/AbiWord/system.profile-fi-FI share/AbiSuite-2.0/AbiWord/system.profile-fr -- cgit v1.2.3