[Pkg-kde-commits] rev 488 - in branches/kde-3.4.0: . common-patches
Adeodato Simó
dato-guest@costa.debian.org
Sat, 26 Feb 2005 04:34:16 +0100
Author: dato-guest
Date: 2005-02-26 04:34:16 +0100 (Sat, 26 Feb 2005)
New Revision: 488
Added:
branches/kde-3.4.0/common-patches/
branches/kde-3.4.0/common-patches/04_am_maintainer_mode.diff
branches/kde-3.4.0/common-patches/05_pedantic-errors.diff
branches/kde-3.4.0/common-patches/06_automake-1.9.diff
branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff
Log:
branches/kde-3.4.0/common-patches:
- 04_am_maintainer_mode.diff
- 06_automake-1.9.diff
- 05_pedantic-errors.diff
- 07_disable_no_undefined.diff
Added: branches/kde-3.4.0/common-patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.4.0/common-patches/04_am_maintainer_mode.diff 2005-02-25 03:06:13 UTC (rev 487)
+++ branches/kde-3.4.0/common-patches/04_am_maintainer_mode.diff 2005-02-26 03:34:16 UTC (rev 488)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
Added: branches/kde-3.4.0/common-patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.4.0/common-patches/05_pedantic-errors.diff 2005-02-25 03:06:13 UTC (rev 487)
+++ branches/kde-3.4.0/common-patches/05_pedantic-errors.diff 2005-02-26 03:34:16 UTC (rev 488)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2087,9 +2087,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
Added: branches/kde-3.4.0/common-patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.4.0/common-patches/06_automake-1.9.diff 2005-02-25 03:06:13 UTC (rev 487)
+++ branches/kde-3.4.0/common-patches/06_automake-1.9.diff 2005-02-26 03:34:16 UTC (rev 488)
@@ -0,0 +1,11 @@
+--- a/admin/detect-autoconf.sh
++++ b/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+
+ # We don't use variable here for remembering the type ... strings. Local
+ # variables are not that portable, but we fear namespace issues with our
Added: branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff
===================================================================
--- branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff 2005-02-25 03:06:13 UTC (rev 487)
+++ branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff 2005-02-26 03:34:16 UTC (rev 488)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1665,15 +1665,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)