summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Krenski2005-04-11 16:18:39 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit8aa4225df7a0592baea5040b87d7d5167fb1de57 (patch)
treeba124c3d19b0c706b7bc54d2611207fa13ca995f
parent087104766f4e3de96b65fee6c0821d048b94b963 (diff)
downloadkrusader-8aa4225df7a0592baea5040b87d7d5167fb1de57.zip
krusader-8aa4225df7a0592baea5040b87d7d5167fb1de57.tar.gz
- resolved in .spec
Changed files: krusader-no_konqueror_libs.patch -> 1.2
-rw-r--r--krusader-no_konqueror_libs.patch301
1 files changed, 0 insertions, 301 deletions
diff --git a/krusader-no_konqueror_libs.patch b/krusader-no_konqueror_libs.patch
deleted file mode 100644
index b447a5f..0000000
--- a/krusader-no_konqueror_libs.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-diff -urN krusader-1.50.orig/configure krusader-1.50/configure
---- krusader-1.50.orig/configure 2004-10-31 09:34:17.000000000 +0000
-+++ krusader-1.50/configure 2004-11-17 00:40:49.189822304 +0000
-@@ -31505,148 +31505,7 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-- if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for konq_popupmenu.h" >&5
--echo $ECHO_N "checking for konq_popupmenu.h... $ECHO_C" >&6
--if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_konq_popupmenu_h" >&5
--echo "${ECHO_T}$ac_cv_header_konq_popupmenu_h" >&6
--else
-- # Is the header compilable?
--echo "$as_me:$LINENO: checking konq_popupmenu.h usability" >&5
--echo $ECHO_N "checking konq_popupmenu.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <konq_popupmenu.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking konq_popupmenu.h presence" >&5
--echo $ECHO_N "checking konq_popupmenu.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <konq_popupmenu.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: konq_popupmenu.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--echo "$as_me:$LINENO: checking for konq_popupmenu.h" >&5
--echo $ECHO_N "checking for konq_popupmenu.h... $ECHO_C" >&6
--if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_cv_header_konq_popupmenu_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_konq_popupmenu_h" >&5
--echo "${ECHO_T}$ac_cv_header_konq_popupmenu_h" >&6
--
--fi
--if test $ac_cv_header_konq_popupmenu_h = yes; then
-- :
--else
- have_libkonq=no
--fi
-
-
- CPPFLAGS=$kde_safe_cppflags
-@@ -31671,148 +31530,7 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-- if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for konqbookmarkmanager.h" >&5
--echo $ECHO_N "checking for konqbookmarkmanager.h... $ECHO_C" >&6
--if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_konqbookmarkmanager_h" >&5
--echo "${ECHO_T}$ac_cv_header_konqbookmarkmanager_h" >&6
--else
-- # Is the header compilable?
--echo "$as_me:$LINENO: checking konqbookmarkmanager.h usability" >&5
--echo $ECHO_N "checking konqbookmarkmanager.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <konqbookmarkmanager.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking konqbookmarkmanager.h presence" >&5
--echo $ECHO_N "checking konqbookmarkmanager.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <konqbookmarkmanager.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: konqbookmarkmanager.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--echo "$as_me:$LINENO: checking for konqbookmarkmanager.h" >&5
--echo $ECHO_N "checking for konqbookmarkmanager.h... $ECHO_C" >&6
--if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_cv_header_konqbookmarkmanager_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_konqbookmarkmanager_h" >&5
--echo "${ECHO_T}$ac_cv_header_konqbookmarkmanager_h" >&6
--
--fi
--if test $ac_cv_header_konqbookmarkmanager_h = yes; then
-- :
--else
- have_libkonq=no
--fi
-
-
- CPPFLAGS=$kde_safe_cppflags