Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/kde
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5817/10.4-transitional/unstable/main/finkinfo/kde
Modified Files:
kdewebdev3.info kdewebdev3.patch
Log Message:
includehint fix
Index: kdewebdev3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/kde/kdewebdev3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdewebdev3.patch 27 Apr 2005 03:25:51 -0000 1.1
+++ kdewebdev3.patch 15 Sep 2005 16:02:47 -0000 1.2
@@ -1,157 +1,12 @@
-diff -uNr kdewebdev-3.3.1/admin/ltmain.sh kdewebdev-3.3.1-new/admin/ltmain.sh
---- kdewebdev-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004
-+++ kdewebdev-3.3.1-new/admin/ltmain.sh Mon Oct 18 16:11:57 2004
-@@ -4397,6 +4397,7 @@
- # We should set the shlibpath_var
- rpath=
- for dir in $temp_rpath; do
-+ if test "$dir" != "@FINKPREFIX@/lib"; then
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*)
- # Absolute path.
-@@ -4407,6 +4408,7 @@
- rpath="$rpath\$thisdir/$dir:"
- ;;
- esac
-+ fi
- done
- temp_rpath="$rpath"
- fi
-diff -uNr kdewebdev-3.3.1/configure kdewebdev-3.3.1-new/configure
---- kdewebdev-3.3.1/configure Sun Oct 3 10:38:31 2004
-+++ kdewebdev-3.3.1-new/configure Mon Oct 18 16:11:57 2004
-@@ -7979,6 +7979,19 @@
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
-+ netbsd* | freebsd* | openbsd* | darwin* )
-+ # This has been around since 386BSD, at least. Likely further.
-+ if test -x /sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+ elif test -x /usr/sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+ else
-+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+ fi
-+ # And add a safety zone
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ ;;
-+
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
-@@ -9622,10 +9635,21 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
-- allow_undefined_flag='-undefined suppress'
-+ allow_undefined_flag='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} &&
allow_undefined_flag='-flat_namespace -undefined suppress'
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
-@@ -11475,7 +11499,18 @@
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} &&
allow_undefined_flag='-flat_namespace -undefined suppress'
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
- esac
- output_verbose_link_cmd='echo'
-@@ -12526,7 +12561,18 @@
- allow_undefined_flag_CXX='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} &&
allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
-@@ -16349,7 +16395,18 @@
- allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} &&
allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
-@@ -18631,7 +18688,18 @@
- allow_undefined_flag_GCJ='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} &&
allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined
-Wl,suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
-@@ -36886,8 +36954,10 @@
- if test "x`echo $KDE_VERSION | grep 3.1.9`" = "x"; then
- if test "x`echo $KDE_VERSION | grep 3.2`" = "x"; then
- if test "x`echo $KDE_VERSION | grep 3.3`" = "x"; then
-+ if test "x`echo $KDE_VERSION | grep 3.3`" = "x"; then
- echo "The KDE version is too old, WYSIWYG mode disabled!"
- build_wysiwyg="no"
-+ fi
- fi
- fi
- fi
+diff -uNr kdewebdev-3.4.2/quanta/parts/kafka/htmldocumentpropertiesui.ui
kdewebdev-3.4.2-new/quanta/parts/kafka/htmldocumentpropertiesui.ui
+--- kdewebdev-3.4.2/quanta/parts/kafka/htmldocumentpropertiesui.ui
2005-05-23 08:10:49.000000000 -0400
++++ kdewebdev-3.4.2-new/quanta/parts/kafka/htmldocumentpropertiesui.ui
2005-09-15 10:58:55.000000000 -0400
+@@ -453,8 +453,4 @@
+ <slot access="protected" specifier="pure virtual">linkChanged( const
QString& )</slot>
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+- <includehint>dualeditabletree.h</includehint>
+- <includehint>dualeditabletree.h</includehint>
+-</includehints>
+ </UI>
Index: kdewebdev3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/kde/kdewebdev3.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kdewebdev3.info 26 Aug 2005 13:27:22 -0000 1.7
+++ kdewebdev3.info 15 Sep 2005 16:02:47 -0000 1.8
@@ -25,6 +25,7 @@
Source2ExtractDir: kdewebdev-%v
PatchScript: <<
+ sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
# perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden
-fvisibility-inlines-hidden,,g;' admin/*
perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
<<
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
