Package: ffrenzy Version: 1.0.2~svn20070530-5 Tags: patch Usertags: origin-ubuntu ubuntu-patch vivid
In Ubuntu, we've applied the attached patch to achieve the following: * debian/patches/fix-werror-usage-and-aclocal-regen.patch: - Do not pass Werror by default to avoid build failures. - Fix the aclocal flags to not include. We thought you might be interested in doing the same.
diff -Nru ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch --- ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch 1970-01-01 01:00:00.000000000 +0100 +++ ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch 2015-01-24 23:55:42.000000000 +0100 @@ -0,0 +1,44 @@ +Description: Do not pass Werror by default to avoid build failures. + In addition to fixing the Werror usage, fix the aclocal flags to not include. +Author: Ben Collins <bcoll...@ubuntu.com> + +--- ffrenzy-1.0.2~svn20070530.orig/Makefile.am ++++ ffrenzy-1.0.2~svn20070530/Makefile.am +@@ -1,5 +1,3 @@ + SUBDIRS = src po tests data utils + +-ACLOCAL_AMFLAGS = -I m4 +- + EXTRA_DIST = config.rpath +--- ffrenzy-1.0.2~svn20070530.orig/configure ++++ ffrenzy-1.0.2~svn20070530/configure +@@ -4347,7 +4347,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; + + + # setting CFLAGS +-CFLAGS="$CLAGS -Wall -Werror -g -O2 -finline-functions" ++CFLAGS="$CLAGS -Wall -g -O2 -finline-functions" + + # gettext stuff + +--- ffrenzy-1.0.2~svn20070530.orig/Makefile.in ++++ ffrenzy-1.0.2~svn20070530/Makefile.in +@@ -198,7 +198,6 @@ target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ + SUBDIRS = src po tests data utils +-ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = config.rpath + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +--- ffrenzy-1.0.2~svn20070530.orig/configure.ac ++++ ffrenzy-1.0.2~svn20070530/configure.ac +@@ -20,7 +20,7 @@ AC_CHECK_HEADERS + AM_PATH_PYTHON(2.3) + + # setting CFLAGS +-CFLAGS="$CLAGS -Wall -Werror -g -O2 -finline-functions" ++CFLAGS="$CLAGS -Wall -g -O2 -finline-functions" + + # gettext stuff + AM_GNU_GETTEXT_VERSION(0.16.1) diff -Nru ffrenzy-1.0.2~svn20070530/debian/patches/series ffrenzy-1.0.2~svn20070530/debian/patches/series --- ffrenzy-1.0.2~svn20070530/debian/patches/series 2013-08-03 02:24:22.000000000 +0200 +++ ffrenzy-1.0.2~svn20070530/debian/patches/series 2015-01-24 12:45:15.000000000 +0100 @@ -1,2 +1,3 @@ fix-ffrenzy-menu-path.patch fix-libm-underlinkage.patch +fix-werror-usage-and-aclocal-regen.patch