Hello community, here is the log from the commit of package nip2 for openSUSE:Factory checked in at 2012-10-29 20:06:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nip2 (Old) and /work/SRC/openSUSE:Factory/.nip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nip2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/nip2/nip2.changes 2012-10-03 08:05:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nip2.new/nip2.changes 2012-10-29 20:06:08.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 26 19:16:57 UTC 2012 - dmi...@roshchin.org + +- Fix build with flex >= 2.5.36 + * nip2-flex-build.patch + +------------------------------------------------------------------- New: ---- nip2-flex-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nip2.spec ++++++ --- /var/tmp/diff_new_pack.Mv50LL/_old 2012-10-29 20:06:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Mv50LL/_new 2012-10-29 20:06:10.000000000 +0100 @@ -15,18 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: nip2 Version: 7.30.1 Release: 0 -License: GPL-2.0+ Summary: Interactive tool for working with large images -Url: http://www.vips.ecs.soton.ac.uk/ +License: GPL-2.0+ Group: Productivity/Graphics/Other +Url: http://www.vips.ecs.soton.ac.uk/ Source0: http://www.vips.ecs.soton.ac.uk/supported/current/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM nip2-gcc-warnings.patch Patch0: nip2-gcc-warnings.patch # PATCH-FIX-OPENSUSE nip2-doc-path.patch Patch1: nip2-doc-path.patch +%if 0%{?suse_version} > 1220 +# PATCH-FIX-UPSTREAM nip2-flex-build.patch -- Fix compile error with flex >= 2.5.36 +Patch2: nip2-flex-build.patch +%endif BuildRequires: bison BuildRequires: fdupes @@ -55,6 +60,9 @@ %setup -q %patch0 -p1 %patch1 -p1 +%if 0%{?suse_version} > 1220 +%patch2 -p1 +%endif %build %configure ++++++ nip2-flex-build.patch ++++++ commit 5b135dd968633ecee11a9aec8b35df5862f58683 Author: Benjamin Gilbert <bgilb...@backtick.net> Date: Tue Oct 16 23:24:05 2012 -0400 Fix compile error with flex >= 2.5.36 Newer flex declares yyleng to be yy_size_t (== size_t), contrary to SuS. diff --git a/configure.in b/configure.in index 29702a7..ab8fabe 100644 --- a/configure.in +++ b/configure.in @@ -135,6 +135,23 @@ if test "${LEX}" = "flex"; then AC_DEFINE(HAVE_FLEX,1,[using flex, rather than lex]) fi +# flex >= 2.5.36 uses a nonstandard type for yyleng +AC_MSG_CHECKING([whether yyleng is yy_size_t]) +cat > conftest.l <<EOF +%% +%% +yy_size_t yyleng; +EOF +$LEX conftest.l +AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED [`cat $LEX_OUTPUT_ROOT.c`]], [ + AC_MSG_RESULT(yes) + AC_DEFINE(YYLENG_IS_YY_SIZE_T,1, + [Define to 1 if lex declares yyleng to be yy_size_t.]) +], [ + AC_MSG_RESULT(no) +]) +rm -f conftest.l $LEX_OUTPUT_ROOT.c + # get packages we need # gtk before 2.4.9 crashes with the way we use combobox :-( PKG_CHECK_MODULES(REQUIRED_PACKAGES, diff --git a/src/parser.h b/src/parser.h index e316a54..853a08e 100644 --- a/src/parser.h +++ b/src/parser.h @@ -55,7 +55,13 @@ extern InputState input_state; void nip2yyerror( const char *sub, ... ) __attribute__((format(printf, 1, 2))); void yyerror( const char *msg ); +#ifdef YYLENG_IS_YY_SIZE_T +/* Assume yy_size_t is size_t. + */ +extern size_t yyleng; +#else extern int yyleng; /* lex stuff */ +#endif /* Lex gathers tokens here for workspace.c */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
