diff options
| author | Tim Williams <tmw@autotrain.org> | 2011-10-17 18:47:27 +0100 |
|---|---|---|
| committer | Tim Williams <tmw@autotrain.org> | 2011-10-17 18:47:27 +0100 |
| commit | 76ef832ce5348d12a871223d4c034c7daeaddb82 (patch) | |
| tree | 7024a1f39a6114daa8c5ed24bb31a8687c832b9a /mandriva/2010.2/common-patches | |
| parent | ec2515f058c60d2478a549f58376db628ba556b9 (diff) | |
| download | tde-packaging-76ef832ce5348d12a871223d4c034c7daeaddb82.tar.gz tde-packaging-76ef832ce5348d12a871223d4c034c7daeaddb82.zip | |
Adding the remaining Mandriva patches and spec files
Diffstat (limited to 'mandriva/2010.2/common-patches')
3 files changed, 57 insertions, 0 deletions
diff --git a/mandriva/2010.2/common-patches/fix_autotools.patch b/mandriva/2010.2/common-patches/fix_autotools.patch new file mode 100644 index 000000000..60382d25d --- /dev/null +++ b/mandriva/2010.2/common-patches/fix_autotools.patch @@ -0,0 +1,34 @@ +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/kdebase-3.5.12-config.patch b/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch new file mode 100644 index 000000000..922315b6e --- /dev/null +++ b/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000..1deb924c0 --- /dev/null +++ b/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch @@ -0,0 +1,11 @@ +--- 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' |