Hello community, here is the log from the commit of package abiword for openSUSE:Factory checked in at 2014-07-29 16:48:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abiword (Old) and /work/SRC/openSUSE:Factory/.abiword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abiword" Changes: -------- --- /work/SRC/openSUSE:Factory/abiword/abiword.changes 2014-05-02 13:53:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abiword.new/abiword.changes 2014-07-29 16:48:36.000000000 +0200 @@ -1,0 +2,41 @@ +Wed Jul 23 20:47:25 UTC 2014 - dimstar@opensuse.org + +- Update old-style -devel BuildRequires with pkgconfig()-style, + matching what configure checks for: + + Old: libgsf-devel, fribidi-devel, wv-devel, libxslt-devel, + enchant-devel, gtk3-devel. + + New pkgconfig(): libgsf-1, fribidi,, wv-1.0, libxslt, enchant, + gtk+-3.0, cairo. + +------------------------------------------------------------------- +Tue Jul 22 13:55:02 UTC 2014 - fstrba@suse.com + +- Add abiword-3.0.0-html_segfault.patch: + + upstream patch to fix segfault in the html conversion. + + this will fix build of abiword-docs on some platforms. + +------------------------------------------------------------------- +Tue Jul 22 09:59:47 UTC 2014 - fstrba@suse.com + +- Add abiword-3.0.0-linkgrammar.patch: + + upstream patch to fix building with newer versions of + linkgrammar. + +------------------------------------------------------------------- +Wed May 28 09:42:33 UTC 2014 - fstrba@suse.com + +- Add abiword-librevenge.patch: + + upstream patch to build against libwpd 0.10.x, libwpg 0.3.x + and libwps 0.3.x that have different ABI from their + predecessors. +- Add pkgconfig(librevenge-0.0) BuildRequires: the new base + framework library for the 3 above-mentioned libraries +- Replace old-style -devel BuildRequires with pkgconfig() style: + + old: libpwd-devel, libwpg-devel, libwps-devel. + + new: pkgconfig(libwpd-0.10,libwpg-0.3,libwps-0.3). +- As above patches touch the build system: + - Add libtool, autoconf and automake BuildRequires. + - Add copy of autogen-common.sh to correctly bootstrap the + sources. + +------------------------------------------------------------------- @@ -17,0 +59,10 @@ +Thu Oct 24 11:12:35 UTC 2013 - cornelis@solcon.nl + +- Update to final release 3.0.0: + + Besides porting to GTK+ 3.x, the AbiWord 3.0 release has a heck + of a lot of bug-fixes, much-improved internationalization, RDF + drag-and-drop, double-buffering of drawings to reduce screen + flickering, and numerous other changes throughout the entire + code-base. + +------------------------------------------------------------------- @@ -20,0 +72,34 @@ + +------------------------------------------------------------------- +Wed Aug 14 12:41:18 UTC 2013 - cornelis@solcon.nl + +- Update to svn. + +------------------------------------------------------------------- +Fri Jun 14 20:39:07 UTC 2013 - cornelis@solcon.nl + +- gtk2 is not supported, so back to gtk3, now done everywhere in + spec file: + + Replace gtk2-devel BuildRequires with gtk3-devel. + +------------------------------------------------------------------- +Fri Jun 14 19:38:21 UTC 2013 - cornelis@solcon.nl + +- Use gtk2 again: + + Replace gtk3-devel BuildRequires with gtk2-devel. + +------------------------------------------------------------------- +Sun Jun 2 07:25:53 UTC 2013 - cornelis@solcon.nl + +- Update to svn 3_0_0 branch + + Switch to GTK3. +- Replace gtk2-devel BuildRequires with gtk3-devel. +- Add libxslt-devel BuildRequires: new dependency. +- Replace pkgconfig(libgoffice-0.8) BuildRequires with + pkgconfig(libgoffice-0.10). +- Rename libabiword-2_8 subpackage to libabiword-3_0 and + libabiword-2_8-devel to libabiword-3_0-devel +- Remove all patches (are upstream now): + + abiword-gcc46.patch + + abiword-glib-2.31.patch + + abiword-libpng15.patch Old: ---- abiword-2.8.6.tar.bz2 abiword-gcc46.patch abiword-glib-2.31.patch abiword-libpng15.patch New: ---- abiword-3.0.0-html_segfault.patch abiword-3.0.0-linkgrammar.patch abiword-3.0.0.tar.gz abiword-librevenge.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.jrRDEH/_old 2014-07-29 16:48:39.000000000 +0200 +++ /var/tmp/diff_new_pack.jrRDEH/_new 2014-07-29 16:48:39.000000000 +0200 @@ -17,49 +17,56 @@ Name: abiword +Version: 3.0.0 +Release: 0 Summary: A Multiplatform Word Processor License: GPL-2.0+ Group: Productivity/Office/Word Processor -Version: 2.8.6 -Release: 0 # FIXME next version: check if the telepathy support still requires old version of empathy (with libempathy-gtk) # FIXME: package aiksaurus, libots, mathview-frontend-libxml2 Url: http://www.abisource.com/ -Source0: http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM abiword-gcc46.patch http://bugzilla.abisource.com/show_bug.cgi?id=13066 dimstar@opensuse.org -- Fix build with gcc 4.6 -Patch0: abiword-gcc46.patch -# PATCH-FIX-UPSTREAM abiword-glib-2.31.patch http://bugzilla.abisource.com/show_bug.cgi?id=13197 dimstar@opensuse.org -- Fix build with glib 2.31. -Patch1: abiword-glib-2.31.patch -# PATCH-FIX-UPSTREAM abiword-libpng15.patch pgajdos@suse.cz -- build also with libpng15 -Patch2: abiword-libpng15.patch +Source0: http://abisource.com/downloads/abiword/3.0.0/source/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM abiword-gcrypt-1.6.0.patch http://bugzilla.abisource.com/show_bug.cgi?id=13589 dimstar@opensuse.org -- Fix build with gcrypt 1.6.0 -Patch3: abiword-gcrypt-1.6.0.patch +Patch1: abiword-gcrypt-1.6.0.patch # PATCH-FIX-UPSTREAM abiword-boost.patch dimstar@opensuse.org -- Fix build with Boost x.x.x. -Patch4: abiword-boost.patch +Patch2: abiword-boost.patch +# PATCH-FIX-UPSTREAM abiword-librevenge.patch fstrba@suse.com -- Fix build against librevenge-based libraries (svn revs 34461, 34462, 34463, 34464 and 34468) +Patch3: abiword-librevenge.patch +# PATCH-FIX-UPSTREAM abiword-3.0.0-linkgrammar.patch fstrba@suse.com -- Upstream patch to build with newer linkgrammar (svn rev 34627) +Patch4: abiword-3.0.0-linkgrammar.patch +# PATCH-FIX-UPSTREAM abiword-3.0.0-html_segfault.patch fstrba@suse.com -- Upstream patch to fix segfault in the html export (svn rev 33531) +Patch5: abiword-3.0.0-html_segfault.patch BuildRequires: asio-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: boost-devel BuildRequires: dbus-1-glib-devel -BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: flex -BuildRequires: fribidi-devel BuildRequires: gcc-c++ -BuildRequires: gtk2-devel BuildRequires: libgcrypt-devel -BuildRequires: libgsf-devel BuildRequires: librsvg-devel BuildRequires: libsoup-devel +BuildRequires: libtool BuildRequires: libwmf-devel -BuildRequires: libwpd-devel -BuildRequires: libwpg-devel -BuildRequires: libwps-devel BuildRequires: link-grammar-devel BuildRequires: loudmouth-devel BuildRequires: readline-devel BuildRequires: update-desktop-files -BuildRequires: wv-devel -BuildRequires: pkgconfig(libgoffice-0.8) +BuildRequires: pkgconfig(cairo) >= 1.10 +BuildRequires: pkgconfig(enchant) >= 1.2.0 +BuildRequires: pkgconfig(fribidi) >= 0.10.4 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.8 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.0 +BuildRequires: pkgconfig(libgsf-1) >= 1.14.18 +BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(libwpd-0.10) +BuildRequires: pkgconfig(libwpg-0.3) +BuildRequires: pkgconfig(libwps-0.3) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(wv-1.0) >= 1.2.0 +Requires: libabiword-3_0 # FIXME: requires libgda >= 1.2.0 libgnomedb >= 1.2.0 and we have # libgda-[34].0.pc #BuildRequires: libgda-4_0-devel @@ -69,54 +76,71 @@ # libots-1 >= 0.5.0 # mathview-frontend-libxml2 >= 0.7.5 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libabiword-2_8 = %{version} Conflicts: abiword-unstable %description AbiWord is a multiplatform word processor with a GTK+ interface on the UNIX platform. -%package -n libabiword-2_8 -Requires: link-grammar +%package -n libabiword-3_0 Summary: A Multiplatform Word Processor - Library files Group: System/Libraries +Requires: link-grammar -%description -n libabiword-2_8 +%description -n libabiword-3_0 AbiWord is a multiplatform word processor with a GTK+ interface on the UNIX platform. -%package -n libabiword-2_8-devel +%package -n libabiword-3_0-devel Summary: A Multiplatform Word Processor - Development files Group: Development/Libraries/GNOME -Provides: %{name}-devel = %{version} -Obsoletes: %{name}-devel < %{version} Requires: cairo-devel Requires: enchant-devel Requires: fribidi-devel Requires: glib2-devel Requires: goffice-devel -Requires: gtk2-devel -Requires: libabiword-2_8 = %{version} +Requires: gtk3-devel +Requires: libabiword-3_0 = %{version} Requires: libgsf-devel Requires: librsvg-devel Requires: pango-devel Requires: wv-devel +Provides: %{name}-devel = %{version} +Obsoletes: %{name}-devel < %{version} -%description -n libabiword-2_8-devel +%description -n libabiword-3_0-devel AbiWord is a multiplatform word processor with a GTK+ interface on the UNIX platform. %prep %setup -q -%patch0 -p1 -%patch1 -p0 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 +%patch4 +%patch5 %build -# -fno-strict-aliasing added 2009-04-12. Still needed for 2.8.1. -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# We modified plugin configuration and thus we need to regenerate the whole build system +# The following script is lifted from upstream autogen-common.sh file that is not +# distributed in the release tarball. +find plugins -name Makefile.am | sed 's|.am$||g' > plugin-makefiles.m4 +find plugins -maxdepth 1 -type d | grep -v -e '^\.$' -e '\./\.' | sed 's|plugins/||g' | xargs echo > plugin-list.m4 +(for plugin in `cat plugin-list.m4`; do + u=`echo $plugin | tr '[:lower:]' '[:upper:]'` + echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin" = "yes")' +done) > plugin-builtin.m4 +find plugins -name plugin.m4 | xargs cat > plugin-configure.m4 +for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do + ln -sf $f +done +libtoolize --force --copy --install +autoreconf -fi + +# -fno-strict-aliasing added 2009-04-12. Leave it in because we are +# not sure it is not needed any more and the performance cost of this +# option is cheaper then random undefined behaviours. +CFLAGS="%{optflags} -fno-strict-aliasing" %configure --disable-static --with-pic \ --enable-dynamic \ --enable-plugins \ @@ -131,48 +155,43 @@ make %{?_smp_mflags} %install -%makeinstall -find %{buildroot} -name '*.la' -delete +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file %{name} -# fix weird installation of icon file -rm %{buildroot}%{_datadir}/icons/abiword_48.png -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -m644 abiword_48.png %{buildroot}%{_datadir}/pixmaps + %fdupes %{buildroot} %if 0%{?suse_version} > 1130 %post %desktop_database_post -%endif - -%if 0%{?suse_version} > 1130 %postun %desktop_database_postun + %endif -%post -n libabiword-2_8 -p /sbin/ldconfig +%post -n libabiword-3_0 -p /sbin/ldconfig -%postun -n libabiword-2_8 -p /sbin/ldconfig +%postun -n libabiword-3_0 -p /sbin/ldconfig %files %defattr(-, root, root) %doc AUTHORS COPYING COPYRIGHT.TXT %{_bindir}/* %{_datadir}/applications/abiword.desktop -%{_datadir}/pixmaps/abiword_48.png +%{_datadir}/icons/hicolor/48x48/apps/abiword.png %{_mandir}/man?/abiword.* -%files -n libabiword-2_8 +%files -n libabiword-3_0 %defattr(-, root, root) %{_libdir}/libabiword-*.so -%{_libdir}/abiword-2.8/ -%{_datadir}/abiword-2.8/ +%{_libdir}/abiword-3.0/ +%{_datadir}/abiword-3.0/ -%files -n libabiword-2_8-devel +%files -n libabiword-3_0-devel %defattr(-, root, root) -%{_includedir}/abiword-2.8/ -%{_libdir}/pkgconfig/abiword-2.8.pc +%{_includedir}/abiword-3.0/ +%{_libdir}/pkgconfig/abiword-3.0.pc %changelog ++++++ abiword-3.0.0-html_segfault.patch ++++++ Index: src/wp/impexp/xp/ie_exp_HTML_Listener.cpp =================================================================== --- src/wp/impexp/xp/ie_exp_HTML_Listener.cpp (revision 33530) +++ src/wp/impexp/xp/ie_exp_HTML_Listener.cpp (revision 33531) @@ -2232,12 +2232,18 @@ _openList(api, true); } } - - }else + } + else { - const gchar* szListStyle; + const gchar* szListStyle = NULL; pAP->getProperty("list-style", szListStyle); - bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0; + bool isOrdered = szListStyle + && (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0); +#ifdef DEBUG + if(!szListStyle) { + UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n")); + } +#endif ListInfo info; if (iCurrentLevel == 0) { ++++++ abiword-3.0.0-linkgrammar.patch ++++++ Index: plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp =================================================================== --- plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp (revision 34626) +++ plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp (revision 34627) @@ -145,59 +145,57 @@ } AbiGrammarError * pWordMap = new AbiGrammarError(); pWordMap->m_iErrLow = iLow; - pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i)); + pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i)); pWordMap->m_iWordNum = i; vecMapOfWords.addItem(pWordMap); bool bNew = false; - if(!sentence_nth_word_has_disjunction(sent, i)) + + //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); + if(pErr == NULL) { - //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); - if(pErr == NULL) + pErr = new AbiGrammarError(); + bNew = true; + } + if(bNew || (pErr->m_iWordNum + 1 < i)) + { + if(!bNew) { - pErr = new AbiGrammarError(); - bNew = true; + if(pErr) + { + delete pErr; + } + pErr = new AbiGrammarError(); } - if(bNew || (pErr->m_iWordNum + 1 < i)) + iHigh = iLow + strlen(linkage_get_word(linkage, i)); + pErr->m_iErrLow = iLow + iOff -1; + pErr->m_iErrHigh = iHigh + iOff -1; + if(pErr->m_iErrLow < 0) { - if(!bNew) - { - if(pErr) - { - delete pErr; - } - pErr = new AbiGrammarError(); - } - iHigh = iLow + strlen(sentence_get_nth_word(sent, i)); - pErr->m_iErrLow = iLow + iOff -1; - pErr->m_iErrHigh = iHigh + iOff -1; - if(pErr->m_iErrLow < 0) - { - pErr->m_iErrLow = 0; - } - if(pErr->m_iErrHigh < totlen-1) - { + pErr->m_iErrLow = 0; + } + if(pErr->m_iErrHigh < totlen-1) + { pErr->m_iErrHigh += 1; - } - pErr->m_iWordNum = i; - // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); - pT->m_vecGrammarErrors.addItem(pErr); - pErr = NULL; } - else + pErr->m_iWordNum = i; + // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); + pT->m_vecGrammarErrors.addItem(pErr); + pErr = NULL; + } + else + { + // + // Expand the sqiggle + // + iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff; + pErr->m_iErrHigh = iHigh; + if(pErr->m_iErrHigh < totlen-1) { - // - // Expand the sqiggle - // - iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff; - pErr->m_iErrHigh = iHigh; - if(pErr->m_iErrHigh < totlen-1) - { pErr->m_iErrHigh += 1; - } - pErr->m_iWordNum = i; } + pErr->m_iWordNum = i; } - iLow += strlen(sentence_get_nth_word(sent, i)); + iLow += strlen(linkage_get_word(linkage, i)); } // // No NULL links but still an error , mark the whole sentence bad. @@ -229,30 +227,6 @@ // } UT_UTF8String sErr = linkage_get_violation_name(linkage); // UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str())); - UT_sint32 count = linkage_get_num_sublinkages(linkage); - // - // Find linkages with violations - // - for(i=0; i<count;i++) - { - UT_sint32 iok = linkage_set_current_sublinkage(linkage, i); - if(iok == 0) - continue; - UT_sint32 j = 0; - UT_sint32 iNum = linkage_get_num_links(linkage); - for(j=0;j< iNum;j++) - // char * szViolation = linkage_get_violation_name(linkage); - //if(szViolation != NULL) - { - // debug disabled - //UT_sint32 iLword = linkage_get_link_lword(linkage,j); - //const char * szLword = linkage_get_word(linkage,iLword); - //UT_sint32 iRword = linkage_get_link_rword(linkage,j); - //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)); - } - } linkage_delete(linkage); for(i=0; i< vecMapOfWords.getItemCount(); i++) { ++++++ abiword-librevenge.patch ++++++ ++++ 1186 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org