Hello community, here is the log from the commit of package gnome-common for openSUSE:Factory checked in at 2015-10-06 16:32:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-common (Old) and /work/SRC/openSUSE:Factory/.gnome-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-common" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-common/gnome-common.changes 2014-11-14 09:18:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-common.new/gnome-common.changes 2015-10-06 16:32:23.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 22 06:43:07 UTC 2015 - dims...@opensuse.org + +- Update to version 3.18.0: + + Bugs fixed: bgo#747920, bgo#748394, bgo#729406, bgo#729407, + bgo#741891, bgo#741558, bgo#729931, bgo#735416. +- Drop pgnome-doc-utils-devel BuildRequires: no longer needed. + +------------------------------------------------------------------- Old: ---- gnome-common-3.14.0.tar.xz New: ---- gnome-common-3.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-common.spec ++++++ --- /var/tmp/diff_new_pack.OEIWb1/_old 2015-10-06 16:32:23.000000000 +0200 +++ /var/tmp/diff_new_pack.OEIWb1/_new 2015-10-06 16:32:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-common # -# 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: gnome-common -Version: 3.14.0 +Version: 3.18.0 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.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-common/3.18/%{name}-%{version}.tar.xz BuildRequires: pkg-config Requires: autoconf # we need autoconf-archive >= 2014.10.15, as this is when ax_check_enable_debug.m4 and ax_code_coverage.m4 became part of it. @@ -32,7 +32,6 @@ Requires: gettext-tools # Avoiding pkgconfig()-style because we want glib-gettextize Requires: glib2-devel -Requires: gnome-doc-utils-devel Requires: gtk-doc Requires: intltool Requires: libtool @@ -63,11 +62,9 @@ %defattr (-, root, root) %doc ChangeLog %{_bindir}/gnome-autogen.sh -%{_bindir}/gnome-doc-common %dir %{_datadir}/aclocal %{_datadir}/aclocal/gnome-code-coverage.m4 %{_datadir}/aclocal/gnome-common.m4 %{_datadir}/aclocal/gnome-compiler-flags.m4 -%{_datadir}/gnome-common/ %changelog ++++++ gnome-common-3.14.0.tar.xz -> gnome-common-3.18.0.tar.xz ++++++ ++++ 2394 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.14.0/ChangeLog new/gnome-common-3.18.0/ChangeLog --- old/gnome-common-3.14.0/ChangeLog 2014-09-22 13:33:29.000000000 +0200 +++ new/gnome-common-3.18.0/ChangeLog 2015-09-21 22:39:58.000000000 +0200 @@ -1,3 +1,223 @@ +commit 1df0aa160b1ce6d1e1f01085253b665fe6d0d1ef +Author: David King <amigad...@amigadave.com> +Date: Mon Sep 21 21:39:19 2015 +0100 + + version 3.18.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1fdadd2e2f008660909d2fa23f18f6418d051805 +Author: David King <amigad...@amigadave.com> +Date: Mon Sep 21 21:39:01 2015 +0100 + + Switch to using XZ-compressed tarballs + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4363223839649f4e5d01dc6d0b3e23a629ddcd8a +Author: David King <amigad...@amigadave.com> +Date: Sun Jun 28 22:04:28 2015 +0100 + + build: Make autoconf-archive support optional + + As autoconf-archive installs the same ax_*.m4 macros that gnome-common + installs, which are copied from autoconf-archive into gnome-common, add + a configure argument to toggle autoconf-archive support. + + Passing --without-autoconf-archive to configure (or not providing an + argument) disables compatibility (parallel-installability) with + autoconf-archive, and installs the ax_*.m4 macros. If + --with-autoconf-archive is passed to configure, the macros are not + installed, and gnome-common will not install any M4 macros that conflict + with autoconf-archive. + + https://bugzilla.gnome.org/show_bug.cgi?id=747920 + + configure.ac | 8 ++++++++ + macros2/Makefile.am | 3 +++ + 2 files changed, 11 insertions(+) + +commit 57403addd36276aac8fc52d200177fb6366d888d +Author: David King <amigad...@amigadave.com> +Date: Fri Apr 24 09:07:54 2015 +0100 + + gnome-autogen: Fix the package name tracing + + https://bugzilla.gnome.org/show_bug.cgi?id=748394 + + macros2/gnome-autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2bffd7e1a94c5d96a1121ae2243c3615e1aa7766 +Author: Philip Withnall <philip.withn...@collabora.co.uk> +Date: Tue Jan 27 10:18:30 2015 +0000 + + macros2: Deprecate GNOME_CXX_WARNINGS + + Just as for GNOME_COMPILE_WARNINGS, GNOME_CXX_WARNINGS has been + deprecated in favour of AX_COMPILER_FLAGS. See commit + b57bae0be3df241220b1fba3120e2f50261258e5 for details. + + https://bugzilla.gnome.org/show_bug.cgi?id=729406 + + macros2/gnome-compiler-flags.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit b57bae0be3df241220b1fba3120e2f50261258e5 +Author: Philip Withnall <philip.withn...@collabora.co.uk> +Date: Fri Jan 16 11:08:32 2015 +0000 + + macros2: Deprecate GNOME_COMPILE_WARNINGS + + Use AX_COMPILER_FLAGS instead, which comes from the autoconf-archive. It + supports more compilers than just GCC, has a wider selection of flags, + supports LDFLAGS, and is maintained for more projects than just GNOME. + + GNOME_COMPILE_WARNINGS has not been ported to AX_COMPILER_FLAGS as: + • the default argument is a little difficult to map to + AX_COMPILER_FLAGS’ IS-RELEASE argument; and + • AX_COMPILER_FLAGS depends on some other macros in autoconf-archive + licenced as GPLv3, which would potentially be tricky to copy into + gnome-common. + + The --enable-iso-c argument is deprecated as well. Projects should + choose which C standard they want to use, and hard-code that in their + compiler flags. It is not something which should be set by the + developer. + + GNOME_CXX_WARNINGS is not deprecated, but may be in future. + + No further changes should be made to GNOME_COMPILE_WARNINGS: please make + them to AX_COMPILER_FLAGS instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=729407 + + macros2/gnome-compiler-flags.m4 | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 8dd714645952ccaf99ab714e4af2c47718382b9e +Author: Marc-André Lureau <marcandre.lur...@gmail.com> +Date: Tue Dec 23 03:47:47 2014 +0100 + + gnome-autogen: warn if $srcdir is undefined + + Not setting $srcdir will lead to broken out-of-tree autogen call, so + let's ask to set it + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + macros2/gnome-autogen.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 4c8d8ad93225b468bd101760a1153243a12c4898 +Author: Marc-André Lureau <marcandre.lur...@gmail.com> +Date: Tue Dec 23 03:46:15 2014 +0100 + + gnome-autogen: warn for deprecated variables + + Well, many people still use deprecated variables for 10y, maybe + it's time to let them know. + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + macros2/gnome-autogen.sh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 89f74f5214379ca118bcb09f8f3976d6997c42da +Author: Marc-André Lureau <marcandre.lur...@gmail.com> +Date: Tue Dec 23 03:45:10 2014 +0100 + + gnome-autogen: infer PKG_NAME from configure.ac + + Let's not repeat ourself in autogen.sh, there are already many places + with the package name. + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + README | 2 -- + macros2/gnome-autogen.sh | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 1ced4ff7722282b809ed33cdb4a1f3c1bdc6e252 +Author: Marc-André Lureau <marcandre.lur...@gmail.com> +Date: Tue Dec 23 03:43:54 2014 +0100 + + README: remove check for automake version in example + + It's usually not required, so let's not show a bad example + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + README | 1 - + 1 file changed, 1 deletion(-) + +commit 334bb90c5bcf96105aed8eac464bb296bf1aa9c9 +Author: Ting-Wei Lan <la...@src.gnome.org> +Date: Mon Dec 15 23:22:15 2014 +0800 + + compiler-warnings: Add -Werror=return-type + + Function return type mismatch should be considered broken, as it can cause + unexpected result or compilation error. + + https://bugzilla.gnome.org/show_bug.cgi?id=741558 + + macros2/gnome-compiler-flags.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1f60e9536dd8ac71a799d60eb128c6c928c67639 +Author: Philip Withnall <philip.withn...@collabora.co.uk> +Date: Tue Aug 26 00:06:52 2014 +0100 + + macros2: Remove support for gnome-doc-utils + + Remove support for checking for the GNOME_DOC_INIT macro in configure.ac + and calling gnome-doc-prepare if found. gnome-doc-utils has not been + used in any modules we care about for a long time. + + https://bugzilla.gnome.org/show_bug.cgi?id=729931 + + macros2/gnome-autogen.sh | 15 --------------- + 1 file changed, 15 deletions(-) + +commit a912a74ba7999fe3ed49b07bab86685a5d117f82 +Author: Philip Withnall <philip.withn...@collabora.co.uk> +Date: Fri May 2 16:09:43 2014 +0200 + + doc-build: Remove doc-build infrastructure + + This pertained to the old GNOME documentation infrastructure, used + before Mallard existed. This isn’t used by any modules we care about + any more. Most modules which set USE_COMMON_DOC_BUILD do so erroneously. + + https://bugzilla.gnome.org/show_bug.cgi?id=729931 + + Makefile.am | 2 +- + configure.ac | 2 - + doc-build/Makefile.am | 12 ----- + doc-build/README | 9 ---- + doc-build/gnome-doc-common.in | 49 -------------------- + doc-build/omf.make | 65 --------------------------- + doc-build/xmldocs.make | 101 ------------------------------------------ + macros2/gnome-autogen.sh | 10 ----- + 8 files changed, 1 insertion(+), 249 deletions(-) + +commit 6684e2fa5d5a4c72c9bf116f74688c0b47f350cf +Author: Philip Withnall <philip.withn...@collabora.co.uk> +Date: Fri May 2 15:53:09 2014 +0200 + + macros2: Remove GNOME_COMMON_INIT + + It’s been deprecated for a while, and apparently no modules (which I + have checked out, at least) still use it. + + https://bugzilla.gnome.org/show_bug.cgi?id=735416 + + macros2/gnome-common.m4 | 20 -------------------- + 1 file changed, 20 deletions(-) + commit 5d61b55e8bea32fe2b52e21682ee4b3719b290c5 Author: David King <amigad...@amigadave.com> Date: Mon Sep 22 12:32:59 2014 +0100 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.14.0/Makefile.am new/gnome-common-3.18.0/Makefile.am --- old/gnome-common-3.14.0/Makefile.am 2014-08-26 12:27:54.000000000 +0200 +++ new/gnome-common-3.18.0/Makefile.am 2014-10-09 15:56:16.000000000 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = macros2 doc-build +SUBDIRS = macros2 EXTRA_DIST = \ 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.14.0/README new/gnome-common-3.18.0/README --- old/gnome-common-3.14.0/README 2014-05-07 18:11:50.000000000 +0200 +++ new/gnome-common-3.18.0/README 2015-01-05 12:52:16.000000000 +0100 @@ -13,9 +13,6 @@ srcdir=`dirname $0` [ -z "$srcdir" ] && srcdir=. -PKG_NAME=mypackage -REQUIRED_AUTOMAKE_VERSION=1.7 - if [ ! -f "$srcdir/configure.ac" ]; then echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2 exit 1 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.14.0/configure.ac new/gnome-common-3.18.0/configure.ac --- old/gnome-common-3.14.0/configure.ac 2014-09-22 13:32:49.000000000 +0200 +++ new/gnome-common-3.18.0/configure.ac 2015-09-21 22:39:16.000000000 +0200 @@ -1,10 +1,10 @@ AC_PREREQ(2.54) -AC_INIT([gnome-common], [3.14.0], +AC_INIT([gnome-common], [3.18.0], [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common]) AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh]) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) @@ -13,11 +13,17 @@ fi AM_MAINTAINER_MODE([enable]) +AC_ARG_WITH([autoconf-archive], + [AS_HELP_STRING([--with-autoconf-archive], + [Enable parallel-installability with autoconf-archive, by disabling installation of its M4 macros])], + [], [with_autoconf_archive=no]) + +AM_CONDITIONAL([WITH_AUTOCONF_ARCHIVE], + [test "x$with_autoconf_archive" != "xno"]) + AC_CONFIG_FILES([ Makefile macros2/Makefile -doc-build/Makefile -doc-build/gnome-doc-common ]) AC_OUTPUT 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.14.0/doc-build/Makefile.am new/gnome-common-3.18.0/doc-build/Makefile.am --- old/gnome-common-3.14.0/doc-build/Makefile.am 2013-06-13 19:44:12.000000000 +0200 +++ new/gnome-common-3.18.0/doc-build/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -bin_SCRIPTS = gnome-doc-common - -pkgdatadir = $(datadir)/gnome-common/data -pkgdata_DATA = \ - omf.make \ - xmldocs.make - -EXTRA_DIST = \ - omf.make \ - xmldocs.make \ - gnome-doc-common.in \ - README 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.14.0/doc-build/README new/gnome-common-3.18.0/doc-build/README --- old/gnome-common-3.14.0/doc-build/README 2013-06-13 19:44:12.000000000 +0200 +++ new/gnome-common-3.18.0/doc-build/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -To automatically include the standard user documentation build files (omf.make -and xmldocs.make) in you package, set USE_COMMON_DOC_BUILD=yes in autogen.sh -before calling the macros2/autogen.sh script. - -When porting applications across to use this feature, ensure that all of the -references to xmldocs.make are to $(top_srcdir)/xmldocs.make in the appropriate -Makefile.am files. Some modules assume that xmldocs.make is in another -directory (like docs/ or something). - 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.14.0/doc-build/gnome-doc-common.in new/gnome-common-3.18.0/doc-build/gnome-doc-common.in --- old/gnome-common-3.14.0/doc-build/gnome-doc-common.in 2013-06-13 19:44:12.000000000 +0200 +++ new/gnome-common-3.18.0/doc-build/gnome-doc-common.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#!/bin/sh - -progname=`echo "$0" | sed 's%^.*/%%'` - -PROGRAM=gnome-doc-common -PACKAGE=@PACKAGE@ -VERSION=@VERSION@ - -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ - -# options -docdir=. -copy=no - -while test $# -gt 0; do - case "$1" in - --help) - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - --version) - echo "$PROGRAM ($PACKAGE) $VERSION" - exit 0 ;; - --copy) - copy=yes - shift ;; - -*) - echo "$progname: unrecognised option '$1'" 1>&2 - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - *) - echo "$progname: too many arguments" 1>&2 - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - esac -done - -for file in omf.make xmldocs.make; do - rm -f $docdir/$file - if test "$copy" = yes; then - cp -f $datadir/$PACKAGE/data/$file $docdir/ || - exit 1 - else - ln -sf $datadir/$PACKAGE/data/$file $docdir/ || - cp -f $datadir/$PACKAGE/data/$file $docdir/ || - exit 1 - fi -done 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.14.0/doc-build/omf.make new/gnome-common-3.18.0/doc-build/omf.make --- old/gnome-common-3.14.0/doc-build/omf.make 2013-06-13 19:44:12.000000000 +0200 +++ new/gnome-common-3.18.0/doc-build/omf.make 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -# -# No modifications of this Makefile should be necessary. -# -# This file contains the build instructions for installing OMF files. It is -# generally called from the makefiles for particular formats of documentation. -# -# Note that you must configure your package with --localstatedir=/var -# so that the scrollkeeper-update command below will update the database -# in the standard scrollkeeper directory. -# -# If it is impossible to configure with --localstatedir=/var, then -# modify the definition of scrollkeeper_localstate_dir so that -# it points to the correct location. Note that you must still use -# $(localstatedir) in this or when people build RPMs it will update -# the real database on their system instead of the one under RPM_BUILD_ROOT. -# -# Note: This make file is not incorporated into xmldocs.make because, in -# general, there will be other documents install besides XML documents -# and the makefiles for these formats should also include this file. -# -# About this file: -# This file was derived from scrollkeeper_example2, a package -# illustrating how to install documentation and OMF files for use with -# ScrollKeeper 0.3.x and 0.4.x. For more information, see: -# http://scrollkeeper.sourceforge.net/ -# Version: 0.1.3 (last updated: March 20, 2002) -# - -omf_dest_dir=$(datadir)/omf/@PACKAGE@ -scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper - -# At some point, it may be wise to change to something like this: -# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@ - -omf: omf_timestamp - -omf_timestamp: $(omffile) - -for file in $(omffile); do \ - absfile=$(srcdir)/$$file; \ - test -r $$file && absfile=$$file; \ - scrollkeeper-preinstall $(docdir)/$(docname).xml $$absfile $$file.out; \ - done; \ - touch omf_timestamp - -install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ - absfile=$(srcdir)/$$file.out; \ - test -r $$file.out && absfile=$$file.out; \ - $(INSTALL_DATA) $$absfile $(DESTDIR)$(omf_dest_dir)/$$file; \ - done - -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) - -uninstall-local-omf: - -for file in $(omffile); do \ - basefile=`basename $$file`; \ - rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ - done - -rmdir $(DESTDIR)$(omf_dest_dir) - -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) - -clean-local-omf: - -for file in $(omffile); do \ - rm -f $$file.out; \ - done 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.14.0/doc-build/xmldocs.make new/gnome-common-3.18.0/doc-build/xmldocs.make --- old/gnome-common-3.14.0/doc-build/xmldocs.make 2013-06-13 19:44:12.000000000 +0200 +++ new/gnome-common-3.18.0/doc-build/xmldocs.make 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -# -# No modifications of this Makefile should be necessary. -# -# To use this template: -# 1) Define: figdir, docname, lang, omffile, and entities in -# your Makefile.am file for each document directory, -# although figdir, omffile, and entities may be empty -# 2) Make sure the Makefile in (1) also includes -# "include $(top_srcdir)/xmldocs.make" and -# "dist-hook: app-dist-hook". -# 3) Optionally define 'entities' to hold xml entities which -# you would also like installed -# 4) Figures must go under $(figdir)/ and be in PNG format -# 5) You should only have one document per directory -# 6) Note that the figure directory, $(figdir)/, should not have its -# own Makefile since this Makefile installs those figures. -# -# example Makefile.am: -# figdir = figures -# docname = scrollkeeper-manual -# lang = C -# omffile=scrollkeeper-manual-C.omf -# entities = fdl.xml -# include $(top_srcdir)/xmldocs.make -# dist-hook: app-dist-hook -# -# About this file: -# This file was taken from scrollkeeper_example2, a package illustrating -# how to install documentation and OMF files for use with ScrollKeeper -# 0.3.x and 0.4.x. For more information, see: -# http://scrollkeeper.sourceforge.net/ -# Version: 0.1.2 (last updated: March 20, 2002) -# - - -# ********** Begin of section some packagers may need to modify ********** -# This variable (docdir) specifies where the documents should be installed. -# This default value should work for most packages. -docdir = $(datadir)/gnome/help/$(docname)/$(lang) - -# ********** You should not have to edit below this line ********** -xml_files = $(entities) $(docname).xml - -EXTRA_DIST = $(xml_files) $(omffile) -CLEANFILES = omf_timestamp - -include $(top_srcdir)/omf.make - -all: omf - -$(docname).xml: $(entities) - -ourdir=`pwd`; \ - cd $(srcdir); \ - cp $(entities) $$ourdir - -app-dist-hook: - if test "$(figdir)"; then \ - $(mkinstalldirs) $(distdir)/$(figdir); \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \ - done \ - fi - -install-data-local: omf - $(mkinstalldirs) $(DESTDIR)$(docdir) - for file in $(xml_files); do \ - cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ - done - if test "$(figdir)"; then \ - $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ - done \ - fi - -install-data-hook: install-data-hook-omf - -uninstall-local: uninstall-local-doc uninstall-local-omf - -uninstall-local-doc: - -if test "$(figdir)"; then \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ - done; \ - rmdir $(DESTDIR)$(docdir)/$(figdir); \ - fi - -for file in $(xml_files); do \ - rm -f $(DESTDIR)$(docdir)/$$file; \ - done - -rmdir $(DESTDIR)$(docdir) - -clean-local: clean-local-doc clean-local-omf - -# for non-srcdir builds, remove the copied entities. -clean-local-doc: - if test $(srcdir) != .; then \ - rm -f $(entities); \ - fi 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.14.0/macros2/Makefile.am new/gnome-common-3.18.0/macros2/Makefile.am --- old/gnome-common-3.14.0/macros2/Makefile.am 2014-08-29 18:28:20.000000000 +0200 +++ new/gnome-common-3.18.0/macros2/Makefile.am 2015-06-28 23:04:09.000000000 +0200 @@ -10,10 +10,13 @@ # these should be dropped as soon as the deprecated GNOME2_MACROS which use them # are removed. Until then, they should be kept up to date, and all changes to # them submitted upstream. +if !WITH_AUTOCONF_ARCHIVE +# Install the macros only if autoconf-archive support is disabled. AUTOCONF_ARCHIVE_MACROS = \ ax_check_enable_debug.m4 \ ax_code_coverage.m4 \ $(NULL) +endif EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) 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.14.0/macros2/gnome-autogen.sh new/gnome-common-3.18.0/macros2/gnome-autogen.sh --- old/gnome-common-3.14.0/macros2/gnome-autogen.sh 2014-09-12 16:08:15.000000000 +0200 +++ new/gnome-common-3.18.0/macros2/gnome-autogen.sh 2015-04-24 10:07:08.000000000 +0200 @@ -1,10 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - # default version requirements ... test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.11.2 test "$REQUIRED_AUTORECONF_VERSION" || REQUIRED_AUTORECONF_VERSION=2.53 @@ -12,8 +8,6 @@ test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 # a list of required m4 macros. Package can set an initial value test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= @@ -49,6 +43,30 @@ echo "$@" >&2 } +check_deprecated() { + variable=$1 + + if set | grep "^$variable=" > /dev/null; then + printerr "***Warning*** $1 is deprecated, you may remove it from autogen.sh" + fi +} + +check_deprecated REQUIRED_GNOME_DOC_UTILS_VERSION +check_deprecated REQUIRED_DOC_COMMON_VERSION +check_deprecated USE_COMMON_DOC_BUILD +check_deprecated FORBIDDEN_M4MACROS +check_deprecated GNOME2_DIR +check_deprecated GNOME2_PATH +check_deprecated USE_GNOME2_MACROS +check_deprecated PKG_NAME + +if [ -z "$srcdir" ]; then + printerr "***Warning*** \$srcdir is not defined, out of dir autogen is broken!" + srcdir=. +fi + +PKG_NAME=`autoconf --trace='AC_INIT:$1' "$srcdir/configure.ac"` + # Usage: # compare_versions MIN_VERSION ACTUAL_VERSION # returns true if ACTUAL_VERSION >= MIN_VERSION @@ -222,7 +240,6 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -want_gnome_doc_utils=false want_maintainer_mode=false version_check automake AUTOMAKE automake $REQUIRED_AUTOMAKE_VERSION \ @@ -267,9 +284,6 @@ if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then want_gtk_doc=true fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi # check that AM_MAINTAINER_MODE is used if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then @@ -327,16 +341,6 @@ require_m4macro gtk-doc.m4 fi -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/"; -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - check_m4macros if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then @@ -376,15 +380,6 @@ $GTKDOCIZE --copy || exit 1 fi - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then printbold "Running $INTLTOOLIZE..." 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.14.0/macros2/gnome-common.m4 new/gnome-common-3.18.0/macros2/gnome-common.m4 --- old/gnome-common-3.14.0/macros2/gnome-common.m4 2014-09-15 13:42:28.000000000 +0200 +++ new/gnome-common-3.18.0/macros2/gnome-common.m4 2014-10-09 15:56:16.000000000 +0200 @@ -3,26 +3,6 @@ # serial 3 # -dnl GNOME_COMMON_INIT - -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) - - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) - AU_DEFUN([GNOME_DEBUG_CHECK], [ AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) 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.14.0/macros2/gnome-compiler-flags.m4 new/gnome-common-3.18.0/macros2/gnome-compiler-flags.m4 --- old/gnome-common-3.14.0/macros2/gnome-compiler-flags.m4 2014-09-22 13:32:01.000000000 +0200 +++ new/gnome-common-3.18.0/macros2/gnome-compiler-flags.m4 2015-01-27 19:59:24.000000000 +0100 @@ -1,6 +1,6 @@ # gnome-compiler-flags.m4 # -# serial 2 +# serial 4 # dnl GNOME_COMPILE_WARNINGS @@ -12,7 +12,7 @@ dnl Additional warning/error flags can be passed as an optional second argument. dnl dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +AU_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** @@ -49,6 +49,7 @@ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ + -Werror=return-type \ " dnl Additional warning or error flags provided by the module author to @@ -119,11 +120,14 @@ WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-c. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) dnl For C++, do basically the same thing. -AC_DEFUN([GNOME_CXX_WARNINGS],[ +AU_DEFUN([GNOME_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, @@ -174,4 +178,7 @@ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" AC_SUBST(WARN_CXXFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-cxx. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) 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.14.0/missing new/gnome-common-3.18.0/missing --- old/gnome-common-3.14.0/missing 2014-09-22 13:33:17.000000000 +0200 +++ new/gnome-common-3.18.0/missing 2015-09-21 22:39:37.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify
