From c00afba812c2a851bb2ddc12cf3ecd74aceda832 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mar 09 2013 01:39:15 +0000 Subject: unify KDE 3 autotools fixes between packages * Sat Mar 09 2013 Kevin Kofler - 3.5.10-49 - unify KDE 3 autotools fixes between packages --- diff --git a/arts-acinclude.patch b/arts-acinclude.patch deleted file mode 100644 index 0610d6d..0000000 --- a/arts-acinclude.patch +++ /dev/null @@ -1,66 +0,0 @@ -2009-12-10 Stepan Kasal - -The change of implementation of AC_REQUIRE in 2.64 caused a regression -in the arts project. -This can be fixed by shuffling some macro calls. - -I suppose that most of this patch will not be needed with a future -release of Autoconf. -But the last chunk of this patch is a real bug in this source and -should go upstream. - ---- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 -+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 -@@ -3081,8 +3081,18 @@ - fi - ]) - -+AC_DEFUN([AC_CHECK_COMPILERS_CC], -+[ -+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -+ CFLAGS=" $CFLAGS" -+ AC_PROG_CC -+ CXXFLAGS=" $CXXFLAGS" -+ AC_PROG_CXX -+]) -+ - AC_DEFUN([AC_CHECK_COMPILERS], - [ -+ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ -@@ -3141,11 +3151,6 @@ - [kde_use_profiling="no"] - ) - -- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -- CFLAGS=" $CFLAGS" -- -- AC_PROG_CC -- - AC_PROG_CPP - - if test "$GCC" = "yes"; then -@@ -3174,10 +3179,6 @@ - LDFLAGS="" - fi - -- CXXFLAGS=" $CXXFLAGS" -- -- AC_PROG_CXX -- - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then -@@ -3503,8 +3504,8 @@ - AC_REQUIRE([AC_LIBTOOL_DLOPEN]) - AC_REQUIRE([KDE_CHECK_LIB64]) - --AC_OBJEXT --AC_EXEEXT -+AC_REQUIRE([AC_OBJEXT]) -+AC_REQUIRE([AC_EXEEXT]) - - AM_PROG_LIBTOOL - AC_LIBTOOL_CXX diff --git a/kde3-acinclude.patch b/kde3-acinclude.patch new file mode 100644 index 0000000..0610d6d --- /dev/null +++ b/kde3-acinclude.patch @@ -0,0 +1,66 @@ +2009-12-10 Stepan Kasal + +The change of implementation of AC_REQUIRE in 2.64 caused a regression +in the arts project. +This can be fixed by shuffling some macro calls. + +I suppose that most of this patch will not be needed with a future +release of Autoconf. +But the last chunk of this patch is a real bug in this source and +should go upstream. + +--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 ++++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 +@@ -3081,8 +3081,18 @@ + fi + ]) + ++AC_DEFUN([AC_CHECK_COMPILERS_CC], ++[ ++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS ++ CFLAGS=" $CFLAGS" ++ AC_PROG_CC ++ CXXFLAGS=" $CXXFLAGS" ++ AC_PROG_CXX ++]) ++ + AC_DEFUN([AC_CHECK_COMPILERS], + [ ++ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) + AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), + [ +@@ -3141,11 +3151,6 @@ + [kde_use_profiling="no"] + ) + +- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS +- CFLAGS=" $CFLAGS" +- +- AC_PROG_CC +- + AC_PROG_CPP + + if test "$GCC" = "yes"; then +@@ -3174,10 +3179,6 @@ + LDFLAGS="" + fi + +- CXXFLAGS=" $CXXFLAGS" +- +- AC_PROG_CXX +- + KDE_CHECK_FOR_BAD_COMPILER + + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then +@@ -3503,8 +3504,8 @@ + AC_REQUIRE([AC_LIBTOOL_DLOPEN]) + AC_REQUIRE([KDE_CHECK_LIB64]) + +-AC_OBJEXT +-AC_EXEEXT ++AC_REQUIRE([AC_OBJEXT]) ++AC_REQUIRE([AC_EXEEXT]) + + AM_PROG_LIBTOOL + AC_LIBTOOL_CXX diff --git a/kde3-automake-add-missing.patch b/kde3-automake-add-missing.patch new file mode 100644 index 0000000..9792f70 --- /dev/null +++ b/kde3-automake-add-missing.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-3.5.10/admin/cvs.sh.me kdelibs-3.5.10/admin/cvs.sh +--- kdelibs-3.5.10/admin/cvs.sh.me 2013-03-07 18:31:59.415038395 +0100 ++++ kdelibs-3.5.10/admin/cvs.sh 2013-03-07 18:32:26.565020369 +0100 +@@ -130,7 +130,7 @@ if egrep "^AM_CONFIG_HEADER" configure.i + fi + + echo "*** Creating Makefile templates" +-$AUTOMAKE || exit 1 ++$AUTOMAKE --add-missing || exit 1 + + if test "$UNSERMAKE" = no; then + echo "*** Postprocessing Makefile templates" diff --git a/kde3-automake-version.patch b/kde3-automake-version.patch new file mode 100644 index 0000000..6ee4e6d --- /dev/null +++ b/kde3-automake-version.patch @@ -0,0 +1,17 @@ +diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh +--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 22:28:39.000000000 +0200 ++++ kdelibs-3.5.10-automake-version/admin/cvs.sh 2012-06-12 01:24:13.000000000 +0200 +@@ -63,12 +63,7 @@ + AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` + required_automake_version="1.6.1 or newer" + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; diff --git a/kdelibs-3.5.10-automake-missing.patch b/kdelibs-3.5.10-automake-missing.patch deleted file mode 100644 index 9792f70..0000000 --- a/kdelibs-3.5.10-automake-missing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdelibs-3.5.10/admin/cvs.sh.me kdelibs-3.5.10/admin/cvs.sh ---- kdelibs-3.5.10/admin/cvs.sh.me 2013-03-07 18:31:59.415038395 +0100 -+++ kdelibs-3.5.10/admin/cvs.sh 2013-03-07 18:32:26.565020369 +0100 -@@ -130,7 +130,7 @@ if egrep "^AM_CONFIG_HEADER" configure.i - fi - - echo "*** Creating Makefile templates" --$AUTOMAKE || exit 1 -+$AUTOMAKE --add-missing || exit 1 - - if test "$UNSERMAKE" = no; then - echo "*** Postprocessing Makefile templates" diff --git a/kdelibs-3.5.10-automake-version.patch b/kdelibs-3.5.10-automake-version.patch deleted file mode 100644 index 6ee4e6d..0000000 --- a/kdelibs-3.5.10-automake-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh ---- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 22:28:39.000000000 +0200 -+++ kdelibs-3.5.10-automake-version/admin/cvs.sh 2012-06-12 01:24:13.000000000 +0200 -@@ -63,12 +63,7 @@ - AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` - required_automake_version="1.6.1 or newer" - case $AUTOMAKE_STRING in -- automake*1.5d* | automake*1.5* | automake*1.5-* ) -- echo "*** YOU'RE USING $AUTOMAKE_STRING." -- echo "*** KDE requires automake $required_automake_version" -- exit 1 -- ;; -- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*) - echo "*** $AUTOMAKE_STRING found." - UNSERMAKE=no - ;; diff --git a/kdelibs3.spec b/kdelibs3.spec index 79b7e71..9599e56 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -21,7 +21,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 48%{?dist} +Release: 49%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -66,10 +66,6 @@ Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch # fix FTBFS (cups-util.c must include stdio.h, #714133) Patch57: kdelibs-3.5.10-cups-util-missing-header.patch -# remove flawed and obsolete automake version check in admin/cvs.sh -Patch58: kdelibs-3.5.10-automake-version.patch -# fix build failure with automake-1.13 -Patch59: kdelibs-3.5.10-automake-missing.patch # use /etc/kde in addition to /usr/share/config, borrowed from debian Patch100: kdelibs-3.5.5-kstandarddirs.patch @@ -83,7 +79,6 @@ Patch106: kdelibs-3.5.10-kio.patch Patch107: kdelibs-3.5.10-assert.patch Patch108: kdelibs-3.5.10-dtoa.patch Patch109: kdelibs-3.5.10-kabc.patch -Patch110: arts-acinclude.patch # kde4.4 backport Patch111: kdelibs-3.5.10-kde-config_kde-version.patch @@ -113,6 +108,14 @@ Patch207: libltdl-CVE-2009-3736.patch # CVE-2011-3365, input validation failure in KSSL Patch208: kdelibs-3.5.x-CVE-2011-3365.patch +## fixes to common KDE 3 autotools machinery +# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65 +Patch300: kde3-acinclude.patch +# remove flawed and obsolete automake version check in admin/cvs.sh +Patch301: kde3-automake-version.patch +# fix build failure with automake 1.13: add the --add-missing flag +Patch302: kde3-automake-add-missing.patch + Requires: hicolor-icon-theme Requires: kde-settings >= 3.5 Requires: kde-filesystem @@ -240,8 +243,6 @@ format for easy browsing %patch55 -p1 -b .latex-syntax %patch56 -p1 -b .qcolor_gcc_ftbfs %patch57 -p1 -b .cups-util -%patch58 -p1 -b .automake-version -%patch59 -p1 -b .automake-1.13 %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext @@ -251,11 +252,12 @@ format for easy browsing %patch107 -p1 -b .assert %patch108 -p1 -b .alias %patch109 -p1 -b .kabc -%patch110 -p1 -b .autoconf %patch111 -p1 -b .kde-config_kde-version %patch150 -p1 -b .cups16 +sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h + # security fixes %patch200 -p1 -b .cve-2009-2537 %patch201 -p0 -b .cve-2009-1725 @@ -267,8 +269,9 @@ format for easy browsing %patch207 -p1 -b .CVE-2009-3736 %patch208 -p1 -b .CVE-2011-3365 -sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h - +%patch300 -p1 -b .acinclude +%patch301 -p1 -b .automake-version +%patch302 -p1 -b .automake-add-missing make -f admin/Makefile.common cvs @@ -577,6 +580,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Sat Mar 09 2013 Kevin Kofler - 3.5.10-49 +- unify KDE 3 autotools fixes between packages + * Thu Mar 07 2013 Than Ngo - 3.5.10-48 - fix build failture