summaryrefslogtreecommitdiffstats
path: root/mandriva/2010.2/common-patches
diff options
context:
space:
mode:
Diffstat (limited to 'mandriva/2010.2/common-patches')
-rw-r--r--mandriva/2010.2/common-patches/ac264.patch24
-rw-r--r--mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/common-patches/readme.txt2
3 files changed, 92 insertions, 0 deletions
diff --git a/mandriva/2010.2/common-patches/ac264.patch b/mandriva/2010.2/common-patches/ac264.patch
new file mode 100644
index 000000000..284545fa6
--- /dev/null
+++ b/mandriva/2010.2/common-patches/ac264.patch
@@ -0,0 +1,24 @@
+--- kdelibs-3.5.10/admin/configure.in.min~ 2008-08-19 22:28:39.000000000 +0200
++++ kdelibs-3.5.10/admin/configure.in.min 2009-08-17 19:13:01.823156420 +0200
+@@ -44,6 +44,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+--- kdelibs-3.5.10/configure.in.in~ 2006-05-22 20:14:23.000000000 +0200
++++ kdelibs-3.5.10/configure.in.in 2009-08-17 19:16:04.549804009 +0200
+@@ -25,6 +25,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_LIBLTDL_CONVENIENCE
+
diff --git a/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
new file mode 100644
index 000000000..0610d6df5
--- /dev/null
+++ b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
@@ -0,0 +1,66 @@
+2009-12-10 Stepan Kasal <skasal@redhat.com>
+
+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/mandriva/2010.2/common-patches/readme.txt b/mandriva/2010.2/common-patches/readme.txt
new file mode 100644
index 000000000..282020b80
--- /dev/null
+++ b/mandriva/2010.2/common-patches/readme.txt
@@ -0,0 +1,2 @@
+This directory contains some common patches which are applied to the majority
+of the Trinity sources.