Hello community,
here is the log from the commit of package abiword
checked in at Thu Apr 3 10:32:40 CEST 2008.
--------
--- GNOME/abiword/abiword.changes 2007-11-06 18:40:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/abiword/abiword.changes 2008-04-03 01:56:20.864044000 +0200
@@ -1,0 +2,12 @@
+Wed Apr 2 19:50:51 EDT 2008 - hfiguiere@suse.de
+
+- Upgrade to AbiWord 2.6 (bnc#374240)
+ * New pango renderer (but support for asian languages)
+ * GNOME Office plugin
+ * Gnome-VFS support
+ * Better ODF support
+ * OOX support
+ * Lot of bug fixes (bnc#234432)
+- Grammar checking support
+
+-------------------------------------------------------------------
Old:
----
abiword-2.4.5-array-bounds.patch
abiword-2.4.6.tar.bz2
abiword.ansi.patch
abiword-compiler-warning.patch
abiword-fixes.patch
abiword-missing-sentinel.patch
abiword-poppler-fixes.patch
abiword-poppler.patch
abiword-random.patch
abiword-uninited-vars.patch
abiword-va-copy.patch
New:
----
abiword-2.6.0.tar.bz2
abiword-draw-textbox-lines.patch
abiword-link-grammar-api-fix.diff
abiword-plugins-2.6.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ abiword.spec ++++++
--- /var/tmp/diff_new_pack.H24020/_old 2008-04-03 10:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.H24020/_new 2008-04-03 10:32:21.000000000 +0200
@@ -1,43 +1,31 @@
#
-# spec file for package abiword (Version 2.4.6)
+# spec file for package abiword (Version 2.6.0)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
+BuildRequires: aspell-devel boost-devel eel-devel enchant-devel fribidi-devel gcc-c++ gnutls-devel goffice-devel gucharmap-devel libgnomedb-devel libgnomeprintui-devel libgsf-devel librsvg-devel libtiff-devel libwnck-devel loudmouth-devel mDNSResponder-devel nautilus-devel python-devel readline-devel update-desktop-files wv-devel
+BuildRequires: libgda-3_0-devel libgnomedb-devel libwpd-devel link-grammar-devel psiconv-devel readline-devel
Name: abiword
-BuildRequires: aspell-devel enchant-devel fdupes fribidi-devel gcc-c++ gucharmap-devel libgnomedb-devel libgnomeprintui-devel libpoppler-devel librsvg-devel libstdc++-devel libwpd-devel psiconv-devel python-devel readline-devel update-desktop-files wv-devel
-%ifarch %ix86 ppc x86_64
-BuildRequires: valgrind
-%endif
+Summary: A Multiplatform Word Processor
+Version: 2.6.0
+Release: 1
License: GPL v2 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Group: Productivity/Office/Word Processor
-Requires: ghostscript-fonts-std, ghostscript-fonts-other, gnome-icon-theme
-AutoReqProv: on
-Provides: abiword2
-Obsoletes: abiword2
-Summary: A Multiplatform Word Processor
-Version: 2.4.6
-Release: 55
+Source0: %{name}-%{version}.tar.bz2
+Source2: %{name}-plugins-%{version}.tar.bz2
+Patch: abiword-draw-textbox-lines.patch
+Patch1: abiword-link-grammar-api-fix.diff
Url: http://www.abisource.com/
-Source: %{name}-%{version}.tar.bz2
-Patch2: abiword-uninited-vars.patch
-Patch3: abiword-random.patch
-Patch4: abiword.ansi.patch
-Patch5: abiword-poppler.patch
-Patch6: abiword-missing-sentinel.patch
-Patch7: abiword-compiler-warning.patch
-Patch9: abiword-fixes.patch
-Patch10: %{name}-2.4.5-array-bounds.patch
-Patch11: %{name}-va-copy.patch
-# PATCH-FIX-UPSTREAM abiword-poppler-fixes.patch
-Patch12: abiword-poppler-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+AutoReqProv: on
+Conflicts: abiword-unstable
%description
AbiWord is a multiplatform word processor with a GTK+ interface on the
@@ -57,82 +45,78 @@
Shaw Terwilliger
%prep
-%setup -q
-%patch2
-%patch3
-%patch4 -p1
-%patch5
-%patch6
-%patch7
-%patch9 -p1
-%patch10
-%patch11
-%patch12 -p1
-find . -name ".cvsignore" -exec rm -f {} \;
-%{?suse_update_config:%{suse_update_config -f $DIR}}
-sed "s:config_flags=':& --with-libwmf=/usr/%_lib:" abi/configure~
-cat abi/configure~ >abi/configure
-sed "s:-ltermcap::;s/python2.3/python%{py_ver}/g" abiword-plugins/configure~
-cat abiword-plugins/configure~ >abiword-plugins/configure
+%setup -b2 -n %{name}-%{version}
+%patch -p2
+pushd ../abiword-plugins-2.6.0/
+%patch1 -p0
+popd
%build
-cd abi
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%if %suse_version > 1000
-export CFLAGS="$CFLAGS -fstack-protector"
-export CXXFLAGS="$CXXFLAGS -fstack-protector"
-%endif
-%configure\
- --enable-gnome\
- --enable-xft\
- --enable-scripting\
- --with-gnomevfs\
- --with-sys-wv
-make %{?jobs:-j %jobs}
-cd ../abiword-plugins
-#./nextgen.sh
-sed -i 's/python2.3/python%{py_ver}/g' configure
%configure
-make %{?jobs:-j %jobs}
+%__make
+cd ../abiword-plugins-%version
+%if %suse_version <= 1030
+%configure --with-abiword=../abiword-%{version}
+%else
+%configure --with-abiword=../abiword-%{version} --disable-abicollab
+%endif
+%__make
%install
-cd abi
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+%makeinstall
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m644 abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cd ../abiword-plugins
-make DESTDIR=$RPM_BUILD_ROOT install
-%suse_update_desktop_file abiword Office WordProcessor GNOME
-rm $RPM_BUILD_ROOT%{_libdir}/AbiWord-2.4/plugins/*.*a
+rm $RPM_BUILD_ROOT%{_datadir}/icons/abiword_48.png
+cd ../abiword-plugins-%version
+%makeinstall
+%suse_update_desktop_file -n %{name} Office WordProcessor
+rm $RPM_BUILD_ROOT%{_libdir}/abiword-2.6/plugins/*.*a
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
-%doc abi/COPYING abi/COPYRIGHT.TXT abi/CREDITS.TXT abi/README.TXT abi/BiDiReadme.txt abi/docs
+%defattr(-, root, root)
+%doc BiDiReadme.txt BUILD.TXT COPYING COPYRIGHT.TXT CREDITS.TXT docs README.TXT
%{_bindir}/*
-%{_libdir}/AbiWord-2.4
-%{_datadir}/AbiSuite-2.4
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*.png
-%{_datadir}/pixmaps/*.png
+%dir %{_includedir}/abiword-2.6/
+%{_includedir}/abiword-2.6/abiwidget.h
+%{_includedir}/abiword-2.6/xap_UnixTableWidget.h
+%{_libdir}/pkgconfig/abiword-2.6.pc
+%dir %{_libdir}/abiword-2.6
+%dir %{_libdir}/abiword-2.6/plugins
+%{_libdir}/abiword-2.6/plugins/*
+%dir %{_datadir}/abiword-2.6
+%{_datadir}/abiword-2.6/*
+%{_datadir}/applications/abiword.desktop
+%{_datadir}/pixmaps/abiword_48.png
+%dir %{_datadir}/mime-info
+%{_datadir}/mime-info/abiword.keys
+
%changelog
-* Tue Nov 06 2007 - maw@suse.de
+* Wed Apr 02 2008 hfiguiere@suse.de
+- Upgrade to AbiWord 2.6 (bnc#374240)
+ * New pango renderer (but support for asian languages)
+ * GNOME Office plugin
+ * Gnome-VFS support
+ * Better ODF support
+ * OOX support
+ * Lot of bug fixes (bnc#234432)
+- Grammar checking support
+* Tue Nov 06 2007 maw@suse.de
- Add abiword-gcc4.3-fixes.patch, which fixes the build against
newer versions of poppler
- Use %%fdupes.
-* Fri Nov 02 2007 - sbrabec@suse.cz
+* Fri Nov 02 2007 sbrabec@suse.cz
- Reverted one chunk of poppler patch to follow poppler changes.
-* Tue Oct 23 2007 - meissner@suse.de
+* Tue Oct 23 2007 meissner@suse.de
- fixed gcc 4.3 build
-* Thu Oct 11 2007 - sbrabec@suse.cz
+* Thu Oct 11 2007 sbrabec@suse.cz
- poppler devel package names prepended by "lib".
-* Mon Oct 08 2007 - sbrabec@suse.cz
+* Mon Oct 08 2007 sbrabec@suse.cz
- Fixed build with poppler 0.6.
-* Tue Jul 31 2007 - jpr@suse.de
+* Tue Jul 31 2007 jpr@suse.de
-Update to 2.4.6
- Fix IDEF vulnerabilities IDEF1613 and IDEF1614 in the MS Word
import library wvWare
@@ -140,25 +124,25 @@
WordPerfect plugin was installed
- Massive updates to the OpenDocument, WML, XSL-FO and AbiCommand plugins
-Remove upstreamed patch
-* Fri Mar 16 2007 - sbrabec@suse.cz
+* Fri Mar 16 2007 sbrabec@suse.cz
- Added c++ packages to BuildRequires.
-* Wed Feb 21 2007 - mvaner@suse.cz
+* Wed Feb 21 2007 mvaner@suse.cz
- Array bounds (#242029)
- array-bounds.patch
-* Thu Jan 04 2007 - sbrabec@suse.cz
+* Thu Jan 04 2007 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
-* Tue Dec 19 2006 - meissner@suse.de
+* Tue Dec 19 2006 meissner@suse.de
- fixed build fail due to warnings.
-* Tue Nov 07 2006 - ro@suse.de
+* Tue Nov 07 2006 ro@suse.de
- fix icon permission
-* Tue Oct 31 2006 - jhargadon@suse.de
+* Tue Oct 31 2006 jhargadon@suse.de
- added a patch to remove call to FcFini from the XAP_UnixApp
destructor to resolve crashes that occur during shutdown of the
application.
-* Sat Sep 30 2006 - aj@suse.de
+* Sat Sep 30 2006 aj@suse.de
- Cleanup BuildRequires.
-* Fri Sep 01 2006 - jhargadon@suse.de
+* Fri Sep 01 2006 jhargadon@suse.de
- update to version 2.4.5
- many bug fixes
- grammar checker added
@@ -167,109 +151,109 @@
- added OpenDocument support
- added Gnome-Office charting
- patch for compiler warnings
-* Thu Aug 31 2006 - gekker@suse.de
+* Thu Aug 31 2006 gekker@suse.de
- Remove unnecessary gal2-devel from BuildRequires
-* Wed Aug 09 2006 - gekker@suse.de
+* Wed Aug 09 2006 gekker@suse.de
- Fix missing sentinel warnings
-* Fri Jul 07 2006 - aj@suse.de
+* Fri Jul 07 2006 aj@suse.de
- Fix build with new poppler version.
-* Sun Mar 26 2006 - olh@suse.de
+* Sun Mar 26 2006 olh@suse.de
- remove -ansi -pedantic from CFLAGS to allow compilation with
perl use64bitint and c++
-* Fri Feb 24 2006 - sbrabec@suse.cz
+* Fri Feb 24 2006 sbrabec@suse.cz
- Improved Categories.
-* Mon Feb 06 2006 - ro@suse.de
+* Sun Feb 05 2006 ro@suse.de
- use -fstack-protector only for > 10.0
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Mon Jan 16 2006 - sbrabec@suse.cz
+* Mon Jan 16 2006 sbrabec@suse.cz
- Updated to version 2.4.2.
-* Fri Jan 13 2006 - meissner@suse.de
+* Fri Jan 13 2006 meissner@suse.de
- Added -fno-strict-aliasing -fstack-protector.
-* Fri Nov 04 2005 - sbrabec@suse.cz
+* Fri Nov 04 2005 sbrabec@suse.cz
- Updated to version 2.4.1.
-* Sun Oct 30 2005 - ro@suse.de
+* Sun Oct 30 2005 ro@suse.de
- remove extra qualifications to fix build with gcc-4.1
-* Wed Oct 19 2005 - sbrabec@suse.cz
+* Wed Oct 19 2005 sbrabec@suse.cz
- Build with libwpd.
-* Wed Oct 05 2005 - sbrabec@suse.cz
+* Wed Oct 05 2005 sbrabec@suse.cz
- Updated to version 2.4.0.
- Fixed more buffer overflows in RTF importer (#120097).
-* Tue Sep 27 2005 - sbrabec@suse.cz
+* Tue Sep 27 2005 sbrabec@suse.cz
- Updated to version 2.2.10 (#118545, CESA-2005-004 - rev 1).
-* Thu Jul 28 2005 - sbrabec@suse.cz
+* Thu Jul 28 2005 sbrabec@suse.cz
- Updated to version 2.2.9.
-* Sat Jul 09 2005 - gekker@suse.de
+* Sat Jul 09 2005 gekker@suse.de
- Fix uninitialzed variables and remove .la files
-* Mon May 23 2005 - schwab@suse.de
+* Mon May 23 2005 schwab@suse.de
- Fix missing declaration.
-* Tue Apr 26 2005 - sbrabec@suse.cz
+* Tue Apr 26 2005 sbrabec@suse.cz
- Updated to version 2.2.7.
-* Fri Apr 15 2005 - sbrabec@suse.de
+* Fri Apr 15 2005 sbrabec@suse.de
- Fixed cast from pointer to integer.
-* Tue Feb 22 2005 - sbrabec@suse.cz
+* Tue Feb 22 2005 sbrabec@suse.cz
- Updated to version 2.2.4.
-* Sun Jan 23 2005 - meissner@suse.de
+* Sun Jan 23 2005 meissner@suse.de
- use system wv lib, drop -fstrict-aliasing.
-* Thu Jan 20 2005 - sbrabec@suse.cz
+* Thu Jan 20 2005 sbrabec@suse.cz
- Updated to version 2.2.3.
-* Tue Jan 11 2005 - sbrabec@suse.cz
+* Tue Jan 11 2005 sbrabec@suse.cz
- Update to version 2.2.2.
-* Fri Dec 10 2004 - ro@suse.de
+* Thu Dec 09 2004 ro@suse.de
- install icon file
-* Thu Nov 11 2004 - sbrabec@suse.cz
+* Thu Nov 11 2004 sbrabec@suse.cz
- Fixed buffer overflow in the wvHandleDateTimePicture function in wv
library: CAN-2004-0645 (#47767).
-* Tue Sep 14 2004 - ro@suse.de
+* Tue Sep 14 2004 ro@suse.de
- added ImageMagick-Magick++-devel to neededforbuild
-* Tue Jun 29 2004 - ro@suse.de
+* Mon Jun 28 2004 ro@suse.de
- added libtiff to neededforbuild
-* Thu May 13 2004 - clahey@suse.de
+* Wed May 12 2004 clahey@suse.de
- Added patch to fix two missing return values.
-* Tue May 11 2004 - ro@suse.de
+* Tue May 11 2004 ro@suse.de
- added libcroco,libcroco-devel to neededforbuild
-* Wed Apr 21 2004 - sbrabec@suse.cz
+* Wed Apr 21 2004 sbrabec@suse.cz
- Updated to version 2.0.6.
-* Wed Mar 17 2004 - sbrabec@suse.cz
+* Wed Mar 17 2004 sbrabec@suse.cz
- Updated to version 2.0.5.
-* Mon Mar 08 2004 - sbrabec@suse.cz
+* Mon Mar 08 2004 sbrabec@suse.cz
- Updated to version 2.0.4.
-* Sat Feb 21 2004 - ro@suse.de
+* Sat Feb 21 2004 ro@suse.de
- updated neededforbuild
-* Fri Feb 20 2004 - sbrabec@suse.cz
+* Fri Feb 20 2004 sbrabec@suse.cz
- Package renamed to abiword.
-* Mon Feb 16 2004 - sbrabec@suse.cz
+* Mon Feb 16 2004 sbrabec@suse.cz
- Updated to version 2.0.3.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
- add %%defattr
-* Wed Oct 29 2003 - sbrabec@suse.cz
+* Wed Oct 29 2003 sbrabec@suse.cz
- Removed garbage from spec file (move to pixmaps).
-* Wed Oct 29 2003 - sbrabec@suse.cz
+* Wed Oct 29 2003 sbrabec@suse.cz
- Updated to version 2.0.1.
- Fixed wv wmf to png support.
-* Tue Oct 28 2003 - ro@suse.de
+* Mon Oct 27 2003 ro@suse.de
- added gtksourceview to neededforbuild
-* Thu Sep 18 2003 - meissner@suse.de
+* Thu Sep 18 2003 meissner@suse.de
- drop glib and glib-devel from neededforbuild, no longer needed.
-* Tue Sep 16 2003 - sbrabec@suse.cz
+* Tue Sep 16 2003 sbrabec@suse.cz
- Provide and obsolete abiword (bug #31002).
-* Mon Sep 01 2003 - adrian@suse.de
+* Mon Sep 01 2003 adrian@suse.de
- install desktop file
-* Thu Aug 28 2003 - sbrabec@suse.cz
+* Thu Aug 28 2003 sbrabec@suse.cz
- Updated to version 1.99.5.
- Added gnome-libs-devel to neededforbuild (for gnome-config).
- Fixed Python 2.3 support.
-* Tue Aug 26 2003 - sbrabec@suse.cz
+* Tue Aug 26 2003 sbrabec@suse.cz
- Fixed GNOME-DB support.
-* Wed Aug 20 2003 - sbrabec@suse.cz
+* Wed Aug 20 2003 sbrabec@suse.cz
- Updated to version 1.99.4.
-* Tue Aug 19 2003 - sbrabec@suse.cz
+* Tue Aug 19 2003 sbrabec@suse.cz
- Updated neededforbuild (rename of librsvg2, eel2).
-* Mon Aug 18 2003 - sbrabec@suse.cz
+* Mon Aug 18 2003 sbrabec@suse.cz
- Use libgda instead of libgda2 (package was renamed).
-* Thu Jul 31 2003 - sf@suse.de
+* Thu Jul 31 2003 sf@suse.de
- fixed broken VA_COPY (use __va_copy)
-* Mon Jul 14 2003 - sbrabec@suse.cz
+* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
-* Mon Jun 16 2003 - sbrabec@suse.cz
+* Mon Jun 16 2003 sbrabec@suse.cz
- Initial SuSE version of GNOME2 port.
++++++ abiword-2.4.6.tar.bz2 -> abiword-2.6.0.tar.bz2 ++++++
GNOME/abiword/abiword-2.4.6.tar.bz2 /mounts/work_src_done/STABLE/abiword/abiword-2.6.0.tar.bz2 differ: byte 11, line 1
++++++ abiword-draw-textbox-lines.patch ++++++
--- abiword/trunk/src/text/fmt/xp/fp_FrameContainer.cpp 2008/02/26 02:51:52 22945
+++ abiword/trunk/src/text/fmt/xp/fp_FrameContainer.cpp 2008/03/27 02:35:59 23268
@@ -448,7 +448,7 @@
void fp_FrameContainer::_drawLine (const PP_PropertyMap::Line & style,
UT_sint32 left, UT_sint32 top, UT_sint32 right, UT_sint32 bot,GR_Graphics * pGr)
{
- GR_Painter painter(getGraphics());
+ GR_Painter painter(pGr);
if (style.m_t_linestyle == PP_PropertyMap::linestyle_none)
return; // do not draw
++++++ abiword-link-grammar-api-fix.diff ++++++
Index: tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.cpp
===================================================================
--- tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.cpp (revision 23319)
+++ tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.cpp (working copy)
@@ -228,9 +228,9 @@
//if(szViolation != NULL)
{
UT_sint32 iLword = linkage_get_link_lword(linkage,j);
- char * szLword = linkage_get_word(linkage,iLword);
+ const char * szLword = linkage_get_word(linkage,iLword);
UT_sint32 iRword = linkage_get_link_rword(linkage,j);
- char * szRword = linkage_get_word(linkage,iRword);
+ const char * szRword = linkage_get_word(linkage,iRword);
//UT_DEBUGMSG(("Link %d |%s| and |%s|\n",i,szLword,szRword));
//UT_DEBUGMSG(("Left Word num %d Right Word num %d\n",iLword,iRword));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org