Update of /cvsroot/fink/experimental/rangerrick/kde
In directory usw-pr-cvs1:/tmp/cvs-serv11889
Modified Files:
kdesdk3-3.0.6-1.patch
Log Message:
fixed kdesdk3 patch for jag
Index: kdesdk3-3.0.6-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/kde/kdesdk3-3.0.6-1.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdesdk3-3.0.6-1.patch 30 Jul 2002 12:11:17 -0000 1.3
+++ kdesdk3-3.0.6-1.patch 31 Jul 2002 15:20:54 -0000 1.4
@@ -8,10 +8,9 @@
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/admin/acinclude.m4.in,v
retrieving revision 1.1.1.2
-retrieving revision 1.7
-diff -u -b -u -r1.1.1.2 -r1.7
+diff -u -b -u -r1.1.1.2 acinclude.m4.in
--- admin/acinclude.m4.in 10 Jul 2002 02:47:38 -0000 1.1.1.2
-+++ admin/acinclude.m4.in 30 Jul 2002 01:14:58 -0000 1.7
++++ admin/acinclude.m4.in 31 Jul 2002 13:56:10 -0000
@@ -699,13 +699,10 @@
AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
@@ -37,9 +36,21 @@
AC_SUBST(LIBRESOLV)
AC_SUBST(X_EXTRA_LIBS)
AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-@@ -949,7 +948,7 @@
+@@ -905,7 +904,7 @@
+ kde_ldflags_safe="$LDFLAGS"
+ kde_libs_safe="$LIBS"
+
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
++LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
+ LIBS="-lXext -lX11 $LIBSOCKET"
+
+ AC_TRY_LINK([
+@@ -947,9 +946,9 @@
+ kde_save_LDFLAGS="$LDFLAGS"
+ kde_save_CFLAGS="$CFLAGS"
kde_save_LIBS="$LIBS"
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
++LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
+LIBS="-lXinerama -lXext -lX11"
@@ -112,6 +123,18 @@
fi
fi
fi
+@@ -3070,9 +3083,9 @@
+ ac_save_ldflags="$LDFLAGS"
+ ac_save_cflags="$CFLAGS"
+ if test "x$kde_use_qt_emb" != "xyes"; then
+- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS
+$all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
++ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS
+$all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+ else
+- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS
+$all_libraries -lXpm $LIBZ $LIBSOCKET"
++ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS
+$all_libraries -lXpm $LIBZ $LIBSOCKET"
+ fi
+ CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
+ test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
@@ -4117,7 +4130,7 @@
AC_DEFUN(KDE_CREATE_SUBDIRSLIST,
[
@@ -754,21 +777,23 @@
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdesdk/cervisia/updateview.cpp,v
retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -b -u -r1.1.1.2 -r1.4
+retrieving revision 1.5
+diff -u -b -u -r1.1.1.2 -r1.5
--- cervisia/updateview.cpp 10 Jul 2002 05:26:49 -0000 1.1.1.2
-+++ cervisia/updateview.cpp 17 Jul 2002 14:40:42 -0000 1.4
-@@ -34,6 +34,9 @@
++++ cervisia/updateview.cpp 31 Jul 2002 13:56:00 -0000 1.5
+@@ -34,6 +34,11 @@
#include "misc.h"
#include "cvsdir.h"
++#if defined(__APPLE__) && __GNUC__ < 3
+extern "C" {
+#include "strptime.c"
+}
++#endif
class UpdateDirItem : public ListViewItem
{
-@@ -308,7 +311,7 @@
+@@ -308,7 +313,7 @@
time_t time;
oldLocale = setlocale(LC_TIME, "C");
-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
