diff options
Diffstat (limited to 'mandriva/2010.2/common-patches')
6 files changed, 0 insertions, 149 deletions
diff --git a/mandriva/2010.2/common-patches/ac264.patch b/mandriva/2010.2/common-patches/ac264.patch deleted file mode 100644 index 284545fa6..000000000 --- a/mandriva/2010.2/common-patches/ac264.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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/fix_autotools.patch b/mandriva/2010.2/common-patches/fix_autotools.patch deleted file mode 100644 index 60382d25d..000000000 --- a/mandriva/2010.2/common-patches/fix_autotools.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-yeni/admin/cvs.sh ---- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 23:28:39.000000000 +0300 -+++ kdelibs-3.5.10-yeni/admin/cvs.sh 2010-01-01 21:30:35.039582467 +0200 -@@ -29,10 +29,10 @@ - - check_autotool_versions() - { --required_autoconf_version="2.53 or newer" -+required_autoconf_version="2.53 or newer up to 2.65" - AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` - case $AUTOCONF_VERSION in -- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; -+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.60 | autoconf*2.61 | autoconf*2.62 | autoconf*2.63 | autoconf*2.65 ) : ;; - "" ) - echo "*** AUTOCONF NOT FOUND!." - echo "*** KDE requires autoconf $required_autoconf_version" -@@ -47,7 +47,7 @@ - - AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` - case $AUTOHEADER_VERSION in -- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; -+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.60 | autoheader*2.61 | autoheader*2.62 | autoheader*2.63 | autoheader*2.65 ) : ;; - "" ) - echo "*** AUTOHEADER NOT FOUND!." - echo "*** KDE requires autoheader $required_autoconf_version" -@@ -68,7 +68,7 @@ - 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*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*) - echo "*** $AUTOMAKE_STRING found." - UNSERMAKE=no - ;; 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 deleted file mode 100644 index 0610d6df5..000000000 --- a/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch +++ /dev/null @@ -1,66 +0,0 @@ -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/kdebase-3.5.12-config.patch b/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch deleted file mode 100644 index 922315b6e..000000000 --- a/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- admin/configure.in.min.orig 2011-07-13 14:02:37.735906184 +0100 -+++ admin/configure.in.min 2011-07-13 14:03:14.916906166 +0100 -@@ -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) diff --git a/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch b/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch deleted file mode 100644 index 1deb924c0..000000000 --- a/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- admin/acinclude.m4.in.orig 2010-08-12 23:39:22.000000000 +0100 -+++ admin/acinclude.m4.in 2011-07-19 13:40:17.619311049 +0100 -@@ -527,7 +527,7 @@ - xdg_appsdir='\${datadir}/applications/kde' - fi - if test -z "$xdg_menudir"; then -- xdg_menudir='\${sysconfdir}/xdg/menus' -+ xdg_menudir='\${sysconfdir}/xdg/kde/menus' - fi - if test -z "$xdg_directorydir"; then - xdg_directorydir='\${datadir}/desktop-directories' diff --git a/mandriva/2010.2/common-patches/readme.txt b/mandriva/2010.2/common-patches/readme.txt deleted file mode 100644 index 282020b80..000000000 --- a/mandriva/2010.2/common-patches/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -This directory contains some common patches which are applied to the majority -of the Trinity sources. |