Hello community, here is the log from the commit of package xfce4-vala for openSUSE:Factory checked in at 2013-08-19 13:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-vala (Old) and /work/SRC/openSUSE:Factory/.xfce4-vala.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-vala" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-vala/xfce4-vala.changes 2013-05-02 12:05:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-vala.new/xfce4-vala.changes 2013-08-19 13:30:59.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Aug 18 10:52:54 UTC 2013 - [email protected] + +- add support for vala 0.22 in Factory + +------------------------------------------------------------------- +Sat Aug 17 13:53:00 UTC 2013 - [email protected] + +- update to version 4.10.3 + - Make the pkgconfig file noarch + - Add --with-vala-api option to allow packagers select vala api + version +- drop now obsolete xfce4-vala-multiple-vala-versions.patch +- remove support for openSUSE 12.1 + +------------------------------------------------------------------- Old: ---- xfce4-vala-4.10.2.tar.bz2 xfce4-vala-multiple-vala-versions.patch New: ---- xfce4-vala-4.10.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-vala.spec ++++++ --- /var/tmp/diff_new_pack.0MCfmN/_old 2013-08-19 13:31:00.000000000 +0200 +++ /var/tmp/diff_new_pack.0MCfmN/_new 2013-08-19 13:31:00.000000000 +0200 @@ -16,9 +16,6 @@ # -%if 0%{?suse_version} == 1210 -%define vala_version 0.14 -%else %if 0%{?suse_version} == 1220 %define vala_version 0.16 %else @@ -26,15 +23,14 @@ %define vala_version 0.18 %else %if 0%{?suse_version} > 1230 -%define vala_version 0.20 -%endif +%define vala_version 0.22 %endif %endif %endif %define vala_libname libvala-%{vala_version} Name: xfce4-vala -Version: 4.10.2 +Version: 4.10.3 Release: 0 Summary: Vala Bindings to Xfce Libraries License: LGPL-2.1+ @@ -42,11 +38,8 @@ Url: http://wiki.xfce.org/vala-bindings Source: http://archive.xfce.org/src/bindings/xfce4-vala/4.10/%{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc -# PATCH-FEATURE-OPENSUSE xfce4-vala-multiple-vala-versions.patch [email protected] -- Support multiple vala versions -Patch0: xfce4-vala-multiple-vala-versions.patch BuildRequires: fdupes BuildRequires: vala -BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(%{vala_libname}) BuildRequires: pkgconfig(exo-1) BuildRequires: pkgconfig(libxfce4panel-1.0) @@ -55,17 +48,16 @@ BuildRequires: pkgconfig(libxfconf-0) Requires: vala BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package provides Vala bindings to Xfce Libraries. %prep %setup -q -%patch0 -p1 %build -xdt-autogen -%configure +%configure --with-vala-api=%{vala_version} make %{?_smp_mflags} %install @@ -79,7 +71,7 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO -%{_libdir}/pkgconfig/xfce4-vala.pc +%{_datadir}/pkgconfig/xfce4-vala.pc %dir %{_datadir}/vala-%{vala_version} %dir %{_datadir}/vala-%{vala_version}/vapi %{_datadir}/vala-%{vala_version}/vapi/*.deps ++++++ xfce4-vala-4.10.2.tar.bz2 -> xfce4-vala-4.10.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/ChangeLog new/xfce4-vala-4.10.3/ChangeLog --- old/xfce4-vala-4.10.2/ChangeLog 2012-10-23 03:12:50.000000000 +0200 +++ new/xfce4-vala-4.10.3/ChangeLog 2013-08-16 22:23:19.000000000 +0200 @@ -1,3 +1,22 @@ +2013-08-16 Mike Massonnet + +=== Release 4.10.3 === + + +2013-08-16 Kalev Lember + +Make the pkgconfig file noarch + + +2013-07-23 Natanael Copa + +Add --with-vala-api option to allow packagers select vala api version + +Let packagers set what vala API version they want build the bindings, rather +than require the they use whatever the xfce4-vala maintainer's distro happens +to use. + + 2012-10-23 Mike Massonnet === Release 4.10.2 === diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/Makefile.am new/xfce4-vala-4.10.3/Makefile.am --- old/xfce4-vala-4.10.2/Makefile.am 2012-10-23 03:10:05.000000000 +0200 +++ new/xfce4-vala-4.10.3/Makefile.am 2013-08-16 22:21:15.000000000 +0200 @@ -53,7 +53,7 @@ vapi/$(EXO).deps \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = xfce4-vala.pc EXTRA_DIST = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/Makefile.in new/xfce4-vala-4.10.3/Makefile.in --- old/xfce4-vala-4.10.2/Makefile.in 2012-10-23 03:17:09.000000000 +0200 +++ new/xfce4-vala-4.10.3/Makefile.in 2013-08-16 22:27:53.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -49,6 +66,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -195,7 +217,7 @@ vapi/$(EXO).deps \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = xfce4-vala.pc EXTRA_DIST = \ AUTHORS \ @@ -272,8 +294,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -290,8 +315,11 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-vapiDATA: $(vapi_DATA) @$(NORMAL_INSTALL) - test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -410,7 +438,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/NEWS new/xfce4-vala-4.10.3/NEWS --- old/xfce4-vala-4.10.2/NEWS 2012-10-23 03:10:05.000000000 +0200 +++ new/xfce4-vala-4.10.3/NEWS 2013-08-16 22:25:26.000000000 +0200 @@ -1,4 +1,9 @@ -+ Version 4.10.1, 2012-10-23 ++ Version 4.10.3, 2013-08-16 + +Make the pkgconfig file noarch. +Add --with-vala-api option to allow packagers select vala api version. + ++ Version 4.10.2, 2012-10-23 Add missing file in installation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/acinclude.m4 new/xfce4-vala-4.10.3/acinclude.m4 --- old/xfce4-vala-4.10.2/acinclude.m4 2012-10-17 02:10:04.000000000 +0200 +++ new/xfce4-vala-4.10.3/acinclude.m4 2013-07-29 20:58:37.000000000 +0200 @@ -18,31 +18,31 @@ dnl # M8T_CHECK_VALA(minimum_version) dnl # -dnl # Check for the package vala-0.16 and substitutes useful Vala variables. +dnl # Check for the package libvala and substitutes useful Vala variables. dnl # AC_DEFUN([M8T_CHECK_VALA], [ -PKG_CHECK_MODULES([VALA], [libvala-0.16 >= $1]) -M8T_VALA_PROGS() -M8T_VAPI_DIR() +PKG_CHECK_MODULES([VALA], [libvala-$1]) +M8T_VALA_PROGS([$1]) +M8T_VAPI_DIR([$1]) ]) dnl # M8T_VALA_PROGS() dnl # -dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.16 pkgconfig file. +dnl # Substitutes VALAC, VAPIGEN and VALAGI from libvala pkgconfig file. dnl # AC_DEFUN([M8T_VALA_PROGS], [ AC_PATH_PROG([VALAC], [valac], [valac]) -AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.16`) -AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16`) +AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-$1`) +AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-$1`) ]) dnl # M8T_VAPI_DIR() dnl # -dnl # Substitutes vapidir from vala-0.16 pkgconfig file. +dnl # Substitutes vapidir from libvala pkgconfig file. dnl # AC_DEFUN([M8T_VAPI_DIR], [ -AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.16`) +AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-$1`) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/aclocal.m4 new/xfce4-vala-4.10.3/aclocal.m4 --- old/xfce4-vala-4.10.2/aclocal.m4 2012-10-23 03:17:08.000000000 +0200 +++ new/xfce4-vala-4.10.3/aclocal.m4 2013-08-16 22:27:53.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -48,7 +48,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -94,7 +95,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -142,9 +144,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -157,7 +159,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -168,7 +170,7 @@ _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -196,7 +198,7 @@ [am__api_version='1.11' 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.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -212,7 +214,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.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/configure new/xfce4-vala-4.10.3/configure --- old/xfce4-vala-4.10.2/configure 2012-10-23 03:17:09.000000000 +0200 +++ new/xfce4-vala-4.10.3/configure 2013-08-16 22:27:53.000000000 +0200 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Xfce4 Vala 4.10.2. +# Generated by GNU Autoconf 2.69 for Xfce4 Vala 4.10.3. # # Report bugs to <[email protected]>. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,21 +237,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -330,6 +358,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -451,6 +487,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -485,16 +525,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -506,28 +546,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -559,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='Xfce4 Vala' PACKAGE_TARNAME='xfce4-vala' -PACKAGE_VERSION='4.10.2' -PACKAGE_STRING='Xfce4 Vala 4.10.2' +PACKAGE_VERSION='4.10.3' +PACKAGE_STRING='Xfce4 Vala 4.10.3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -649,6 +669,7 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode +with_vala_api with_default_vapidir ' ac_precious_vars='build_alias @@ -1114,8 +1135,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1201,7 +1220,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 Xfce4 Vala 4.10.2 to adapt to many kinds of systems. +\`configure' configures Xfce4 Vala 4.10.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1267,7 +1286,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xfce4 Vala 4.10.2:";; + short | recursive ) echo "Configuration of Xfce4 Vala 4.10.3:";; esac cat <<\_ACEOF @@ -1281,6 +1300,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-vala-api=VERSION Use Vala API version VERSION --with-default-vapidir Use default VAPI prefix from Vala installation Some influential environment variables: @@ -1358,10 +1378,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xfce4 Vala configure 4.10.2 -generated by GNU Autoconf 2.68 +Xfce4 Vala configure 4.10.3 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1375,8 +1395,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xfce4 Vala $as_me 4.10.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by Xfce4 Vala $as_me 4.10.3, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1791,7 +1811,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1960,7 +1980,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2000,7 +2020,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2051,7 +2071,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2104,7 +2124,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2190,7 +2210,7 @@ # Define the identity of the package. PACKAGE='xfce4-vala' - VERSION='4.10.2' + VERSION='4.10.3' cat >>confdefs.h <<_ACEOF @@ -2262,6 +2282,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -2282,7 +2303,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2325,7 +2346,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2503,6 +2524,14 @@ +# Check whether --with-vala-api was given. +if test "${with_vala_api+set}" = set; then : + withval=$with_vala_api; vala_api=$withval +else + vala_api='0.16' +fi + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5 @@ -2512,12 +2541,13 @@ pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-0.16 >= 0.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libvala-0.16 >= 0.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-\$vala_api\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libvala-$vala_api") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.16 >= 0.16.0" 2>/dev/null` + pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-$vala_api" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -2528,12 +2558,13 @@ pkg_cv_VALA_LIBS="$VALA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-0.16 >= 0.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libvala-0.16 >= 0.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-\$vala_api\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libvala-$vala_api") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.16 >= 0.16.0" 2>/dev/null` + pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-$vala_api" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -2553,14 +2584,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libvala-0.16 >= 0.16.0" 2>&1` + VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvala-$vala_api" 2>&1` else - VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvala-0.16 >= 0.16.0" 2>&1` + VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvala-$vala_api" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$VALA_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libvala-0.16 >= 0.16.0) were not met: + as_fn_error $? "Package requirements (libvala-$vala_api) were not met: $VALA_PKG_ERRORS @@ -2570,7 +2601,6 @@ Alternatively, you may set the environment variables VALA_CFLAGS and VALA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -2586,7 +2616,6 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } - else VALA_CFLAGS=$pkg_cv_VALA_CFLAGS VALA_LIBS=$pkg_cv_VALA_LIBS @@ -2613,7 +2642,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_VALAC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2636,13 +2665,13 @@ fi -VAPIGEN=`$PKG_CONFIG --variable=vapigen libvala-0.16` +VAPIGEN=`$PKG_CONFIG --variable=vapigen libvala-$vala_api` -VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16` +VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect libvala-$vala_api` -vapidir=`$PKG_CONFIG --variable=vapidir libvala-0.16` +vapidir=`$PKG_CONFIG --variable=vapidir libvala-$vala_api` @@ -2655,7 +2684,7 @@ fi if test x"$with_default_vapidir" == xno ; then - vapidir=${datarootdir}/vala-0.16/vapi + vapidir=${datarootdir}/vala-${vala_api}/vapi fi @@ -3109,16 +3138,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -3178,28 +3207,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -3220,8 +3237,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xfce4 Vala $as_me 4.10.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by Xfce4 Vala $as_me 4.10.3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3273,11 +3290,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xfce4 Vala config.status 4.10.2 -configured by $0, generated by GNU Autoconf 2.68, +Xfce4 Vala config.status 4.10.3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3357,7 +3374,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/configure.ac new/xfce4-vala-4.10.3/configure.ac --- old/xfce4-vala-4.10.2/configure.ac 2012-10-23 03:17:07.000000000 +0200 +++ new/xfce4-vala-4.10.3/configure.ac 2013-08-16 22:27:52.000000000 +0200 @@ -12,8 +12,8 @@ dnl Version information m4_define([project_version_major], [4]) m4_define([project_version_minor], [10]) -m4_define([project_version_micro], [2]) -m4_define([project_version_build], [1be1ba4]) +m4_define([project_version_micro], [3]) +m4_define([project_version_build], [fd478b5]) m4_define([project_version_tag], []) # leave empty for release m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()project_version_tag()]) @@ -34,14 +34,19 @@ M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0]) dnl Check for Vala -M8T_CHECK_VALA([0.16.0]) +AC_ARG_WITH([vala-api], + AC_HELP_STRING([--with-vala-api=VERSION], + [Use Vala API version VERSION]), + [vala_api=$withval], + [vala_api='0.16']) +M8T_CHECK_VALA([$vala_api]) AC_ARG_WITH([default-vapidir], AC_HELP_STRING([--with-default-vapidir], [Use default VAPI prefix from Vala installation]), [], [with_default_vapidir=no]) if test x"$with_default_vapidir" == xno ; then - AC_SUBST([vapidir], [${datarootdir}/vala-0.16/vapi]) + AC_SUBST([vapidir], [${datarootdir}/vala-${vala_api}/vapi]) fi dnl Makefile outputs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-vala-4.10.2/xfce4-vala.pc.in new/xfce4-vala-4.10.3/xfce4-vala.pc.in --- old/xfce4-vala-4.10.2/xfce4-vala.pc.in 2012-05-17 19:03:55.000000000 +0200 +++ new/xfce4-vala-4.10.3/xfce4-vala.pc.in 2013-08-16 22:21:15.000000000 +0200 @@ -1,7 +1,4 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ Name: @PACKAGE_TARNAME@ Description: Vala bindings for the Xfce Desktop Environment -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
