Hello community, here is the log from the commit of package gnome-common for openSUSE:Factory checked in at 2013-04-02 11:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-common (Old) and /work/SRC/openSUSE:Factory/.gnome-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-common", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-common/gnome-common.changes 2012-10-19 10:15:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-common.new/gnome-common.changes 2013-04-02 11:45:57.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jan 15 09:30:00 UTC 2013 - [email protected] + +- Update to version 3.7.4: + + code coverage: + - Quiet lcov and add extra ignore patterns + - Relicense to LGPL-2.1+ + + Add more warnings to the default GNOME_COMPILE_WARNINGS + + Add support for automake 1.13. + + Finally and completely specify GPL-2.0+ as the license for + gnome-common (as a collection of GPL-2.0+ and LGPL-2.1+ files). + NOTE: the .spec file already used the previous assumption of + GPL-2.0+ being the right license. + +------------------------------------------------------------------- Old: ---- gnome-common-3.6.0.tar.xz New: ---- gnome-common-3.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-common.spec ++++++ --- /var/tmp/diff_new_pack.dXaRvY/_old 2013-04-02 11:45:58.000000000 +0200 +++ /var/tmp/diff_new_pack.dXaRvY/_new 2013-04-02 11:45:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-common # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,13 +17,13 @@ Name: gnome-common -Version: 3.6.0 +Version: 3.7.4 Release: 0 Summary: Common Files to Build GNOME License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-common/3.6/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-common/3.7/%{name}-%{version}.tar.xz BuildRequires: pkg-config Requires: autoconf Requires: automake @@ -57,7 +57,7 @@ %files %defattr (-, root, root) -%doc ChangeLog README NEWS +%doc ChangeLog %{_bindir}/gnome-autogen.sh %{_bindir}/gnome-doc-common %dir %{_datadir}/aclocal ++++++ gnome-common-3.6.0.tar.xz -> gnome-common-3.7.4.tar.xz ++++++ ++++ 1656 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/gnome-common-3.6.0/COPYING new/gnome-common-3.7.4/COPYING --- old/gnome-common-3.6.0/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-common-3.7.4/COPYING 2013-01-12 15:31:44.000000000 +0100 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. 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/gnome-common-3.6.0/ChangeLog new/gnome-common-3.7.4/ChangeLog --- old/gnome-common-3.6.0/ChangeLog 2012-10-16 01:00:42.000000000 +0200 +++ new/gnome-common-3.7.4/ChangeLog 2013-01-14 23:52:19.000000000 +0100 @@ -1,3 +1,298 @@ +commit 766c35359ef924ceb2288c14c2d6239fcc0618f8 +Author: David King <[email protected]> +Date: Mon Jan 14 22:51:31 2013 +0000 + + version 3.7.4 + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce863d9b763b3edaa8a9eb9de3cb6b85a7169a1e +Author: Ross Burton <[email protected]> +Date: Thu Jan 10 09:48:27 2013 +0000 + + COPYING: add GPL-2 license file + + Finally declare gnome-common to be GPL 2+, by doing some source code + archaeology. + + These files we can effectively ignore: + + .gitignore + AUTHORS + ChangeLog.pre-git + NEWS + README + doc-build/README + doc/usage.txt + gnome-common.doap + macros2/README.cvs-commits + + The build files you could argue are boilerplate/uncopyrightable: + + Makefile.am + autogen.sh + configure.in + doc-build/Makefile.am + macros2/Makefile.am + + So that leaves: + + doc-build/gnome-doc-common.in + doc-build/omf.make + doc-build/xmldocs.make + + Appeared in e16ea58db92e05b9720acdc6992175ec346dfc91. Appears to have + been copy-pasted from scrollkeeper-example2, LGPLv2.1. + + macros2/gnome-autogen.sh + + Can be traced back to gnome-libs 88f7376472d3ee54329213c118b46225703d8223, which + is GPLv2/LGPLv2. + + macros2/gnome-code-coverage.m4 + + LGPLv2.1+. + + macros2/gnome-common.m4 + macros2/gnome-compiler-flags.m4 + + Synced with gnome-core as of 425e5cc9aad003c9f64d43f2d3f15e04a97db854, so + LGPLv2.1+. + + The long-standing assumption is that gnome-common was GPLv2+, so use that + license. Finally the tyranny of unclear licensing is over! + + https://bugzilla.gnome.org/show_bug.cgi?id=133689 + + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 339 insertions(+) + +commit 34bcfcf227fc6abd35a4f35f090b0711e3af1a07 +Author: Ross Burton <[email protected]> +Date: Thu Jan 10 09:45:36 2013 +0000 + + build: remove useless (empty or ancient) files that we don't need + + README | 36 ------------------------------------ + 1 file changed, 36 deletions(-) + +commit 4aebf8593334f64f6e77c6208f6306f1adfa6a38 +Author: Raphael Kubo da Costa <[email protected]> +Date: Tue Jan 8 18:45:24 2013 +0200 + + Add support for automake 1.13. + + macros2/gnome-autogen.sh | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 4bb2a2450f67550ae761c75cb7ff2325bad54c8b +Author: Dodji Seketeli <[email protected]> +Date: Mon Dec 10 16:38:04 2012 +0100 + + Better support of using AUTOCONF environment variable + + When I launch gnome-autogen.sh by telling it to use a version of + autoconf that is at a particular path -- by using the AUTOCONF + environment variable -- I can see that there is a spot in the script + that fails to honour that variable. I thus get the error message + (that I trim to just keep the relevant part): + + AUTOCONF=/my/autoconf AUTOM4TE=/my/autom4te /bin/sh -x /usr/bin/gnome-autogen.sh + + [...] + + +++ find_configure_files /home/dodji/devel/git/gdl/master + +++ configure_ac= + +++ test -f /home/dodji/devel/git/gdl/master/configure.ac + +++ test -f /home/dodji/devel/git/gdl/master/configure.in + +++ configure_ac=/home/dodji/devel/git/gdl/master/configure.in + +++ test x/home/dodji/devel/git/gdl/master/configure.in '!=' x + +++ echo /home/dodji/devel/git/gdl/master/configure.in + +++ autoconf -t 'AC_CONFIG_SUBDIRS:$1' /home/dodji/devel/git/gdl/master/configure.in + +++ read dir + /home/dodji/devel/git/gdl/master/configure.in:8: error: Autoconf version 2.65 or higher is required + /home/dodji/devel/git/gdl/master/configure.in:8: the top level + autom4te: /bin/m4 failed with exit status: 63 + + I think the problem is that the find_configure_files function uses + 'autoconf' directly instead of using $AUTOCONF. So it's taking the + autoconf binary that is in my path, and that one doesn't satisfy the + version requirement of the configure.in script template that is in. + /home/dodji/devel/git/gdl/master/configure.in. + + The patch below fixes that essentially by s/autoconf/$AUTOCONF there, + and also by moving the definition point of the AUTOCONF variable -- + that is done by a call to version_check -- before the first spot that + actually uses it. + + It's worth noting that this bug appears to have been introduced by the + patch attached to bug #510713. + + Tested on my Fedora Rawhide system. + + * macros2/gnome-autogen.sh (find_configure_files): Use the + AUTOCONF variable, rather than calling the autoconf program + directly. Remove the now useless comment. + (<at global scope>): Move the definition of the AUTOCONF variable + before its first use. + + macros2/gnome-autogen.sh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit a550d04a1b3552373f882f1482166c942e490451 +Author: Colin Walters <[email protected]> +Date: Tue Nov 13 13:17:00 2012 -0500 + + compiler-warnings: Fix tabs->spaces + + Per https://bugzilla.gnome.org/show_bug.cgi?id=688192 + + macros2/gnome-compiler-flags.m4 | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +commit 1e23c485c40f539ec66087728aa4d6fcc121c6a4 +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 15:06:44 2012 -0500 + + compiler-warnings: Drop -Wdeclaration-after-statement + + Some GNOME modules want the ability to use C99, let's not hamper them. + + https://bugzilla.gnome.org/show_bug.cgi?id=688192 + + macros2/gnome-compiler-flags.m4 | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit eeca390b4d7ee45616dc987ab6085add4f6e4ada +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 15:04:02 2012 -0500 + + compiler-warnings: Drop -Wno-sign-comare + + It's not part of -Wall, and we're not explicitly turning it on here, + so there's no point in turning it off, since it's not on. + + Additionally, if a given module did want it on, it's clearer if + the compiler flags don't have -Wno-sign-compare -Wsign-compare. + + https://bugzilla.gnome.org/show_bug.cgi?id=688192 + + macros2/gnome-compiler-flags.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b90f3e541739f7122811966481b55d625129d951 +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 15:02:38 2012 -0500 + + compiler-warnings: Move -Wnested-externs to the always-on warning set + + Since there's no reason to have it different for yes/maximum. + + https://bugzilla.gnome.org/show_bug.cgi?id=688192 + + macros2/gnome-compiler-flags.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit afad58ce8302acbff204685ae2df20f118753deb +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 15:00:06 2012 -0500 + + compiler-warnings: code cleanup: Extract common warnings into variables + + Will make future refactoring clearer, and also we have comments now. + + https://bugzilla.gnome.org/show_bug.cgi?id=688192 + + macros2/gnome-compiler-flags.m4 | 43 ++++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 20 deletions(-) + +commit 502387df492d0c2b302a892d4cc59e3b246b8490 +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 12:09:57 2012 -0500 + + compiler-warnings: Drop -Waggregate-return + + This trips up gnome-desktop using things like XSyncValue, and while + it's possible to avoid, we shouldn't punish people who are pushed to + use structures as return values by external APIs. + + Returning a two-element structure is not a big deal. + + macros2/gnome-compiler-flags.m4 | 2 -- + 1 file changed, 2 deletions(-) + +commit 7c70df83511028ce45489193eaf0aa613b3416a7 +Author: Colin Walters <[email protected]> +Date: Mon Nov 12 12:09:20 2012 -0500 + + compiler-warnings: cosmetic cleanup: Put each warning on own line + + So that further patches are more readable. + + macros2/gnome-compiler-flags.m4 | 27 +++++++++++++++++++++++++-- + 1 file changed, 25 insertions(+), 2 deletions(-) + +commit e42ca9bec9d83aa53d7f79c480daf4b7c4d95fe1 +Author: David King <[email protected]> +Date: Sat Jul 28 15:19:55 2012 +0100 + + Add lots of warnings to GNOME_COMPILE_WARNINGS + + Following Colin Walters' thread on desktop-devel-list: + + https://mail.gnome.org/archives/desktop-devel-list/2012-July/msg00100.html + + Add a selection of more strict warnings to the default level of + GNOME_COMPILE_WARNINGS. Check all the warnings by passing them to GCC, + and ignore those which fail. Set the severity of some of the warnings to + errors, so that particularly bad code is rejected (set the warning level + to ‘minimum’ is you wish to avoid this behaviour). Fixes bug 568546 and + bug 608953. + + macros2/gnome-compiler-flags.m4 | 54 +++++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 26 deletions(-) + +commit 0ae892df10c6f671669e197cec1f4ed302584d70 +Author: Philip Withnall <[email protected]> +Date: Wed Oct 31 13:38:04 2012 +0000 + + code-coverage: Relicence to LGPLv2.1+ + + As gnome-common is widely used, it’s useful for it to have a fairly liberal + licence. This relicences the gnome-code-coverage.m4 file from GPLv3+ to + LGPLv2.1+. + + Permission has been obtained (by private e-mail) from the other contributors: + • Christian Persch <[email protected]> + • Xan Lopez <[email protected]> + + See also: https://bugzilla.gnome.org/show_bug.cgi?id=133689 + + macros2/gnome-code-coverage.m4 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 12036c1f9cde101a13a4c212deaecf4e741e522d +Author: Christian Persch <[email protected]> +Date: Tue Oct 23 22:12:01 2012 +0200 + + code coverage: Quiet lcov and add extra ignore patterns + + Make lcov be quiet if V=0, and add a new CODE_COVERAGE_IGNORE_PATTERN + variable to be able to add extra files to ignore in code coverage reporting. + + macros2/gnome-code-coverage.m4 | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit f6d04abb156c6e6ef513c4c9edcd842cb3a5ed9d +Author: Christian Persch <[email protected]> +Date: Tue Oct 16 01:01:00 2012 +0200 + + Post release version bump + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 096d2cb622d3074b7d22f45eee40ad7817ce35ad Author: Christian Persch <[email protected]> Date: Tue Oct 16 01:00:38 2012 +0200 @@ -536,11 +831,11 @@ Autogenerate ChangeLog - ChangeLog | 14901 ++++++++++++++++++++++++++++++++++++--- - ChangeLog => ChangeLog.pre-git | 0 - Makefile.am | 17 +- - configure.in | 2 +- - 4 files changed, 14088 insertions(+), 832 deletions(-) + ChangeLog | 14901 +++++++++++++++++++++++++++++++++++++++++++++++++--- + ChangeLog.pre-git | 860 +++ + Makefile.am | 17 +- + configure.in | 2 +- + 4 files changed, 14948 insertions(+), 832 deletions(-) commit cd4ebced07dcb2ff7f12e53afdcb092339ac0d89 Author: Vincent Legoll <[email protected]> @@ -2026,17 +2321,19 @@ svn path=/trunk/; revision=3443 - ChangeLog | 28 ++ - Makefile.am | 4 +- - autogen.sh | 6 +- - configure.in | 33 +-- - macros2/Makefile.am | 21 +- - macros2/curses.m4 | 318 --------------------- - macros2/{autogen.sh => gnome-autogen.sh} | 0 - macros2/gnome-common.m4 | 25 +- - .../{compiler-flags.m4 => gnome-compiler-flags.m4} | 26 +- - macros2/gnome-deprecated-macros.m4 | 32 --- - 10 files changed, 70 insertions(+), 423 deletions(-) + ChangeLog | 28 +++ + Makefile.am | 4 +- + autogen.sh | 6 +- + configure.in | 33 +-- + macros2/Makefile.am | 21 +- + macros2/autogen.sh | 411 ------------------------------------- + macros2/compiler-flags.m4 | 141 ------------- + macros2/curses.m4 | 318 ---------------------------- + macros2/gnome-autogen.sh | 411 +++++++++++++++++++++++++++++++++++++ + macros2/gnome-common.m4 | 25 +-- + macros2/gnome-compiler-flags.m4 | 141 +++++++++++++ + macros2/gnome-deprecated-macros.m4 | 32 --- + 12 files changed, 609 insertions(+), 962 deletions(-) commit 9d8824a338204c20411b159a3c0c0a0711b8af96 Author: James Henstridge <[email protected]> @@ -6140,22 +6437,22 @@ svn path=/trunk/; revision=1310 - macros2/ChangeLog | 4 + - macros2/Makefile.am | 17 +- - macros2/aclocal-include.m4 | 16 + - macros2/compiler-flags.m4 | 109 +++++++ - macros2/gnome-common.m4 | 2 +- - macros2/gnome-cxx-check.m4 | 10 + - macros2/gnome-fileutils.m4 | 414 +++++++++++++++++++++++ - macros2/{gnome.m4 => gnome-gettext.m4} | 145 +-------- - macros2/gnome-gnorba-check.m4 | 35 ++ - macros2/gnome-pthread-check.m4 | 16 + - macros2/gnome-support.m4 | 68 ++++ - macros2/gnome-x-checks.m4 | 80 +++++ - macros2/gnome.m4 | 579 +++++++-------------------------- - macros2/linger.m4 | 28 ++ - macros2/need-declaration.m4 | 42 +++ - 15 files changed, 950 insertions(+), 615 deletions(-) + macros2/ChangeLog | 4 + + macros2/Makefile.am | 17 +- + macros2/aclocal-include.m4 | 16 ++ + macros2/compiler-flags.m4 | 109 ++++++++ + macros2/gnome-common.m4 | 2 +- + macros2/gnome-cxx-check.m4 | 10 + + macros2/gnome-fileutils.m4 | 414 +++++++++++++++++++++++++++++ + macros2/gnome-gettext.m4 | 336 ++++++++++++++++++++++++ + macros2/gnome-gnorba-check.m4 | 35 +++ + macros2/gnome-pthread-check.m4 | 16 ++ + macros2/gnome-support.m4 | 68 +++++ + macros2/gnome-x-checks.m4 | 80 ++++++ + macros2/gnome.m4 | 579 ++++++++--------------------------------- + macros2/linger.m4 | 28 ++ + macros2/need-declaration.m4 | 42 +++ + 15 files changed, 1283 insertions(+), 473 deletions(-) commit c978e43ae83a5a7e7fc8fe32538afbffc5812da9 Author: Elliot Lee <[email protected]> @@ -6339,14 +6636,15 @@ svn path=/trunk/; revision=1256 - Makefile.am | 2 +- - bin/ChangeLog | 5 +++++ - bin/Makefile.am | 2 ++ - {macros => bin}/gnome-autogen.sh | 0 - configure.in | 4 +++- - macros/ChangeLog | 4 ++++ - macros/Makefile.am | 4 +--- - 7 files changed, 16 insertions(+), 5 deletions(-) + Makefile.am | 2 +- + bin/ChangeLog | 5 +++++ + bin/Makefile.am | 2 ++ + bin/gnome-autogen.sh | 11 +++++++++++ + configure.in | 4 +++- + macros/ChangeLog | 4 ++++ + macros/Makefile.am | 4 +--- + macros/gnome-autogen.sh | 11 ----------- + 8 files changed, 27 insertions(+), 16 deletions(-) commit 36f51b0a71f4f10c74c37d30bcdd59b01f06292b Author: Martin Baulig <[email protected]> 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/gnome-common-3.6.0/README new/gnome-common-3.7.4/README --- old/gnome-common-3.6.0/README 2009-05-06 16:20:26.000000000 +0200 +++ new/gnome-common-3.7.4/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -This directory contains sample files that should be in pretty much every -GNOME application. - ------------------------------------------------------------------------------ - -To make this work both for GNOME Applications inside and outside the -GNOME repository tree I did the following: - -* There is an `INSIDE_GNOME_COMMON' automake conditional which is defined - in two places: - - - macros/aclocal-includes.m4 defines this to always be false. - - - gnome-common/configure.in does not include anything from macros and - defines this to be true. - -* We use this automake conditional in the macros/Makefile.am to install - $(MACROS), autogen.sh, gnome-common.m4 and a newly created gnome-macros.dep - in `$(datadir)/aclocal/gnome'. - - Since aclocal doesn't look in subdirectories we can safely install them - there even when compiling from the repository. - - Also, there is no need to make any change to any existing application - in the GNOME repository tree - really fine... - -* When we're outside the GNOME repository tree, we simply need to tell aclocal - that it should also look in `$(datadir)/aclocal/gnome' and it will find all - the macros. - - There is a `gnome-skel' module in the repository that can be used as a - starting point when writing a new GNOME application that should be used - outside the repository. - -February 4, 1999, -Martin Baulig <[email protected]> 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/gnome-common-3.6.0/configure.in new/gnome-common-3.7.4/configure.in --- old/gnome-common-3.6.0/configure.in 2012-10-16 00:58:37.000000000 +0200 +++ new/gnome-common-3.7.4/configure.in 2013-01-14 23:50:54.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.54) -AC_INIT([gnome-common], [3.6.0], +AC_INIT([gnome-common], [3.7.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common]) AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh]) 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/gnome-common-3.6.0/macros2/gnome-autogen.sh new/gnome-common-3.7.4/macros2/gnome-autogen.sh --- old/gnome-common-3.6.0/macros2/gnome-autogen.sh 2012-10-16 00:58:19.000000000 +0200 +++ new/gnome-common-3.7.4/macros2/gnome-autogen.sh 2013-01-10 10:45:39.000000000 +0100 @@ -265,6 +265,13 @@ want_gnome_doc_utils=false want_maintainer_mode=false +#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 +WANT_AUTOCONF_2_5=1 +export WANT_AUTOCONF_2_5 +version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ + "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; +AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` + find_configure_files() { configure_ac= if test -f "$1/configure.ac"; then @@ -274,8 +281,7 @@ fi if test "x$configure_ac" != x; then echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do + $AUTOCONF -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do find_configure_files "$1/$dir" done fi @@ -337,23 +343,17 @@ fi done -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.12" ;; + 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; + 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; + 1.12*) automake_progs="automake-1.13 automake-1.12" ;; + 1.13*) automake_progs="automake-1.13" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"; 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/gnome-common-3.6.0/macros2/gnome-code-coverage.m4 new/gnome-common-3.7.4/macros2/gnome-code-coverage.m4 --- old/gnome-common-3.6.0/macros2/gnome-code-coverage.m4 2012-10-16 00:58:19.000000000 +0200 +++ new/gnome-common-3.7.4/macros2/gnome-code-coverage.m4 2012-11-02 15:25:12.000000000 +0100 @@ -11,8 +11,7 @@ dnl coverage is enabled. dnl dnl Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. -dnl This file is licenced under GPLv3. For the full gnome-common licence -dnl (GPLv3), see the COPYING file. +dnl This file is licenced under LGPLv2.1+. dnl dnl Usage example: dnl configure.ac: @@ -101,6 +100,7 @@ # (Default: empty) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore # # The generated report will be titled using the $(PACKAGE_NAME) and # $(PACKAGE_VERSION). In order to add the current git hash to the title, @@ -112,6 +112,11 @@ CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage CODE_COVERAGE_LCOV_OPTIONS ?= CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_IGNORE_PATTERN ?= + +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet # Use recursive makes in order to ignore errors during check check-code-coverage: @@ -125,10 +130,10 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook ifdef CODE_COVERAGE_ENABLED - $(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) - $(LCOV) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" - -rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp - LANG=C $(GENHTML) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" else @echo "Need to reconfigure with --enable-code-coverage" 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/gnome-common-3.6.0/macros2/gnome-compiler-flags.m4 new/gnome-common-3.7.4/macros2/gnome-compiler-flags.m4 --- old/gnome-common-3.6.0/macros2/gnome-compiler-flags.m4 2009-05-11 15:12:59.000000000 +0200 +++ new/gnome-common-3.7.4/macros2/gnome-compiler-flags.m4 2012-11-14 09:28:07.000000000 +0100 @@ -1,5 +1,6 @@ dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings +dnl Turn on many useful compiler warnings and substitute the result into +dnl WARN_CFLAGS dnl For now, only works on GCC AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** @@ -11,7 +12,6 @@ [Turn on compiler warnings]),, [enable_compile_warnings="m4_default([$1],[yes])"]) - warnCFLAGS= if test "x$GCC" != xyes; then enable_compile_warnings=no fi @@ -19,46 +19,70 @@ warning_flags= realsave_CFLAGS="$CFLAGS" + dnl These are warning flags that aren't marked as fatal. Can be + dnl overridden on a per-project basis with -Wno-foo. + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " + + dnl These compiler flags typically indicate very broken or suspicious + dnl code. Some of them such as implicit-function-declaration are + dnl just not default because gcc compiles a lot of legacy code. + dnl We choose to make this set into explicit errors. + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + " + case "$enable_compile_warnings" in no) - warning_flags= - ;; + warning_flags= + ;; minimum) - warning_flags="-Wall" - ;; + warning_flags="-Wall" + ;; yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; + warning_flags="$base_warn_flags $base_error_flags" + ;; maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; + warning_flags="$base_warn_flags $base_error_flags" + ;; *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; esac + + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + + dnl Check whether GCC supports the warning options + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT([$has_option]) + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" + fi + unset has_option + unset save_CFLAGS + done + unset option CFLAGS="$realsave_CFLAGS" AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) + AC_MSG_RESULT($tested_warning_flags) AC_ARG_ENABLE(iso-c, AC_HELP_STRING([--enable-iso-c], @@ -81,7 +105,7 @@ fi AC_MSG_RESULT($complCFLAGS) - WARN_CFLAGS="$warning_flags $complCFLAGS" + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) ]) 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/gnome-common-3.6.0/missing new/gnome-common-3.7.4/missing --- old/gnome-common-3.6.0/missing 2012-05-12 16:45:05.000000000 +0200 +++ new/gnome-common-3.7.4/missing 2012-07-30 16:20:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ 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] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -121,6 +122,15 @@ # 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 + ;; + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -216,7 +226,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -246,7 +256,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -308,6 +318,41 @@ 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. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
