January 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libofx for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package libofx for openSUSE:Factory checked in at 2015-01-30 17:50:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libofx (Old) and /work/SRC/openSUSE:Factory/.libofx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libofx" Changes: -------- --- /work/SRC/openSUSE:Factory/libofx/libofx.changes 2013-12-23 22:16:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libofx.new/libofx.changes 2015-01-30 17:51:42.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 30 13:18:27 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 0.9.10: + + Fix missing balance dates (ledger_balance_date, + available_balance_date). + +------------------------------------------------------------------- Old: ---- libofx-0.9.9.tar.gz New: ---- libofx-0.9.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libofx.spec ++++++ --- /var/tmp/diff_new_pack.s5KSx6/_old 2015-01-30 17:51:47.000000000 +0100 +++ /var/tmp/diff_new_pack.s5KSx6/_new 2015-01-30 17:51:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libofx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: libofx -Version: 0.9.9 +Version: 0.9.10 Release: 0 Summary: OFX Command Parser and API License: GPL-2.0+ Group: Development/Libraries/Other Url: http://libofx.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/libofx/libofx/0.9.9/%{name}-%{vers… +Source: http://downloads.sourceforge.net/project/libofx/libofx/0.9.10/%{name}-%{ver… BuildRequires: curl-devel BuildRequires: doxygen BuildRequires: fdupes @@ -89,8 +89,6 @@ mv %{buildroot}%{_datadir}/doc/libofx %{buildroot}%{_defaultdocdir}/%{name} rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL cp -a doc/ofx_sample_files/*.* %{buildroot}%{_defaultdocdir}/%{name}/ -## Remove backupfiles that should not be in the tarball. -rm %{buildroot}%{_defaultdocdir}/%{name}/*.*fx~ cp -a doc/html %{buildroot}%{_defaultdocdir}/%{name}/ %fdupes %{buildroot} rm -f %{buildroot}%{_libdir}/*.la @@ -103,7 +101,6 @@ %defattr(-,root,root) %doc %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/[ACNR]* -%doc %{_defaultdocdir}/%{name}/*.ofx %doc %{_defaultdocdir}/%{name}/*.txt %{_bindir}/* %{_datadir}/libofx/ ++++++ libofx-0.9.9.tar.gz -> libofx-0.9.10.tar.gz ++++++ ++++ 123087 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit abiword-docs for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package abiword-docs for openSUSE:Factory checked in at 2015-01-30 17:50:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abiword-docs (Old) and /work/SRC/openSUSE:Factory/.abiword-docs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abiword-docs" Changes: -------- --- /work/SRC/openSUSE:Factory/abiword-docs/abiword-docs.changes 2014-07-29 21:22:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abiword-docs.new/abiword-docs.changes 2015-01-30 17:51:11.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 16:35:22 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 3.0.1: + + Documentation updated for abiword 3.0.1. + +------------------------------------------------------------------- Old: ---- abiword-docs-3.0.0.tar.gz New: ---- abiword-docs-3.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword-docs.spec ++++++ --- /var/tmp/diff_new_pack.g5XVMs/_old 2015-01-30 17:51:18.000000000 +0100 +++ /var/tmp/diff_new_pack.g5XVMs/_new 2015-01-30 17:51:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package abiword-docs # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: abiword-docs -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: A Multiplatform Word Processor - Documentation License: GPL-2.0 Group: Productivity/Office/Word Processor Url: http://www.abisource.com/ -Source0: http://www.abisource.com/downloads/abiword/3.0.0/source/%{name}-%{version}.… +Source0: http://abisource.com/downloads/abiword/latest/source/%{name}-%{version}.tar… BuildRequires: abiword BuildRequires: fdupes BuildRequires: ghostscript-fonts-std ++++++ abiword-docs-3.0.0.tar.gz -> abiword-docs-3.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/Makefile.in new/abiword-docs-3.0.1/ABW/Makefile.in --- old/abiword-docs-3.0.0/ABW/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/howto/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/howto/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/howto/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/howto/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/info/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/info/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/info/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/info/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/interface/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/interface/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/interface/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/interface/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/plugins/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/plugins/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/plugins/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/plugins/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/problems/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/problems/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/problems/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/problems/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/en-US/tutorial/Makefile.in new/abiword-docs-3.0.1/ABW/en-US/tutorial/Makefile.in --- old/abiword-docs-3.0.0/ABW/en-US/tutorial/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/en-US/tutorial/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/howto/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/howto/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/howto/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/howto/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/info/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/info/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/info/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/info/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/interface/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/interface/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/interface/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/interface/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/plugins/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/plugins/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/plugins/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/plugins/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/problems/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/problems/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/problems/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/problems/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/fr-FR/tutorial/Makefile.in new/abiword-docs-3.0.1/ABW/fr-FR/tutorial/Makefile.in --- old/abiword-docs-3.0.0/ABW/fr-FR/tutorial/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/fr-FR/tutorial/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/howto/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/howto/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/howto/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/howto/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/info/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/info/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/info/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/info/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/interface/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/interface/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/interface/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/interface/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/plugins/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/plugins/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/plugins/Makefile.in 2013-10-13 21:59:08.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/plugins/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/problems/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/problems/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/problems/Makefile.in 2013-10-13 21:59:09.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/problems/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/ABW/pl-PL/tutorial/Makefile.in new/abiword-docs-3.0.1/ABW/pl-PL/tutorial/Makefile.in --- old/abiword-docs-3.0.0/ABW/pl-PL/tutorial/Makefile.in 2013-10-13 21:59:09.000000000 +0200 +++ new/abiword-docs-3.0.1/ABW/pl-PL/tutorial/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/Makefile.in new/abiword-docs-3.0.1/Makefile.in --- old/abiword-docs-3.0.0/Makefile.in 2013-10-13 21:59:09.000000000 +0200 +++ new/abiword-docs-3.0.1/Makefile.in 2014-12-24 05:11:26.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -498,10 +498,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -543,9 +549,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/aclocal.m4 new/abiword-docs-3.0.1/aclocal.m4 --- old/abiword-docs-3.0.0/aclocal.m4 2013-10-13 21:58:24.000000000 +0200 +++ new/abiword-docs-3.0.1/aclocal.m4 2014-12-24 05:10:45.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -220,6 +220,21 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -232,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -251,7 +266,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -320,6 +335,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -428,7 +449,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -436,7 +498,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/configure new/abiword-docs-3.0.1/configure --- old/abiword-docs-3.0.0/configure 2013-10-13 21:59:09.000000000 +0200 +++ new/abiword-docs-3.0.1/configure 2014-12-24 05:11:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for abiword-docs 3.0.0. +# Generated by GNU Autoconf 2.69 for abiword-docs 3.0.1. # # Report bugs to <http://www.abisource.com/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='abiword-docs' PACKAGE_TARNAME='abiword-docs' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='abiword-docs 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='abiword-docs 3.0.1' PACKAGE_BUGREPORT='http://www.abisource.com/' PACKAGE_URL='' @@ -1212,7 +1212,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures abiword-docs 3.0.0 to adapt to many kinds of systems. +\`configure' configures abiword-docs 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1278,7 +1278,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of abiword-docs 3.0.0:";; + short | recursive ) echo "Configuration of abiword-docs 3.0.1:";; esac cat <<\_ACEOF @@ -1367,7 +1367,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -abiword-docs configure 3.0.0 +abiword-docs configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1384,7 +1384,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by abiword-docs $as_me 3.0.0, which was +It was created by abiword-docs $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1732,7 +1732,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2247,7 +2247,7 @@ # Define the identity of the package. PACKAGE='abiword-docs' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -2298,6 +2298,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi @@ -3112,7 +3153,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by abiword-docs $as_me 3.0.0, which was +This file was extended by abiword-docs $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3165,7 +3206,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -abiword-docs config.status 3.0.0 +abiword-docs config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/configure.ac new/abiword-docs-3.0.1/configure.ac --- old/abiword-docs-3.0.0/configure.ac 2013-10-13 21:51:28.000000000 +0200 +++ new/abiword-docs-3.0.1/configure.ac 2014-12-24 04:47:33.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT([abiword-docs],[3.0.0],[http://www.abisource.com/]) +AC_INIT([abiword-docs],[3.0.1],[http://www.abisource.com/]) AM_INIT_AUTOMAKE PKG_PROG_PKG_CONFIG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abiword-docs-3.0.0/missing new/abiword-docs-3.0.1/missing --- old/abiword-docs-3.0.0/missing 2013-10-13 21:48:03.000000000 +0200 +++ new/abiword-docs-3.0.1/missing 2014-12-24 05:10:45.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libGLw for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package libGLw for openSUSE:Factory checked in at 2015-01-30 17:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libGLw (Old) and /work/SRC/openSUSE:Factory/.libGLw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libGLw" Changes: -------- --- /work/SRC/openSUSE:Factory/libGLw/libGLw.changes 2014-10-29 21:10:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libGLw.new/libGLw.changes 2015-01-30 17:50:43.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 30 10:20:28 UTC 2015 - sndirsch(a)suse.com + +- updated to current git 8.0.0_20130123_c4f7cdf; since + 1.0.0_20120320_4d1acb3 this is just a version bump to 8.0.0 + and one typo fix (git commit c4f7cdf) +- specfile cleanup + +------------------------------------------------------------------- Old: ---- glw-1.0.0_20120320_4d1acb3.tar.bz2 New: ---- glw-8.0.0_20130123_c4f7cdf.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libGLw.spec ++++++ --- /var/tmp/diff_new_pack.IfMFAL/_old 2015-01-30 17:50:45.000000000 +0100 +++ /var/tmp/diff_new_pack.IfMFAL/_new 2015-01-30 17:50:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libGLw # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,8 @@ Name: libGLw -%if 0%{?suse_version} > 1210 -%if 0%{?suse_version} < 1230 -%define use_motif 0 -%endif -%endif +# Needs to be set in buildservice project, see 'osc meta prjconf X11:XOrg' +# for an example %if 0%{?use_motif} > 0 %define lname libGLwM1 BuildRequires: openmotif-devel @@ -34,15 +31,14 @@ BuildRequires: pkgconfig(xt) Url: http://www.mesa3d.org Provides: Mesa:%{_libdir}/libGLw.so.1 -Version: 7.11.2 +Version: 8.0.0 Release: 0 -%define orgversion 1.0.0 -%define date 20120320 -%define sha1 4d1acb3 +%define date 20130123 +%define sha1 c4f7cdf Summary: Xt/Motif OpenGL drawing area widget library License: MIT Group: Development/Libraries/C and C++ -Source: glw-%{orgversion}_%{date}_%{sha1}.tar.bz2 +Source: glw-%{version}_%{date}_%{sha1}.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,7 +88,7 @@ Brian Paul %prep -%setup -q -n glw-%{orgversion} +%setup -q -n glw-%{version} %build %if 0%{?use_motif} > 0 ++++++ glw-1.0.0_20120320_4d1acb3.tar.bz2 -> glw-8.0.0_20130123_c4f7cdf.tar.bz2 ++++++ ++++ 7823 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glw-1.0.0/GLwDrawA.c new/glw-8.0.0/GLwDrawA.c --- old/glw-1.0.0/GLwDrawA.c 2012-03-20 15:29:46.000000000 +0100 +++ new/glw-8.0.0/GLwDrawA.c 2015-01-30 10:44:04.000000000 +0100 @@ -474,7 +474,7 @@ /* fix size */ if(req->core.width==0) neww->core.width=100; - if(req->core.height==0) neww->core.width=100; + if(req->core.height==0) neww->core.height=100; /* create the attribute list if needed */ neww->glwDrawingArea.myList=FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glw-1.0.0/compile new/glw-8.0.0/compile --- old/glw-1.0.0/compile 2012-03-20 16:12:41.000000000 +0100 +++ new/glw-8.0.0/compile 2015-01-30 10:47:50.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to <bug-automake(a)gnu.org> or send patches to # <automake-patches(a)gnu.org>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <bug-automake(a)gnu.org>. EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glw-1.0.0/configure.ac new/glw-8.0.0/configure.ac --- old/glw-1.0.0/configure.ac 2012-03-20 15:29:46.000000000 +0100 +++ new/glw-8.0.0/configure.ac 2015-01-30 10:44:04.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.59]) -AC_INIT([glw], [1.0.0], +AC_INIT([glw], [8.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa] AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glw-1.0.0/missing new/glw-8.0.0/missing --- old/glw-1.0.0/missing 2012-03-20 16:12:41.000000000 +0100 +++ new/glw-8.0.0/missing 2015-01-30 10:47:50.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit swftools for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package swftools for openSUSE:Factory checked in at 2015-01-30 17:49:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swftools (Old) and /work/SRC/openSUSE:Factory/.swftools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swftools" Changes: -------- --- /work/SRC/openSUSE:Factory/swftools/swftools.changes 2014-08-06 15:32:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.swftools.new/swftools.changes 2015-01-30 17:50:17.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 12:57:35 UTC 2015 - dimstar(a)opensuse.org + +- Update 0001-build-support-for-giflib-5.x.patch: cope with + giflib 5.1 API change (DGifCloseFile now takes two parameters). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swftools.spec ++++++ --- /var/tmp/diff_new_pack.NwdM3L/_old 2015-01-30 17:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.NwdM3L/_new 2015-01-30 17:50:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package swftools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ 0001-build-support-for-giflib-5.x.patch ++++++ --- /var/tmp/diff_new_pack.NwdM3L/_old 2015-01-30 17:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.NwdM3L/_new 2015-01-30 17:50:19.000000000 +0100 @@ -8,11 +8,11 @@ src/gif2swf.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) -diff --git a/src/gif2swf.c b/src/gif2swf.c -index 2359da5..5e52ea8 100644 ---- a/src/gif2swf.c -+++ b/src/gif2swf.c -@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx) +Index: swftools-0.9.2/src/gif2swf.c +=================================================================== +--- swftools-0.9.2.orig/src/gif2swf.c ++++ swftools-0.9.2/src/gif2swf.c +@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c GifFileType *gft; FILE *fi; @@ -20,7 +20,7 @@ if ((fi = fopen(sname, "rb")) == NULL) { if (VERBOSE(1)) -@@ -230,13 +231,22 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx) +@@ -230,13 +231,22 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c } fclose(fi); @@ -45,7 +45,19 @@ return t; } -@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname) +@@ -455,7 +465,11 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + + free(pal); + free(imagedata); ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ DGifCloseFile(gft, NULL); ++#else + DGifCloseFile(gft); ++#endif + + return t; + } +@@ -465,6 +479,7 @@ int CheckInputFile(char *fname, char **r FILE *fi; char *s = malloc(strlen(fname) + 5); GifFileType *gft; @@ -53,7 +65,7 @@ if (!s) exit(2); -@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname) +@@ -488,7 +503,12 @@ int CheckInputFile(char *fname, char **r } fclose(fi); @@ -67,7 +79,7 @@ fprintf(stderr, "%s is not a GIF file!\n", fname); return -1; } -@@ -498,8 +514,12 @@ int CheckInputFile(char *fname, char **realname) +@@ -498,8 +518,12 @@ int CheckInputFile(char *fname, char **r if (global.max_image_height < gft->SHeight) global.max_image_height = gft->SHeight; @@ -81,6 +93,15 @@ return -1; } // After DGifSlurp() call, gft->ImageCount become available --- -1.8.2 - +@@ -518,7 +542,11 @@ int CheckInputFile(char *fname, char **r + fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0); + } + ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ DGifCloseFile(gft, NULL); ++#else + DGifCloseFile(gft); ++#endif + + return 0; + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit abiword for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package abiword for openSUSE:Factory checked in at 2015-01-30 17:49:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-29 16:48:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abiword.new/abiword.changes 2015-01-30 17:50:03.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Jan 28 13:55:08 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 3.0.1: + + See http://www.abiword.org/release-notes/3.0.1.phtml for an + overview of all bugs fixed in this release. +- Drop upstream fixed patches: abiword-3.0.0-html_segfault.patch, + abiword-boost.patch, abiword-gcrypt-1.6.0.patch and + abiword-librevenge.patch. +- Drop libtool, autogen and automake BuildRequires: we don't touch + the buildsystem anymore. +- Drop the in-file copy of upstream's autogen.sh: as we don't have + to bootstrap, there is no need to preserve this code piece. If + we ever need it again, we better sync up with upstreams changes + at that moment again. + +------------------------------------------------------------------- +Mon Oct 6 19:47:40 UTC 2014 - dimstar(a)opensuse.org + +- Add abiword.appdata.xml to the package. + +------------------------------------------------------------------- Old: ---- abiword-3.0.0-html_segfault.patch abiword-3.0.0.tar.gz abiword-boost.patch abiword-gcrypt-1.6.0.patch abiword-librevenge.patch New: ---- abiword-3.0.1.tar.gz abiword.appdata.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.AdHGr6/_old 2015-01-30 17:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.AdHGr6/_new 2015-01-30 17:50:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package abiword # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: abiword -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: A Multiplatform Word Processor License: GPL-2.0+ @@ -25,20 +25,11 @@ # 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://abisource.com/downloads/abiword/3.0.0/source/%{name}-%{version}.tar.… -# PATCH-FIX-UPSTREAM abiword-gcrypt-1.6.0.patch http://bugzilla.abisource.com/show_bug.cgi?id=13589 dimstar(a)opensuse.org -- Fix build with gcrypt 1.6.0 -Patch1: abiword-gcrypt-1.6.0.patch -# PATCH-FIX-UPSTREAM abiword-boost.patch dimstar(a)opensuse.org -- Fix build with Boost x.x.x. -Patch2: abiword-boost.patch -# PATCH-FIX-UPSTREAM abiword-librevenge.patch fstrba(a)suse.com -- Fix build against librevenge-based libraries (svn revs 34461, 34462, 34463, 34464 and 34468) -Patch3: abiword-librevenge.patch +Source0: http://abisource.com/downloads/abiword/latest/source/%{name}-%{version}.tar… +Source1: abiword.appdata.xml # PATCH-FIX-UPSTREAM abiword-3.0.0-linkgrammar.patch fstrba(a)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(a)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 @@ -48,7 +39,6 @@ BuildRequires: libgcrypt-devel BuildRequires: librsvg-devel BuildRequires: libsoup-devel -BuildRequires: libtool BuildRequires: libwmf-devel BuildRequires: link-grammar-devel BuildRequires: loudmouth-devel @@ -114,29 +104,9 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 %patch4 -%patch5 %build -# 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. @@ -157,6 +127,8 @@ %install make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print +install -dm 0755 %{buildroot}%{_datadir}/appdata +install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/abiword.appdata.xml %suse_update_desktop_file %{name} %fdupes %{buildroot} @@ -179,8 +151,10 @@ %defattr(-, root, root) %doc AUTHORS COPYING COPYRIGHT.TXT %{_bindir}/* +%dir %{_datadir}/appdata +%{_datadir}/appdata/abiword.appdata.xml %{_datadir}/applications/abiword.desktop -%{_datadir}/icons/hicolor/48x48/apps/abiword.png +%{_datadir}/icons/hicolor/*/apps/abiword.* %{_mandir}/man?/abiword.* %files -n libabiword-3_0 ++++++ abiword-3.0.0.tar.gz -> abiword-3.0.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/abiword/abiword-3.0.0.tar.gz /work/SRC/openSUSE:Factory/.abiword.new/abiword-3.0.1.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnumeric for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package gnumeric for openSUSE:Factory checked in at 2015-01-30 17:49:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnumeric (Old) and /work/SRC/openSUSE:Factory/.gnumeric.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnumeric" Changes: -------- --- /work/SRC/openSUSE:Factory/gnumeric/gnumeric.changes 2014-09-28 19:54:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric.changes 2015-01-30 17:49:49.000000000 +0100 @@ -1,0 +2,37 @@ +Wed Jan 28 20:40:32 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.12.19: + + Add latex fragment exporter of visible rows only (bgo#739512). + + Fix ants problems. + + Plug leaks. + + Pay more attention to union access rules. + + Attempt a fix for clipboard crash (rh#1160975). + + Truncate long strings for display in stf import. + + Fix crash on closing a graph sheet. + + Fix undo crash with conditional formatting and insert row + (bgo#741197). + + Fix xlsx export of HYPGEOMDIST. + + Fix xlsx export of document properties. + + Fix multihead issue with graph windows. + + Improve test suite. + + Reorganize icon handling. + + Allow removing a specific item from the history (bgo#735305). + + Fix GNM_HALIGN_DISTRIBUTED rendering (bgo#726155). + + Restore translations of function help texts. + + Fix import of extended float formula results from wk4 files. + + Fix ADDRESS problem. + + Fix sheet-filter problem with errors (bgo#742601). + + Improve error handling for .gnumeric a bit. + + Improve xlsx graph import: line colour; marker size; marker + color; no lines; bounding box; trend lines; + regressionequations; axis label. + + Improve xlsx graph export: line style; bar/col direction; + marker shape; marker size; marker color; axis label; chart + title; trend lines. + + Improve xlsx export: default col widths; schema validity. + + Improve modifier handling (bgo#743130). + + Fix import of extended floats from wk4 files (bgo#739679). +- Add gnumeric-add-gda-missing-include.patch: Fix build. Patch + taken from upstream git. + +------------------------------------------------------------------- Old: ---- gnumeric-1.12.18.tar.xz New: ---- gnumeric-1.12.19.tar.xz gnumeric-add-gda-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnumeric.spec ++++++ --- /var/tmp/diff_new_pack.d5Bddp/_old 2015-01-30 17:49:53.000000000 +0100 +++ /var/tmp/diff_new_pack.d5Bddp/_new 2015-01-30 17:49:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnumeric # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: gnumeric -Version: 1.12.18 +Version: 1.12.19 Release: 0 Summary: Spreadsheet Application License: GPL-2.0 or GPL-3.0 Group: Productivity/Office/Spreadsheets Url: http://www.gnumeric.org/ Source0: http://download.gnome.org/sources/gnumeric/1.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnumeric-add-gda-missing-include.patch zaitor(a)opensuse.org -- Add a missing include, patch from upstream git. +Patch0: gnumeric-add-gda-missing-include.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libgsf-devel @@ -36,7 +38,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.7 BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0 BuildRequires: pkgconfig(libgda-ui-5.0) >= 5.0.0 -BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.10 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.19 BuildRequires: pkgconfig(libgsf-1) >= 1.14.24 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 BuildRequires: pkgconfig(pango) >= 1.24.0 @@ -97,6 +99,7 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream translation-update-upstream po-functions gnumeric-functions # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) ++++++ gnumeric-1.12.18.tar.xz -> gnumeric-1.12.19.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnumeric/gnumeric-1.12.18.tar.xz /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric-1.12.19.tar.xz differ: char 27, line 1 ++++++ gnumeric-add-gda-missing-include.patch ++++++ >From 8c7017d2cfef8c1c2e65b94bce7e19b61e94ded8 Mon Sep 17 00:00:00 2001 From: Morten Welinder <terra(a)gnome.org> Date: Mon, 26 Jan 2015 08:45:27 -0500 Subject: Compilation: missing include. Gnumeric 1.12.19 diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c index c3f5e4f..aa300b4 100644 --- a/plugins/gda/plugin-gda.c +++ b/plugins/gda/plugin-gda.c @@ -34,6 +34,7 @@ #include "workbook.h" #include "sheet.h" #include "gnm-i18n.h" +#include "gui-util.h" #include <goffice/goffice.h> #include <gnm-plugin.h> #include <dead-kittens.h> -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnucash for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package gnucash for openSUSE:Factory checked in at 2015-01-30 17:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnucash (Old) and /work/SRC/openSUSE:Factory/.gnucash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnucash" Changes: -------- --- /work/SRC/openSUSE:Factory/gnucash/gnucash.changes 2014-10-05 20:33:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnucash.new/gnucash.changes 2015-01-30 17:49:36.000000000 +0100 @@ -1,0 +2,30 @@ +Wed Jan 28 16:21:25 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 2.6.5: + + Pre-compile scm files when building with guile 2. + + Fix build-time hard-coded path introduced by the guile2 + compile changes. + + Prevent crash when standards-report dir doesn't exist. + + QIF Import crashes when closing via the 'X' button on the last + page. + + Omit extension on calls to load-extension. + + Use one common base directory to store all scheme files and + modules. + + Guile module structure cleanup. + + Harmonize variable names used to refer to guile modules in all + makefiles. + + Add missing comma in call to gtk_tree_store_set(). + + Revert to using numerical indexes for the x-axis on bar charts. + + Aqbanking: Add display of aqbanking subaccountid in initial + correspondence setup. + + Aqbanking online SEPA transfer: Allow transfers without BIC, + only IBAN. Also add IBAN checking. + + Aqbanking transfer: Make IBAN and BIC text entry fields filter + digits or alphas correctly as needed. + + Adapt german SKR03 account template to updated tax rate. + + Allow GUILE1_PROGS as m4 name. + + Add sv_AX, sv_FI, zh_HK, and zh_TW to Makefiles & configure. + + Updated translations. +- Drop gnucash-guile1.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- gnucash-2.6.4.tar.gz gnucash-guile1.patch New: ---- gnucash-2.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnucash.spec ++++++ --- /var/tmp/diff_new_pack.MRXSNN/_old 2015-01-30 17:49:38.000000000 +0100 +++ /var/tmp/diff_new_pack.MRXSNN/_new 2015-01-30 17:49:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnucash # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,18 @@ Name: gnucash -Version: 2.6.4 +Version: 2.6.5 Release: 0 Summary: Personal Finance Manager License: SUSE-GPL-2.0-with-openssl-exception or SUSE-GPL-3.0-with-openssl-exception Group: Productivity/Office/Finance Url: http://www.gnucash.org/ -Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/%{v… +Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.6… Source1: %{name}-rpmlintrc # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: gnucash-cpan-warning.patch # PATCH-FIX-UPSTREAM gnucash-libdbi-0.9.patch dimstar(a)opensuse.org -- Fix build with libdbi-0.9.0+git23 and newer Patch1: gnucash-libdbi-0.9.patch -# PATCH-FIX-UPSTREAM gnucash-guile1.patch dimstar(a)opensuse.org -- Properly detect GUILE1 on openSUSE -Patch2: gnucash-guile1.patch BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes @@ -145,7 +143,6 @@ # SLE12 contains libdbi 0.9.0, before this API change. %patch1 -p1 %endif -%patch2 -p1 %build autoreconf -fiv ++++++ gnucash-2.6.4.tar.gz -> gnucash-2.6.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/gnucash/gnucash-2.6.4.tar.gz /work/SRC/openSUSE:Factory/.gnucash.new/gnucash-2.6.5.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gitg for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package gitg for openSUSE:Factory checked in at 2015-01-30 17:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitg (Old) and /work/SRC/openSUSE:Factory/.gitg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gitg" Changes: -------- --- /work/SRC/openSUSE:Factory/gitg/gitg.changes 2014-12-16 14:48:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gitg.new/gitg.changes 2015-01-30 17:49:16.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 23:53:58 UTC 2015 - zaitor(a)opensuse.org + +- Add gitg-Show-correct-header-bars-buttons.patch: Show the correct + header bars buttons depending on the state. + +------------------------------------------------------------------- New: ---- gitg-Show-correct-header-bars-buttons.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.uSaWlA/_old 2015-01-30 17:49:20.000000000 +0100 +++ /var/tmp/diff_new_pack.uSaWlA/_new 2015-01-30 17:49:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gitg # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: Development/Tools/Version Control Url: http://trac.novowork.com/gitg/ Source0: http://download.gnome.org/sources/gitg/3.14/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gitg-Show-correct-header-bars-buttons.patch zaitor(a)opensuse.org -- Show the correct header bars buttons depending on the state. Patch from upstream git, stable branch. +Patch0: gitg-Show-correct-header-bars-buttons.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream @@ -129,6 +131,7 @@ %lang_package %prep %setup -q +%patch0 -p1 # Fixup build with WebKit2-4.0 see bgo#735299 sed -i 's:include name="WebKit2" version="3.0":include name="WebKit2" version="4.0":' Gitg-1.0.gir translation-update-upstream ++++++ gitg-Show-correct-header-bars-buttons.patch ++++++ >From ff5b8ba8dd775c764e0ad898fe2e2e3586a42c89 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro <icq(a)gnome.org> Date: Fri, 12 Dec 2014 12:52:47 +0100 Subject: Show the correct header bars buttons depending on the state diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala index 026407a..b00f054 100644 --- a/gitg/gitg-window.vala +++ b/gitg/gitg-window.vala @@ -854,13 +854,14 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable } var issel = (d_selectable_mode == GitgExt.SelectionMode.SELECTION); + var searchable = current_activity as GitgExt.Searchable; d_header_bar.show_close_button = !issel; - d_search_button.visible = !issel; + d_search_button.visible = !issel && searchable != null; d_gear_menu.visible = !issel; d_select_button.visible = !issel; d_dash_button.visible = !issel; - d_activities_switcher.visible = !issel; + d_activities_switcher.visible = !issel && d_repository != null; d_select_cancel_button.visible = issel; d_select_button.active = issel; -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opencv for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2015-01-30 17:47:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opencv" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2015-01-30 17:47:42.000000000 +0100 @@ -0,0 +1,448 @@ +------------------------------------------------------------------- +Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke(a)gmail.com + +- Add specific buildrequires for libpng15, so that we are + building against the system provided libpng. + +------------------------------------------------------------------- +Sat Jan 3 19:00:24 UTC 2015 - tittiatcoke(a)gmail.com + +- Enable Qt5 build for openCV. Unfortunately the Qt5 build will + conflict with the Qt4 version. + Added patch opencv-qt5-sobump.diff to have at least the libraries + enabled for co-installability + +------------------------------------------------------------------- +Tue May 13 14:56:21 EEST 2014 - koprok(a)gmail.com + +- Update to OpenCV 2.4.9 + More info at: + http://opencv.org/opencv-2-4-9-is-out.html + The brief list of changes: + * new 3D visualization module ‘viz’; + * performance fixes in ‘ocl’ module; + * fixes in Android Camera; + * improved CUDA support for mobile platforms; + * bugfixes from community; + * 55 reported bugs have been closed; + * 156 pull requests have been merged. + +------------------------------------------------------------------- +Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke(a)gmail.com + +- Drop the BuildRequires on libucil and libunicap for Factory. This + stops us from getting ride of Gstreamer 0.10 and besides these two + libraries seem to be unmaintained upstream as that the latest + actions are from 2010 + +------------------------------------------------------------------- +Thu Apr 3 11:22:56 UTC 2014 - tittiatcoke(a)gmail.com + +- Add upstream patch (3.0 version) to support Gstreamer 1.x + * bomb_commit_gstreamer-1x-support.patch + +------------------------------------------------------------------- +Thu Mar 13 07:50:56 UTC 2014 - tchvatal(a)suse.com + +- Upstream now provides tarballs with source only as git tags + from github so update Source0 path. + +------------------------------------------------------------------- +Wed Mar 12 12:13:39 UTC 2014 - tchvatal(a)suse.com + +- Add requires on various X extensions linked to opencv_ts module. + As those are present in the .pc file we need it anyway. + +------------------------------------------------------------------- +Sun Jan 19 15:57:26 EET 2014 - koprok(a)gmail.com + +- Update to OpenCV 2.4.8 + More info at: + http://opencv.org/opencv-2-4-8.html + The brief list of changes: + * NVidia CUDA support on Android devices with CUDA capable SoC and + CUDA sample; + * Concurrent kernel execution and user defined context support for + OpenCL; + * Integration with Intel Perceptual SDK and new depth sensors support + for Windows; + * 32 reported bugs have been closed; + * 139 pull requests have been merged; + +------------------------------------------------------------------- +Thu Jan 16 17:11:21 UTC 2014 - dvlaeev(a)suse.com + +- Fix build with altivec: + opencv-altivec-vector.patch + +------------------------------------------------------------------- +Sun Dec 1 17:37:36 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Added opencv-pkgconfig.patch: make sure to provide link flags in + OpenCV pc file (bnc#853036) + +------------------------------------------------------------------- +Tue Nov 12 23:07:23 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to OpenCV 2.4.7 + More info at: + http://opencv.org/opencv-2-4-7-is-out.html + The brief list of changes: + * dynamic OpenCL runtime loading, setting default OpenCL device + via env var, many bug-fixes and some new optimization with OpenCL + * bug-fixes and new optimizations in CUDA stuff + * latest NDK and Android OS support, Native Android Camera tuning + * minor fixes, XAML sample and MS Certification compatibility + in WinRT stuff + * 382 pull requests have been merged + * 54 reported bugs have been fixed +- Added pkgconfig(glu) Requires to devel package, as per .pc file +- Make devel package provides also devel-static one +- Drop assume-Sphinx-is-there.diff, and add improve-sphinx-search.diff, + for properly finding sphinx with alphabetic chars in version + +------------------------------------------------------------------- +Sun Nov 10 09:42:16 UTC 2013 - tittiatcoke(a)gmail.com + +- Add patch assume-Sphinx-is-there.diff to fix building with + Sphinx versions that have alphanumeric characters in the version + (Only for factory builds at the moment) + +------------------------------------------------------------------- +Sun Jul 14 16:54:56 UTC 2013 - asterios.dramis(a)gmail.com + +- Use eigen3 instead of eigen2 as build requirement for openSUSE > 12.3. +- Enable compilation with libucil and libunicap. +- Removed dos2unix build requirement (not needed anymore). + +------------------------------------------------------------------- +Fri Jul 12 11:22:31 EEST 2013 - koprok(a)nand.bg + +- Update to OpenCV 2.4.6.1 + More info at: + http://opencv.org/opencv-2-4-6-is-out.html + The brief list of changes: + * added video file i/o Windows RT and sample application using + camera, enabled parallelization with TBB or MS Concurrency + * added CUDA 5.5 support for desktop and ARM systems + * added Qt 5 support + * added many new OpenCL algorithms ports, included OpenCL binaries + into the Windows superpack + * iOS build scripts (together with Android ones) moved to + ‘opencv/platforms’ directory + * added functions for UIImage <-> cv::Mat conversion + * correct front/back camera selection in Android app framework + * added Linaro NDK support and fixes for MIPS to Android CMake + toolchain + * stability has been improved by a lot, numerous bug-fixes across + all the library + +------------------------------------------------------------------- +Wed Jun 26 20:26:48 UTC 2013 - crrodriguez(a)opensuse.org + +- build with LFS_CFLAGS in 32 bit archs. + +------------------------------------------------------------------- +Fri May 10 09:59:31 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Disable SSE3 for all architectures (bnc#814333) + +------------------------------------------------------------------- +Thu May 9 20:53:43 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Disable SSE(2) on non x86_64 architectures, causes crashing + kde#276923, bnc#789173 + +------------------------------------------------------------------- +Thu Apr 11 16:01:08 EEST 2013 - koprok(a)nand.bg + +- Update to OpenCV 2.4.5 + More info at: + http://opencv.org/opencv-2-4-5-is-out.html + The brief list of changes: + * experimental WinRT support + * new video super-resolution module + * CLAHE (adaptive histogram equalization) algorithm on both CPU + and GPU + * further improvements and extensions in ocl module + (stereo block matching and belief propagation have been added, + fixed crashes on Intel HD4000) + * Visual Studio 2012 cv::Mat visualizer plugin debugger tutorial + from Microsoft Research + * OpenCV4Android SDK improvements + (NDK r8e support, native activity sample using OpenCV Manager, + bug-fixes) + * ~25 reported problems have been resolved since 2.4.4, ~78 pull + requests have been merged, thanks everybody who participated! + +------------------------------------------------------------------- +Tue Mar 5 14:42:49 EET 2013 - koprok(a)nand.bg + +- Update to OpenCV 2.4.4 + More info at: + http://opencv.org/opencv-2-4-4-is-out.html + The brief list of changes: + * OpenCV Java bindings are ported from Android to desktop Java! + Actually any JVM language will work, see Tutorial for details, + and Java or Scala code samples. + * Android application framework, samples, tutorials, and OpenCV + Manager are improved. + * Optimizations for the new NVIDIA Kepler architecture, CARMA + platform support and other new optimizations in CUDA. + * OpenCL module now builds successfully with various SDKs (from + AMD, NVIDIA, Intel and Apple) and runs well on different GPUs + (AMD, NVidia, Intel HD4000). A lot of new functionality has been + added, tons of bugs fixed, performance of many functions has + been significantly improved. + * 100+ reported problems have been resolved since 2.4.3, thanks ++++ 251 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2014-05-17 21:46:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2015-01-30 17:47:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke(a)gmail.com + +- Add specific buildrequires for libpng15, so that we are + building against the system provided libpng. + +------------------------------------------------------------------- New: ---- opencv-qt5-sobump.diff opencv-qt5.changes opencv-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ # # spec file for package opencv-qt5 # # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_with ffmpeg %define libname lib%{name} %define soname 5_4 Name: opencv-qt5 Version: 2.4.9 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://opencv.org/ Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz # PATCH-FIX-OPENSUSE opencv-qt5-sobump.diff tittiatcoke(a)gmail.com -- increase the so version of the libraries to force co-installability with the Qt4 version Patch0: opencv-qt5-sobump.diff # PATCH-FIX-UPSTREAM opencv-samples.patch koprok(a)nand.bg -- Improve samples installation. Patch1: opencv-samples.patch # PATCH-FIX-UPSTREAM opencv-underlinking.patch koprok(a)nand.bg -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. Patch2: opencv-underlinking.patch # PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version Patch3: improve-sphinx-search.diff # PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on # getting opencv vars via pc (first), and then via CMake, as is the case with nomacs # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 Patch4: opencv-pkgconfig.patch Patch5: opencv-altivec-vector.patch # PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support Patch6: bomb_commit_gstreamer-1x-support.patch BuildRequires: cmake BuildRequires: fdupes %if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-base-devel %else BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libucil-devel BuildRequires: libunicap-devel %endif BuildRequires: libdc1394-devel %if 0%{?suse_version} > 1230 BuildRequires: libeigen3-devel %else BuildRequires: libeigen2-devel %endif %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libv4l-devel BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 %if 0%{?suse_version} > 1220 BuildRequires: ilmbase-devel BuildRequires: openexr-devel %else BuildRequires: OpenEXR-devel BuildRequires: libilmbase-devel %endif BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) BuildRequires: libpng16-devel BuildRequires: libpng16-compat-devel Conflicts: opencv BuildRoot: %{_tmppath}/%{name}-%{version}-build %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. %package -n %{libname}%{soname} Summary: Development files for using the OpenCV library Group: Development/Libraries/C and C++ %description -n %{libname}%{soname} The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with IPL and utilizes Intel Integrated Performance Primitives for better performance. %package devel Summary: Development files for using the OpenCV library Group: Development/Libraries/C and C++ # Since 2.4.7 Provides: %{name}-devel-static = %{version} Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} Requires: pkgconfig(gl) Requires: pkgconfig(glu) Requires: pkgconfig(ice) Requires: pkgconfig(sm) Requires: pkgconfig(x11) Requires: pkgconfig(xext) Conflicts: opencv-devel %description devel This package contains the OpenCV C/C++ library and header files, as well as documentation. It should be installed if you want to develop programs that will use the OpenCV library. %package -n python-%name Summary: Python bindings for apps which use OpenCV Group: Development/Libraries/Python Requires: python-base = %{py_ver} %py_requires Conflicts: python-opencv %description -n python-%name This package contains Python bindings for the OpenCV library. %package doc Summary: Documentation and examples for OpenCV Group: Development/Libraries/C and C++ Recommends: python # Since this package also contains examples that need -devel to be compiled Recommends: %{name}-devel Conflicts: opencv-doc %description doc This package contains the documentation and examples for the OpenCV library. %prep %setup -q -n opencv-%version %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 %patch5 -p1 %patch6 -p1 # Remove Windows specific files rm -f doc/packaging.txt # Fix "wrong-file-end-of-line-encoding" rpmlint warning sed -i 's/\r$//' samples/c/facedetect.cmd %build export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)" mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX='%{_prefix}' \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_TESTS=OFF \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ -DENABLE_OMIT_FRAME_POINTER=OFF \ -DWITH_QT=ON \ -DWITH_OPENGL=ON \ -DWITH_UNICAP=ON \ -DWITH_XINE=ON \ %if 0%{?suse_version} <= 1310 -DWITH_GSTREAMER_0_10=ON \ %endif %ifnarch x86_64 -DENABLE_SSE=0 \ -DENABLE_SSE2=0 \ %endif -DENABLE_SSE3=0 \ .. make %{?_smp_mflags} VERBOSE=1 %install cd build make DESTDIR=%{?buildroot:%{buildroot}} install/fast mkdir -p %{buildroot}%{_docdir} mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples # Fix rpmlint warning "doc-file-dependency" chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %fdupes -s %{buildroot}%{_includedir} %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/opencv_* %{_datadir}/OpenCV %exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake %files -n %{libname}%{soname} %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/opencv/ %{_includedir}/opencv2/ %{_libdir}/libopencv_ts.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/opencv.pc %{_datadir}/OpenCV/OpenCVConfig*.cmake %files -n python-%name %defattr(-,root,root,-) %{python_sitearch}/cv.py %{python_sitearch}/cv2.so %files doc %defattr(-,root,root,-) %{_docdir}/%{name}-doc/ %changelog ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.Y0OEEE/_old 2015-01-30 17:47:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Y0OEEE/_new 2015-01-30 17:47:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -77,6 +77,8 @@ BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) +BuildRequires: libpng16-devel +BuildRequires: libpng16-compat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ opencv-qt5-sobump.diff ++++++ diff -urB opencv-2.4.9/cmake/OpenCVVersion.cmake new/cmake/OpenCVVersion.cmake --- opencv-2.4.9/cmake/OpenCVVersion.cmake 2014-04-11 12:15:26.000000000 +0200 +++ new/cmake/OpenCVVersion.cmake 2015-01-03 19:56:37.829234402 +0100 @@ -1,7 +1,7 @@ SET(OPENCV_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/modules/core/include/opencv2/core/version.hpp") FILE(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_VERSION_[A-Z]+[ ]+[0-9]+" ) -string(REGEX REPLACE ".+CV_VERSION_EPOCH[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}") +set(OPENCV_VERSION_MAJOR 5) string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}") string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}") string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_TWEAK "${OPENCV_VERSION_PARTS}") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lcov for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '15

30 Jan '15

Hello community, here is the log from the commit of package lcov for openSUSE:Factory checked in at 2015-01-30 17:46:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lcov (Old) and /work/SRC/openSUSE:Factory/.lcov.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lcov" Changes: -------- --- /work/SRC/openSUSE:Factory/lcov/lcov.changes 2013-01-17 09:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lcov.new/lcov.changes 2015-01-30 17:47:16.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Jun 1 14:07:41 UTC 2014 - vmiklos(a)collabora.co.uk + +- Update to version 1.11: + + Improved support for GCC 4.7 + + Improved performance for specific functions + + Compatibility support for LLVM's gcov + + Multiple bug fixes and documentation improvements +- Adapt lcov-1.10-except-unreach.patch to upstream changes + > lcov-1.11-except-unreach.patch + +------------------------------------------------------------------- Old: ---- lcov-1.10-except-unreach.patch lcov-1.10.tar.bz2 New: ---- lcov-1.11-except-unreach.patch lcov-1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lcov.spec ++++++ --- /var/tmp/diff_new_pack.PWtgrV/_old 2015-01-30 17:47:19.000000000 +0100 +++ /var/tmp/diff_new_pack.PWtgrV/_new 2015-01-30 17:47:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lcov # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Summary: A Graphical GCOV Front-end License: GPL-2.0+ Group: Development/Tools/Other -Version: 1.10 +Version: 1.11 Release: 0 Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-except-unreach.patch ++++++ lcov-1.10-except-unreach.patch -> lcov-1.11-except-unreach.patch ++++++ --- /work/SRC/openSUSE:Factory/lcov/lcov-1.10-except-unreach.patch 2013-01-17 09:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lcov.new/lcov-1.11-except-unreach.patch 2015-01-30 17:47:11.000000000 +0100 @@ -1,14 +1,13 @@ Fixes: geninfo: Argument "=====" isn't numeric in numeric gt (>) at /usr/bin/geninfo line 1126. ---- lcov.orig/bin/geninfo 2012-03-12 04:26:08.000000000 -0700 -+++ lcov/bin/geninfo 2012-06-06 16:54:15.231499893 -0700 -@@ -1637,7 +1637,8 @@ - push(@result, 0); - } else { - # Check for zero count -- if ($count eq "#####") { -+ if ($count eq "#####" -+ or $count eq "=====") { - $count = 0; - } - push(@result, 1); +--- lcov-1.11.orig/bin/geninfo 2014-05-23 11:03:45.000000000 +0200 ++++ lcov-1.11/bin/geninfo 2014-06-01 15:51:23.334218890 +0200 +@@ -1760,7 +1760,7 @@ + + # Check for zero count which is indicated + # by ###### +- if ($number eq "######") { $number = 0; } ++ if ($number eq "######" or $number eq "=====") { $number = 0; } + + if ($exclude_line) { + # Register uninstrumented line instead ++++++ lcov-1.10.tar.bz2 -> lcov-1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/CHANGES new/lcov-1.11/CHANGES --- old/lcov-1.10/CHANGES 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/CHANGES 2014-05-23 11:03:45.000000000 +0200 @@ -1,3 +1,63 @@ +Version 1.11 +============ + +genhtml: +- Added current time to date information in HTML output. Based on patch by + sylvestre(a)debian.org +- Improved --demanglecpp performance. Based on suggestion by olly(a)survex.com +- Improved memory usage when combining files. Based on patch by olly(a)survex.com +- Changed initial function table sorting order to execution counts. Based on + suggestion by paul.bignier(a)hotmail.fr +- Fixed incorrect function execution counts when using --demanglecpp on + functions that demange to the same name +- Fixed handling of prefix with trailing /. Reported by ahmed_osman(a)mentor.com +- Fixed "use of uninitialized value" warning when processing incorrect + test description files. Reported by lbalbalba(a)gmail.com +- Fixed reordering of unnamed branch blocks during coverage data merging. + Contributed by jhutz(a)cmu.edu + +geninfo: +- Added exclusion markers for branch coverage. Contributed by s_stigler(a)gmx.de +- Added toleration support for .gcno files with trailing garbage. Reported by + christophe.guillon(a)st.com +- Fixed parsing of gcc 4.7 gcov format. Reported by fa.soft(a)gmx.net +- Fixed geninfo aborting on empty data directories. Based on suggestion by + rich_drake(a)yahoo.com +- Fixed "no data found" warning when using lcov with gcc 4.7 +- Fixed --no-external not working with --initial. Reported by + malcolm.parsons(a)gmail.com +- Fixed handling of non-english locales. Reported by s_stigler(a)gmx.de +- Fixed gcov tool version detection for gcov versions containing additional + versions in parenthesis. + +lcov: +- Added compatibility support with LLVM's gcov (NOT llvm-cov). Contributed by + jonah(a)petri.us +- Improved memory usage when combining files. Contributed by olly(a)survex.com +- Fixed lcov aborting when using --diff on a patch file that changes the list + of functions. Reported by Nasir.Amanullah(a)us.fujitsu.com +- Fixed whitespace handling in --rc options +- Fixed --config-file not being passed to geninfo. Reported by + liuyhlinux(a)gmail.com +- Fixed missing description for command line parameter value in man page. + Reported by sylvestre(a)mozilla.com +- Fixed reordering of unnamed branch blocks during coverage data merging. + Contributed by jhutz(a)cmu.edu + +lcov.spec: +- Fixed Perl dependency statement + +lcovrc: +- Added config file setting 'genhtml_desc_html' to allow using HTML markup in + test case description text + +CONTRIBUTING: +- Added contribution guidelines + +README: +- Improved note on lcov usage + + Version 1.10 ============ @@ -149,7 +209,7 @@ - Fixed errors when processing incomplete function names in .bb files - Fixed filename prefix detection - Fixed problem with matching filename -- Fixed problem when LANG is set to non-english locale. Reported by +- Fixed problem when LANG is set to non-English locale. Reported by benoit_belbezet(a)yahoo.fr. - Fixed short-name option ambiguities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/CONTRIBUTING new/lcov-1.11/CONTRIBUTING --- old/lcov-1.10/CONTRIBUTING 1970-01-01 01:00:00.000000000 +0100 +++ new/lcov-1.11/CONTRIBUTING 2014-05-23 11:03:45.000000000 +0200 @@ -0,0 +1,96 @@ +Contributing to LCOV +==================== + +Please read this document if you would like to help improving the LTP GCOV +extension (LCOV). In general, all types of contributions are welcome, for +example: + + * Fixes for code or documentation + * Performance and compatibility improvements + * Functional enhancements + +There are some rules that these contributions must follow to be acceptable for +inclusion: + + 1. The contribution must align with the project goals of LCOV. + 2. The contribution must follow a particular format. + 3. The contribution must be signed. + +Once you have made sure that your contribution follows these rules, send it via +e-mail to the LTP coverage mailing list [1]. + + +Signing your work +================= + +All contributions to LCOV must be signed by putting the following line at the +end of the explanation of a patch: + + Signed-off-by: Your Name <your.email(a)example.org> + +By signing a patch, you certify the following: + + By making a contribution to the LTP GCOV extension (LCOV) on + http://ltp.sourceforge.net, I certify that: + + a) The contribution was created by me and I have the right to submit it + under the terms and conditions of the open source license + "GNU General Public License, version 2 or later". + (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + + b) The contribution is made free of any other party's intellectual property + claims or rights. + + c) I understand and agree that this project and the contribution are public + and that a record of the contribution (including all personal information + I submit with it, including my sign-off) is maintained indefinitely and + may be redistributed consistent with this project or the open source + license(s) involved. + + +Project goals +============= + +The goal of LCOV is to provide a set of command line tools that can be used to +collect, process and visualize code coverage data as produced by the gcov tool +that is part of the GNU Compiler Collection (GCC) [2]. + +If you have an idea for a contribution but are unsure if it aligns with the +project goals, feel free to discuss the idea on the LTP coverage mailing +list [1]. + + +Contribution format +=================== + +To contribute a change, please create a patch using the diff utility with the +following command line options: + + diff -Naurp + +Please base your changes on the most current version of LCOV. You can use the +following command line to obtain this version from the "utils" module of the +LTP CVS repository (when asked for a password, simply press return): + + cvs -d:pserver:anonymous@ltp.cvs.sourceforge.net:/cvsroot/ltp login + cvs -z3 -d:pserver:anonymous@ltp.cvs.sourceforge.net:/cvsroot/ltp co -P utils + +You can find LCOV in sub-directory "utils/analysis/lcov". + +Add a meaningful description of the contribution to the top of the patch. The +description should follow this format: + + component: short description + + detailed description + + Signed-off-by: Your Name <your.email(a)example.org> + +With your Signed-off-by, you certify the rules stated in section +"Signing your work". + + +-- + +[1] ltp-coverage(a)lists.sourceforge.net +[2] http://gcc.gnu.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/Makefile new/lcov-1.11/Makefile --- old/lcov-1.10/Makefile 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/Makefile 2014-05-23 11:03:45.000000000 +0200 @@ -11,7 +11,7 @@ # - clean: remove all generated files # -VERSION := 1.10 +VERSION := 1.11 RELEASE := 1 CFG_DIR := $(PREFIX)/etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/README new/lcov-1.11/README --- old/lcov-1.10/README 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/README 2014-05-23 11:03:45.000000000 +0200 @@ -1,6 +1,6 @@ ------------------------------------------------- - README file for the LTP GCOV extension (LCOV) - -- Last changes: 2012-10-10 - +- Last changes: 2014-05-23 - ------------------------------------------------- Description @@ -109,11 +109,14 @@ lcov --directory appdir --zerocounters - b) Capturing the current coverage state to a file (works only after the - application has been started and stopped at least once) + b) Capturing the current coverage state to a file lcov --directory appdir --capture --output-file app.info + Note that this step only works after the application has + been started and stopped at least once. Otherwise lcov will + abort with an error mentioning that there are no data/.gcda files. + c) Getting HTML output genhtml app.info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/bin/gendesc new/lcov-1.11/bin/gendesc --- old/lcov-1.10/bin/gendesc 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/bin/gendesc 2014-05-23 11:03:45.000000000 +0200 @@ -41,7 +41,7 @@ # Constants -our $lcov_version = 'LCOV version 1.10'; +our $lcov_version = 'LCOV version 1.11'; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/bin/genhtml new/lcov-1.11/bin/genhtml --- old/lcov-1.10/bin/genhtml 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/bin/genhtml 2014-05-23 11:03:45.000000000 +0200 @@ -65,14 +65,15 @@ # use strict; -use File::Basename; +use File::Basename; +use File::Temp qw(tempfile); use Getopt::Long; use Digest::MD5 qw(md5_base64); # Global constants our $title = "LCOV - code coverage report"; -our $lcov_version = 'LCOV version 1.10'; +our $lcov_version = 'LCOV version 1.11'; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); @@ -145,6 +146,7 @@ our $BR_TAKEN = 2; our $BR_VEC_ENTRIES = 3; our $BR_VEC_WIDTH = 32; +our $BR_VEC_MAX = vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH); # Additional offsets used when converting branch coverage data to HTML our $BR_LEN = 3; @@ -299,6 +301,7 @@ our @rate_png = ("ruby.png", "amber.png", "emerald.png"); our $lcov_func_coverage = 1; our $lcov_branch_coverage = 0; +our $rc_desc_html = 0; # lcovrc: genhtml_desc_html our $cwd = `pwd`; # Current working directory chomp($cwd); @@ -369,6 +372,7 @@ "genhtml_branch_field_width" => \$br_field_width, "genhtml_sort" => \$sort, "genhtml_charset" => \$charset, + "genhtml_desc_html" => \$rc_desc_html, "lcov_function_coverage" => \$lcov_func_coverage, "lcov_branch_coverage" => \$lcov_branch_coverage, }); @@ -672,6 +676,170 @@ if ($br_do); } +sub get_fn_list($) +{ + my ($info) = @_; + my %fns; + my @result; + + foreach my $filename (keys(%{$info})) { + my $data = $info->{$filename}; + my $funcdata = $data->{"func"}; + my $sumfnccount = $data->{"sumfnc"}; + + if (defined($funcdata)) { + foreach my $func_name (keys(%{$funcdata})) { + $fns{$func_name} = 1; + } + } + + if (defined($sumfnccount)) { + foreach my $func_name (keys(%{$sumfnccount})) { + $fns{$func_name} = 1; + } + } + } + + @result = keys(%fns); + + return \@result; +} + +# +# rename_functions(info, conv) +# +# Rename all function names in INFO according to CONV: OLD_NAME -> NEW_NAME. +# In case two functions demangle to the same name, assume that they are +# different object code implementations for the same source function. +# + +sub rename_functions($$) +{ + my ($info, $conv) = @_; + + foreach my $filename (keys(%{$info})) { + my $data = $info->{$filename}; + my $funcdata; + my $testfncdata; + my $sumfnccount; + my %newfuncdata; + my %newsumfnccount; + my $f_found; + my $f_hit; + + # funcdata: function name -> line number + $funcdata = $data->{"func"}; + foreach my $fn (keys(%{$funcdata})) { + my $cn = $conv->{$fn}; + + # Abort if two functions on different lines map to the + # same demangled name. + if (defined($newfuncdata{$cn}) && + $newfuncdata{$cn} != $funcdata->{$fn}) { + die("ERROR: Demangled function name $fn ". + " maps to different lines (". + $newfuncdata{$cn}." vs ". + $funcdata->{$fn}.")\n"); + } + $newfuncdata{$cn} = $funcdata->{$fn}; + } + $data->{"func"} = \%newfuncdata; + + # testfncdata: test name -> testfnccount + # testfnccount: function name -> execution count + $testfncdata = $data->{"testfnc"}; + foreach my $tn (keys(%{$testfncdata})) { + my $testfnccount = $testfncdata->{$tn}; + my %newtestfnccount; + + foreach my $fn (keys(%{$testfnccount})) { + my $cn = $conv->{$fn}; + + # Add counts for different functions that map + # to the same name. + $newtestfnccount{$cn} += + $testfnccount->{$fn}; + } + $testfncdata->{$tn} = \%newtestfnccount; + } + + # sumfnccount: function name -> execution count + $sumfnccount = $data->{"sumfnc"}; + foreach my $fn (keys(%{$sumfnccount})) { + my $cn = $conv->{$fn}; + + # Add counts for different functions that map + # to the same name. + $newsumfnccount{$cn} += $sumfnccount->{$fn}; + } + $data->{"sumfnc"} = \%newsumfnccount; + + # Update function found and hit counts since they may have + # changed + $f_found = 0; + $f_hit = 0; + foreach my $fn (keys(%newsumfnccount)) { + $f_found++; + $f_hit++ if ($newsumfnccount{$fn} > 0); + } + $data->{"f_found"} = $f_found; + $data->{"f_hit"} = $f_hit; + } +} + +# +# demangle_cpp(INFO) +# +# Demangle all function names found in INFO. +# +sub demangle_cpp($) +{ + my ($info) = @_; + my $fn_list = get_fn_list($info); + my @fn_list_demangled; + my $tmpfile; + my $handle; + my %demangled; + my $changed; + + # Nothing to do + return if (!@$fn_list); + + # Write list to temp file + (undef, $tmpfile) = tempfile(); + die("ERROR: could not create temporary file") if (!defined($tmpfile)); + open($handle, ">", $tmpfile) or + die("ERROR: could not write to $tmpfile: $!\n"); + print($handle join("\n", @$fn_list)); + close($handle); + + # Run c++ filt on tempfile file and parse output, creating a hash + open($handle, "-|", "c++filt < $tmpfile") or + die("ERROR: could not run c++filt: $!\n"); + @fn_list_demangled = <$handle>; + close($handle); + unlink($tmpfile) or + warn("WARNING: could not remove temporary file $tmpfile: $!\n"); + + if (scalar(@fn_list_demangled) != scalar(@$fn_list)) { + die("ERROR: c++filt output not as expected (". + scalar(@fn_list_demangled)." vs ". + scalar(@$fn_list).") lines\n"); + } + + # Build old_name -> new_name + $changed = 0; + for (my $i = 0; $i < scalar(@$fn_list); $i++) { + chomp($fn_list_demangled[$i]); + $demangled{$fn_list->[$i]} = $fn_list_demangled[$i]; + $changed++ if ($fn_list->[$i] ne $fn_list_demangled[$i]); + } + + info("Demangling $changed function names\n"); + + # Change all occurrences of function names in INFO + rename_functions($info, \%demangled); +} # # gen_html() @@ -730,6 +898,9 @@ %info_data = %{apply_baseline(\%info_data, \%base_data)}; } + # Demangle C++ function names if requested + demangle_cpp(\%info_data) if ($demangle_cpp); + @dir_list = get_dir_list(keys(%info_data)); if ($no_prefix) @@ -756,6 +927,7 @@ { info("Using user-specified filename prefix \"". "$dir_prefix\"\n"); + $dir_prefix =~ s/\/+$//; } # Read in test description file if specified @@ -1239,6 +1411,10 @@ # "func" -> \%funcdata # "found" -> $lines_found (number of instrumented lines found in file) # "hit" -> $lines_hit (number of executed lines in file) +# "f_found" -> $fn_found (number of instrumented functions found in file) +# "f_hit" -> $fn_hit (number of executed functions in file) +# "b_found" -> $br_found (number of instrumented branches found in file) +# "b_hit" -> $br_hit (number of executed branches in file) # "check" -> \%checkdata # "testfnc" -> \%testfncdata # "sumfnc" -> \%sumfnccount @@ -1662,8 +1838,8 @@ sub add_counts($$) { - my %data1 = %{$_[0]}; # Hash 1 - my %data2 = %{$_[1]}; # Hash 2 + my $data1_ref = $_[0]; # Hash 1 + my $data2_ref = $_[1]; # Hash 2 my %result; # Resulting hash my $line; # Current line iteration scalar my $data1_count; # Count of line in hash1 @@ -1671,10 +1847,10 @@ my $found = 0; # Total number of lines found my $hit = 0; # Number of lines with a count > 0 - foreach $line (keys(%data1)) + foreach $line (keys(%$data1_ref)) { - $data1_count = $data1{$line}; - $data2_count = $data2{$line}; + $data1_count = $data1_ref->{$line}; + $data2_count = $data2_ref->{$line}; # Add counts if present in both hashes if (defined($data2_count)) { $data1_count += $data2_count; } @@ -1686,14 +1862,14 @@ if ($data1_count > 0) { $hit++; } } - # Add lines unique to data2 - foreach $line (keys(%data2)) + # Add lines unique to data2_ref + foreach $line (keys(%$data2_ref)) { - # Skip lines already in data1 - if (defined($data1{$line})) { next; } + # Skip lines already in data1_ref + if (defined($data1_ref->{$line})) { next; } - # Copy count from data2 - $result{$line} = $data2{$line}; + # Copy count from data2_ref + $result{$line} = $data2_ref->{$line}; $found++; if ($result{$line} > 0) { $hit++; } @@ -2348,6 +2524,9 @@ # Match lines beginning with TD:<whitespace(s)> if (/^TD:\s+(.*?)\s*$/) { + if (!defined($test_name)) { + die("ERROR: Found test description without prior test name in $_[0]:$.\n"); + } # Check for empty line if ($1) { @@ -2415,10 +2594,15 @@ my $year; my $month; my $day; + my $hour; + my $min; + my $sec; - ($year, $month, $day) = (localtime())[5, 4, 3]; + ($year, $month, $day, $hour, $min, $sec) = + (localtime())[5, 4, 3, 2, 1, 0]; - return sprintf("%d-%02d-%02d", $year+1900, $month+1, $day); + return sprintf("%d-%02d-%02d %02d:%02d:%02d", $year+1900, $month+1, + $day, $hour, $min, $sec); } @@ -2475,8 +2659,10 @@ foreach $test_name (sort(keys(%description))) { - write_test_table_entry(*HTML_HANDLE, $test_name, - escape_html($description{$test_name})); + my $desc = $description{$test_name}; + + $desc = escape_html($desc) if (!$rc_desc_html); + write_test_table_entry(*HTML_HANDLE, $test_name, $desc); } write_test_table_epilog(*HTML_HANDLE); @@ -4273,7 +4459,11 @@ if ($func_coverage) { $view .= "<span style=\"font-size: 80%;\">"; if ($type == $HDR_SOURCE) { - $view .= " (source / <a href=\"$base_name.func.$html_ext\">functions</a>)"; + if ($sort) { + $view .= " (source / <a href=\"$base_name.func-sort-c.$html_ext\">functions</a>)"; + } else { + $view .= " (source / <a href=\"$base_name.func.$html_ext\">functions</a>)"; + } } elsif ($type == $HDR_FUNC) { $view .= " (<a href=\"$base_name.gcov.$html_ext\">source</a> / functions)"; } @@ -4852,6 +5042,7 @@ # Retrieve data from vector $block = vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH); + $block = -1 if ($block == $BR_VEC_MAX); $branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH); $taken = vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH); @@ -4877,10 +5068,12 @@ my $i; $vec = "" if (!defined($vec)); + $block = $BR_VEC_MAX if $block < 0; # Check if branch already exists in vector for ($i = 0; $i < $num; $i++) { my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i); + $v_block = $BR_VEC_MAX if $v_block < 0; next if ($v_block != $block || $v_branch != $branch); @@ -5136,8 +5329,10 @@ if ($type == 0) { return sort(keys(%{$funcdata})); } - return sort({$sumfncdata->{$b} <=> $sumfncdata->{$a}} - keys(%{$sumfncdata})); + return sort({ + $sumfncdata->{$b} == $sumfncdata->{$a} ? + $a cmp $b : $sumfncdata->{$a} <=> $sumfncdata->{$b} + } keys(%{$sumfncdata})); } # @@ -5194,12 +5389,7 @@ my $count = $sumfncdata->{$name}; my $countstyle; - # Demangle C++ function names if requested - if ($demangle_cpp) { - $name = `c++filt "$name"`; - chomp($name); - } - # Escape any remaining special characters + # Escape special characters $name = escape_html($name); if ($startline < 1) { $startline = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/bin/geninfo new/lcov-1.11/bin/geninfo --- old/lcov-1.10/bin/geninfo 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/bin/geninfo 2014-05-23 11:03:45.000000000 +0200 @@ -61,7 +61,7 @@ } # Constants -our $lcov_version = 'LCOV version 1.10'; +our $lcov_version = 'LCOV version 1.11'; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $gcov_tool = "gcov"; our $tool_name = basename($0); @@ -88,6 +88,11 @@ our $EXCL_STOP = "LCOV_EXCL_STOP"; our $EXCL_LINE = "LCOV_EXCL_LINE"; +# Marker to exclude branch coverage but keep function and line coveage +our $EXCL_BR_START = "LCOV_EXCL_BR_START"; +our $EXCL_BR_STOP = "LCOV_EXCL_BR_STOP"; +our $EXCL_BR_LINE = "LCOV_EXCL_BR_LINE"; + # Compatibility mode values our $COMPAT_VALUE_OFF = 0; our $COMPAT_VALUE_ON = 1; @@ -140,8 +145,9 @@ our $BR_TAKEN = 3; our $BR_VEC_ENTRIES = 4; our $BR_VEC_WIDTH = 32; +our $BR_VEC_MAX = vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH); -our $UNNAMED_BLOCK = 9999; +our $UNNAMED_BLOCK = -1; # Prototypes sub print_usage(*); @@ -266,8 +272,8 @@ # Prettify version string $lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/; -# Set LANG so that gcov output will be in a unified format -$ENV{"LANG"} = "C"; +# Set LC_ALL so that gcov output will be in a unified format +$ENV{"LC_ALL"} = "C"; # Check command line for a configuration file name Getopt::Long::Configure("pass_through", "no_auto_abbrev"); @@ -275,6 +281,16 @@ "rc=s%" => \%opt_rc); Getopt::Long::Configure("default"); +# Remove spaces around rc options +while (my ($key, $value) = each(%opt_rc)) { + delete($opt_rc{$key}); + + $key =~ s/^\s+|\s+$//g; + $value =~ s/^\s+|\s+$//g; + + $opt_rc{$key} = $value; +} + # Read configuration file if available if (defined($opt_config_file)) { $config = read_config($opt_config_file); @@ -684,8 +700,11 @@ @file_list = `find "$directory" $maxdepth $follow -name \\*$ext -type f 2>/dev/null`; chomp(@file_list); - @file_list or - die("ERROR: no $ext files found in $directory!\n"); + if (!@file_list) { + warn("WARNING: no $ext files found in $directory - ". + "skipping!\n"); + return; + } $prefix = get_common_prefix(1, @file_list); info("Found %d %s files in %s\n", $#file_list+1, $type, $directory); @@ -861,7 +880,6 @@ my $source; # gcov source header information my $object; # gcov object header information my @matches; # List of absolute paths matching filename - my @unprocessed; # List of unprocessed source code files my $base_dir; # Base directory for current file my @tmp_links; # Temporary links to be cleaned up my @result; @@ -1057,7 +1075,6 @@ # Traverse the list of generated .gcov files and combine them into a # single .info file - @unprocessed = keys(%{$instr}); foreach $gcov_file (sort(@gcov_list)) { my $i; @@ -1140,16 +1157,6 @@ \@matches, \@gcov_content); } - # Remove processed file from list - for ($index = scalar(@unprocessed) - 1; $index >= 0; $index--) - { - if ($unprocessed[$index] eq $source_filename) - { - splice(@unprocessed, $index, 1); - last; - } - } - # Skip external files if requested if (!$opt_external) { if (is_external($source_filename)) { @@ -1246,6 +1253,7 @@ my ($line, $block, $branch, $taken) = br_gvec_get($gcov_branches, $i); + $block = $BR_VEC_MAX if ($block < 0); print(INFO_HANDLE "BRDA:$line,$block,$branch,$taken\n"); $br_found++; $br_hit++ if ($taken ne '-' && $taken > 0); @@ -1294,16 +1302,6 @@ unlink($gcov_file); } - # Check for files which show up in the graph file but were never - # processed - if (@unprocessed && @gcov_list) - { - foreach (@unprocessed) - { - warn("WARNING: no data found for $_\n"); - } - } - if (!($output_filename && ($output_filename eq "-"))) { close(INFO_HANDLE); @@ -1600,6 +1598,7 @@ # Retrieve data from vector $line = vec($vec, $offset + $BR_LINE, $BR_VEC_WIDTH); $block = vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH); + $block = -1 if ($block == $BR_VEC_MAX); $branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH); $taken = vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH); @@ -1627,6 +1626,7 @@ $vec = "" if (!defined($vec)); $offset = br_gvec_len($vec) * $BR_VEC_ENTRIES; + $block = $BR_VEC_MAX if $block < 0; # Encode taken value into an integer if ($taken eq "-") { @@ -1676,6 +1676,8 @@ my $number; my $exclude_flag = 0; my $exclude_line = 0; + my $exclude_br_flag = 0; + my $exclude_branch = 0; my $last_block = $UNNAMED_BLOCK; my $last_line = 0; local *INPUT; @@ -1702,11 +1704,13 @@ if (/^branch\s+(\d+)\s+taken\s+=\s+(\d+)/) { next if (!$br_coverage); next if ($exclude_line); + next if ($exclude_branch); $branches = br_gvec_push($branches, $last_line, $last_block, $1, $2); } elsif (/^branch\s+(\d+)\s+never\s+executed/) { next if (!$br_coverage); next if ($exclude_line); + next if ($exclude_branch); $branches = br_gvec_push($branches, $last_line, $last_block, $1, '-'); } @@ -1730,6 +1734,19 @@ $exclude_line = 0; } } + # Check for exclusion markers (branch exclude) + if (!$no_markers) { + if (/$EXCL_BR_STOP/) { + $exclude_br_flag = 0; + } elsif (/$EXCL_BR_START/) { + $exclude_br_flag = 1; + } + if (/$EXCL_BR_LINE/ || $exclude_br_flag) { + $exclude_branch = 1; + } else { + $exclude_branch = 0; + } + } # Source code execution data if (/^\t\t(.*)$/) { @@ -1775,11 +1792,13 @@ } elsif (/^branch\s+(\d+)\s+taken\s+(\d+)/) { next if (!$br_coverage); next if ($exclude_line); + next if ($exclude_branch); $branches = br_gvec_push($branches, $last_line, $last_block, $1, $2); } elsif (/^branch\s+(\d+)\s+never\s+executed/) { next if (!$br_coverage); next if ($exclude_line); + next if ($exclude_branch); $branches = br_gvec_push($branches, $last_line, $last_block, $1, '-'); } @@ -1814,6 +1833,20 @@ $exclude_line = 0; } } + # Check for exclusion markers (branch exclude) + if (!$no_markers) { + if (/$EXCL_BR_STOP/) { + $exclude_br_flag = 0; + } elsif (/$EXCL_BR_START/) { + $exclude_br_flag = 1; + } + if (/$EXCL_BR_LINE/ || $exclude_br_flag) { + $exclude_branch = 1; + } else { + $exclude_branch = 0; + } + } + # <exec count>:<line number>:<source code> if ($line eq "0") { @@ -1833,7 +1866,7 @@ push(@result, 0); } else { # Check for zero count - if ($count eq "#####") { + if ($count =~ /^[#=]/) { $count = 0; } push(@result, 1); @@ -1846,7 +1879,7 @@ } close(INPUT); - if ($exclude_flag) { + if ($exclude_flag || $exclude_br_flag) { warn("WARNING: unterminated exclusion section in $filename\n"); } return(\@result, $branches, \@functions); @@ -1865,11 +1898,21 @@ my $version_string; my $result; - open(GCOV_PIPE, "-|", "$gcov_tool -v") + open(GCOV_PIPE, "-|", "$gcov_tool --version") or die("ERROR: cannot retrieve gcov version!\n"); $version_string = <GCOV_PIPE>; + # LLVM gcov keeps version information on the second line. + # For example, gcov --version yields: + # LLVM (http://llvm.org/) + # LLVM version 3.4svn + $version_string = <GCOV_PIPE> if ($version_string =~ /LLVM/); close(GCOV_PIPE); + # Remove version information in parenthesis to cope with the following: + # - gcov (GCC) 4.4.7 20120313 (Red Hat 4.4.7-3) + # - gcov (crosstool-NG 1.18.0) 4.7.2 + $version_string =~ s/$[^$]*\)//g; + $result = 0; if ($version_string =~ /(\d+)\.(\d+)(\.(\d+))?/) { @@ -1884,6 +1927,21 @@ $result = $1 << 16 | $2 << 8; } } + if ($version_string =~ /LLVM/) + { + # Map LLVM versions to the version of GCC gcov which + # they emulate + if ($result >= 0x030400) + { + info("Found LLVM gcov version 3.4, which emulates gcov version 4.2\n"); + $result = 0x040200; + } + else + { + warn("This version of LLVM's gcov is unknown. Assuming it emulates GCC gcov version 4.2.\n"); + $result = 0x040200; + } + } return ($result, $version_string); } @@ -2285,6 +2343,15 @@ my $line; my $linedata; + # Skip external files if requested + if (!$opt_external) { + if (is_external($filename)) { + info(" ignoring data for external file ". + "$filename\n"); + next; + } + } + print(INFO_HANDLE "SF:$filename\n"); if (defined($funcdata) && $func_coverage) { @@ -3341,9 +3408,11 @@ my $fileorder = {}; my $instr; my $graph; + my $filelength; local *HANDLE; open(HANDLE, "<", $gcno_filename) or goto open_error; + $filelength = (stat(HANDLE))[7]; binmode(HANDLE); # Read magic $word = read_gcno_word(*HANDLE, "file magic"); @@ -3375,6 +3444,14 @@ $next_pos = tell(HANDLE); goto tell_error if ($next_pos == -1); $next_pos += $length; + # Catch garbage at the end of a gcno file + if ($next_pos > $filelength) { + debug("Overlong record: file_length=$filelength ". + "rec_length=$length\n"); + warn("WARNING: $gcno_filename: Overlong record at end ". + "of file!\n"); + last; + } # Process record if ($tag == $tag_function) { ($filename, $function) = read_gcno_function_record( @@ -3443,15 +3520,36 @@ { my $help = `$gcov_tool --help`; my %capabilities; + my %short_option_translations = ( + 'a' => 'all-blocks', + 'b' => 'branch-probabilities', + 'c' => 'branch-counts', + 'f' => 'function-summaries', + 'h' => 'help', + 'l' => 'long-file-names', + 'n' => 'no-output', + 'o' => 'object-directory', + 'p' => 'preserve-paths', + 'u' => 'unconditional-branches', + 'v' => 'version', + ); foreach (split(/\n/, $help)) { - next if (!/--(\S+)/); - next if ($1 eq 'help'); - next if ($1 eq 'version'); - next if ($1 eq 'object-directory'); + my $capability; + if (/--(\S+)/) { + $capability = $1; + } else { + # If the line provides a short option, translate it. + next if (!/^\s*-(\S)\s/); + $capability = $short_option_translations{$1}; + next if not defined($capability); + } + next if ($capability eq 'help'); + next if ($capability eq 'version'); + next if ($capability eq 'object-directory'); - $capabilities{$1} = 1; - debug("gcov has capability '$1'\n"); + $capabilities{$capability} = 1; + debug("gcov has capability '$capability'\n"); } return \%capabilities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/bin/genpng new/lcov-1.11/bin/genpng --- old/lcov-1.10/bin/genpng 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/bin/genpng 2014-05-23 11:03:45.000000000 +0200 @@ -35,7 +35,7 @@ # Constants -our $lcov_version = 'LCOV version 1.10'; +our $lcov_version = 'LCOV version 1.11'; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/bin/lcov new/lcov-1.11/bin/lcov --- old/lcov-1.10/bin/lcov 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/bin/lcov 2014-05-23 11:03:45.000000000 +0200 @@ -71,7 +71,7 @@ # Global constants -our $lcov_version = 'LCOV version 1.10'; +our $lcov_version = 'LCOV version 1.11'; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); @@ -93,6 +93,7 @@ our $BR_TAKEN = 2; our $BR_VEC_ENTRIES = 3; our $BR_VEC_WIDTH = 32; +our $BR_VEC_MAX = vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH); # Branch data combination types our $BR_SUB = 0; @@ -228,6 +229,16 @@ "rc=s%" => \%opt_rc); Getopt::Long::Configure("default"); +# Remove spaces around rc options +while (my ($key, $value) = each(%opt_rc)) { + delete($opt_rc{$key}); + + $key =~ s/^\s+|\s+$//g; + $value =~ s/^\s+|\s+$//g; + + $opt_rc{$key} = $value; +} + # Read configuration file if available if (defined($opt_config_file)) { $config = read_config($opt_config_file); @@ -879,6 +890,9 @@ @param = (@param, "--rc", "$key=".$opt_rc{$key}); } } + if (defined($opt_config_file)) { + @param = (@param, "--config-file", $opt_config_file); + } system(@param) and exit($? >> 8); } @@ -1459,10 +1473,12 @@ my $i; $vec = "" if (!defined($vec)); + $block = $BR_VEC_MAX if $block < 0; # Check if branch already exists in vector for ($i = 0; $i < $num; $i++) { my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i); + $v_block = $BR_VEC_MAX if $v_block < 0; next if ($v_block != $block || $v_branch != $branch); @@ -1499,6 +1515,7 @@ # Retrieve data from vector $block = vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH); + $block = -1 if ($block == $BR_VEC_MAX); $branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH); $taken = vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH); @@ -1554,6 +1571,10 @@ # "func" -> \%funcdata # "found" -> $lines_found (number of instrumented lines found in file) # "hit" -> $lines_hit (number of executed lines in file) +# "f_found" -> $fn_found (number of instrumented functions found in file) +# "f_hit" -> $fn_hit (number of executed functions in file) +# "b_found" -> $br_found (number of instrumented branches found in file) +# "b_hit" -> $br_hit (number of executed branches in file) # "check" -> \%checkdata # "testfnc" -> \%testfncdata # "sumfnc" -> \%sumfnccount @@ -1979,8 +2000,8 @@ sub add_counts($$) { - my %data1 = %{$_[0]}; # Hash 1 - my %data2 = %{$_[1]}; # Hash 2 + my $data1_ref = $_[0]; # Hash 1 + my $data2_ref = $_[1]; # Hash 2 my %result; # Resulting hash my $line; # Current line iteration scalar my $data1_count; # Count of line in hash1 @@ -1988,10 +2009,10 @@ my $found = 0; # Total number of lines found my $hit = 0; # Number of lines with a count > 0 - foreach $line (keys(%data1)) + foreach $line (keys(%$data1_ref)) { - $data1_count = $data1{$line}; - $data2_count = $data2{$line}; + $data1_count = $data1_ref->{$line}; + $data2_count = $data2_ref->{$line}; # Add counts if present in both hashes if (defined($data2_count)) { $data1_count += $data2_count; } @@ -2003,14 +2024,14 @@ if ($data1_count > 0) { $hit++; } } - # Add lines unique to data2 - foreach $line (keys(%data2)) + # Add lines unique to data2_ref + foreach $line (keys(%$data2_ref)) { - # Skip lines already in data1 - if (defined($data1{$line})) { next; } + # Skip lines already in data1_ref + if (defined($data1_ref->{$line})) { next; } - # Copy count from data2 - $result{$line} = $data2{$line}; + # Copy count from data2_ref + $result{$line} = $data2_ref->{$line}; $found++; if ($result{$line} > 0) { $hit++; } @@ -2615,6 +2636,7 @@ my ($block, $branch, $taken) = br_ivec_get($brdata, $i); + $block = $BR_VEC_MAX if ($block < 0); print(INFO_HANDLE "BRDA:$line,$block,". "$branch,$taken\n"); $br_found++; @@ -3707,10 +3729,10 @@ # Remove count data in testfncdata for functions which are no longer # in funcdata - foreach $testname (%{$testfncdata}) { + foreach $testname (keys(%{$testfncdata})) { my $fnccount = $testfncdata->{$testname}; - foreach $func (%{$fnccount}) { + foreach $func (keys(%{$fnccount})) { if (!defined($funcdata->{$func})) { delete($fnccount->{$func}); } @@ -3718,7 +3740,7 @@ } # Remove count data in sumfnccount for functions which are no longer # in funcdata - foreach $func (%{$sumfnccount}) { + foreach $func (keys(%{$sumfnccount})) { if (!defined($funcdata->{$func})) { delete($sumfnccount->{$func}); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/lcovrc new/lcov-1.11/lcovrc --- old/lcov-1.10/lcovrc 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/lcovrc 2014-05-23 11:03:45.000000000 +0200 @@ -90,6 +90,9 @@ # Specify the character set of all generated HTML pages genhtml_charset=UTF-8 +# Allow HTML markup in test case description text if non-zero +genhtml_desc_html=0 + # Location of the gcov tool (same as --gcov-info option of geninfo) #geninfo_gcov_tool = gcov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/gendesc.1 new/lcov-1.11/man/gendesc.1 --- old/lcov-1.10/man/gendesc.1 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/gendesc.1 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH gendesc 1 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH gendesc 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME gendesc \- Generate a test case description file .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/genhtml.1 new/lcov-1.11/man/genhtml.1 --- old/lcov-1.10/man/genhtml.1 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/genhtml.1 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH genhtml 1 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH genhtml 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME genhtml \- Generate HTML view from LCOV coverage data files .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/geninfo.1 new/lcov-1.11/man/geninfo.1 --- old/lcov-1.10/man/geninfo.1 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/geninfo.1 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH geninfo 1 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH geninfo 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME geninfo \- Generate tracefiles from .da files .SH SYNOPSIS @@ -74,8 +74,10 @@ .B Exclusion markers To exclude specific lines of code from a tracefile, you can add exclusion -markers to the source code. Exclusion markers are keywords which can for -example be added in the form of a comment. +markers to the source code. Additionally you can exclude specific branches from +branch coverage without excluding the involved lines from line and function +coverage. Exclusion markers are keywords which can for example be added in the +form of a comment. The following markers are recognized by geninfo: @@ -96,6 +98,23 @@ section. .RE .br +LCOV_EXCL_BR_LINE +.RS +Lines containing this marker will be excluded from branch coverage. +.br +.RE +LCOV_EXCL_BR_START +.RS +Marks the beginning of a section which is excluded from branch coverage. The +current line is part of this section. +.br +.RE +LCOV_EXCL_BR_STOP +.RS +Marks the end of a section which is excluded from branch coverage. The current +line not part of this section. +.RE +.br .SH OPTIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/genpng.1 new/lcov-1.11/man/genpng.1 --- old/lcov-1.10/man/genpng.1 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/genpng.1 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH genpng 1 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH genpng 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME genpng \- Generate an overview image from a source file .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/lcov.1 new/lcov-1.11/man/lcov.1 --- old/lcov-1.10/man/lcov.1 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/lcov.1 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH lcov 1 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH lcov 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME lcov \- a graphical GCOV front\-end .SH SYNOPSIS @@ -573,6 +573,9 @@ .B source: the source code file for a data set could not be found. + +.B graph: +the graph file could not be found or is corrupted. .RE .B \-i diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/man/lcovrc.5 new/lcov-1.11/man/lcovrc.5 --- old/lcov-1.10/man/lcovrc.5 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/man/lcovrc.5 2014-05-23 11:03:45.000000000 +0200 @@ -1,4 +1,4 @@ -.TH lcovrc 5 "LCOV 1.10" 2012\-10\-10 "User Manuals" +.TH lcovrc 5 "LCOV 1.11" 2014\-05\-23 "User Manuals" .SH NAME lcovrc \- lcov configuration file @@ -149,6 +149,11 @@ genhtml_charset=UTF\-8 .br +# Allow HTML markup in test case description text if non\-zero +.br +genhtml_desc_html=0 +.br + # Location of the gcov tool .br #geninfo_gcov_tool = gcov @@ -546,6 +551,21 @@ Default is UTF-8. .PP + +.BR genhtml_desc_html " =" +.IR 0 | 1 +.IP +If non-zero, test case descriptions may contain HTML markup. + +Set this option to one if you want to embed HTML markup (for example to +include links) in test case descriptions. When set to zero, HTML markup +characters will be escaped to show up as plain text on the test case +description page. +.br + +Default is 0. +.PP +. .BR geninfo_gcov_tool " =" .I path_to_gcov .IP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lcov-1.10/rpm/lcov.spec new/lcov-1.11/rpm/lcov.spec --- old/lcov-1.10/rpm/lcov.spec 2012-10-10 11:15:55.000000000 +0200 +++ new/lcov-1.11/rpm/lcov.spec 2014-05-23 11:03:45.000000000 +0200 @@ -1,6 +1,6 @@ Summary: A graphical GCOV front-end Name: lcov -Version: 1.10 +Version: 1.11 Release: 1 License: GPL Group: Development/Tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0