'cygwin-patches for kde 3.4.1'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    cygwin-patches for kde 3.4.1
From:       Ralf Habacker <ralf.habacker () freenet ! de>
Date:       2005-06-16 19:30:15
Message-ID: 200506162130.26927.ralf.habacker () freenet ! de
[Download RAW message or body]

Hi, 

here are some patches for recent kdebase sources required for the cygwin port 
for reviewing. If there are any problem please let me. 

Regards 

-- 
Ralf Habacker

["kdebase-3.4.1-first.diff" (text/x-diff)]

Index: kcontrol/nics/nic.cpp
===================================================================
--- kcontrol/nics/nic.cpp	(revision 412449)
+++ kcontrol/nics/nic.cpp	(working copy)
@@ -174,8 +174,10 @@
 
          if ((flags & IFF_BROADCAST) == IFF_BROADCAST)
             tmp->type=i18n("Broadcast");
+#ifndef __CYGWIN__
          else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)
             tmp->type=i18n("Point to Point");
+#endif
 #ifndef _AIX
          else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)
             tmp->type=i18n("Multicast");
Index: kicker/menuext/find/Makefile.am
===================================================================
--- kicker/menuext/find/Makefile.am	(revision 412449)
+++ kicker/menuext/find/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_find_la_SOURCES = findmenu.cpp
 kickermenu_find_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_find_la_LIBADD = $(LIB_KDEUI)
+kickermenu_find_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
 
 kickermenu_find_la_METASOURCES = AUTO
 
Index: kicker/menuext/kdeprint/Makefile.am
===================================================================
--- kicker/menuext/kdeprint/Makefile.am	(revision 412449)
+++ kicker/menuext/kdeprint/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_kdeprint_la_SOURCES = print_mnu.cpp
 kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint
+kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint $(LIB_KDECORE)
 
 kickermenu_kdeprint_la_METASOURCES = AUTO
 
Index: kicker/menuext/system/Makefile.am
===================================================================
--- kicker/menuext/system/Makefile.am	(revision 412449)
+++ kicker/menuext/system/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_systemmenu_la_SOURCES = systemmenu.cpp
 kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_systemmenu_la_LIBADD = $(LIB_KDEUI) 
+kickermenu_systemmenu_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
 
 kickermenu_systemmenu_la_METASOURCES = AUTO
 
Index: kicker/menuext/konq-profiles/Makefile.am
===================================================================
--- kicker/menuext/konq-profiles/Makefile.am	(revision 412449)
+++ kicker/menuext/konq-profiles/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_konqueror_la_SOURCES = konqy_menu.cpp
 kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_konqueror_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kickermenu_konqueror_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE)
 
 kickermenu_konqueror_la_METASOURCES = AUTO
 
Index: kicker/menuext/recentdocs/Makefile.am
===================================================================
--- kicker/menuext/recentdocs/Makefile.am	(revision 412449)
+++ kicker/menuext/recentdocs/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp
 kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI)
+kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
 
 kickermenu_recentdocs_la_METASOURCES = AUTO
 
Index: kicker/menuext/konsole/Makefile.am
===================================================================
--- kicker/menuext/konsole/Makefile.am	(revision 412449)
+++ kicker/menuext/konsole/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 
 kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp \
konsolebookmarkmenu.cpp  kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module \
                -avoid-version
-kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE)
 
 kickermenu_konsole_la_METASOURCES = AUTO
 
Index: kicker/core/Makefile.am
===================================================================
--- kicker/core/Makefile.am	(revision 412449)
+++ kicker/core/Makefile.am	(working copy)
@@ -13,7 +13,7 @@
 	extensionSettings.kcfgc
 
 libkicker_core_la_LDFLAGS = $(all_libraries)
-libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI)
+libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) \
$(LIB_KUTILS)  libkicker_core_la_METASOURCES = AUTO
 libkicker_core_la_COMPILE_FIRST = ../share/kickerSettings.h
 
Index: kicker/extensions/kasbar/kasloaditem.cpp
===================================================================
--- kicker/extensions/kasbar/kasloaditem.cpp	(revision 412449)
+++ kicker/extensions/kasbar/kasloaditem.cpp	(working copy)
@@ -30,6 +30,18 @@
 #include "kasloaditem.h"
 #include "kasloaditem.moc"
 
+
+#ifdef __CYGWIN__                                              
+// some hints for a possible implementation could be found on  
+// http://www.wilsonmar.com/1perfmon.htm#TaskManager           
+// http://www.codeproject.com/system/cpuusage.asp              
+int getloadavg(double *load, int a )                           
+{                                                              
+	return 0;                                                     
+}                                                              
+#endif                                                         
+                                                               
+
 KasLoadItem::KasLoadItem( KasBar *parent )
     : KasItem( parent )
 {
Index: kicker/applets/launcher/Makefile.am
===================================================================
--- kicker/applets/launcher/Makefile.am	(revision 412449)
+++ kicker/applets/launcher/Makefile.am	(working copy)
@@ -16,7 +16,7 @@
 launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) \
-avoid-version  launcher_panelapplet_la_LIBADD = ../../core/libkicker_core.la  \
                ../../buttons/libkicker_buttons.la \
 				../../ui/libkicker_ui.la ../../share/libkickermain.la $(LIB_KIO) \
-				$(LIB_KSYCOCA) $(LIB_KDEUI)
+				$(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KUTILS)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
Index: kioslave/media/libmediacommon/Makefile.am
===================================================================
--- kioslave/media/libmediacommon/Makefile.am	(revision 412449)
+++ kioslave/media/libmediacommon/Makefile.am	(working copy)
@@ -3,3 +3,4 @@
 
 noinst_LTLIBRARIES = libmediacommon.la
 libmediacommon_la_SOURCES = medium.cpp
+libmediacommon_la_LIBADD = $(LIB_KDECORE)
Index: kioslave/media/mounthelper/Makefile.am
===================================================================
--- kioslave/media/mounthelper/Makefile.am	(revision 412449)
+++ kioslave/media/mounthelper/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 
 kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp
 
-kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(LIB_KDECORE) $(LIB_KDEUI) \
$(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries) +kio_media_mounthelper_LDFLAGS = \
$(KDE_RPATH) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(LIB_KDECORE) $(all_libraries)  \
kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la  
 METASOURCES = AUTO
Index: kioslave/media/kdedmodule/Makefile.am
===================================================================
--- kioslave/media/kdedmodule/Makefile.am	(revision 412449)
+++ kioslave/media/kdedmodule/Makefile.am	(working copy)
@@ -24,7 +24,7 @@
 
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp \
backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp \
mediadirnotify.skel  kded_mediamanager_la_LDFLAGS = $(all_libraries) -module \
                -avoid-version
-kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la \
$(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) +kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) \
../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) \
$(LIB_KDECORE) $(LIB_KDED) -ldcop  
 
 servicesdir = $(kde_servicesdir)/kded
Index: kioslave/system/kdedmodule/Makefile.am
===================================================================
--- kioslave/system/kdedmodule/Makefile.am	(revision 412449)
+++ kioslave/system/kdedmodule/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 
 kded_systemdirnotify_la_SOURCES = systemdirnotify.cpp systemdirnotify.skel \
systemdirnotifymodule.cpp systemdirnotifymodule.skel  kded_systemdirnotify_la_LDFLAGS \
                = $(all_libraries) -module -avoid-version
-kded_systemdirnotify_la_LIBADD = $(LIB_KSYCOCA)
+kded_systemdirnotify_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDECORE) $(LIB_KDED) -ldcop
 
 
 servicesdir = $(kde_servicesdir)/kded
Index: kioslave/nfs/kio_nfs.cpp
===================================================================
--- kioslave/nfs/kio_nfs.cpp	(revision 412449)
+++ kioslave/nfs/kio_nfs.cpp	(working copy)
@@ -33,6 +33,10 @@
 #define PORTMAP
 #endif
 #include <rpc/rpc.h> // for rpc calls
+#ifdef __CYGWIN__
+#include <rpc/clnt.h>
+extern "C" CLIENT* clnttcp_create( struct sockaddr_in *raddr, u_long prog, u_long \
version, register int *sockp, u_int sendsz, u_int recvsz); +#endif 
 
 #include <errno.h>
 #include <grp.h>
Index: kioslave/fish/fish.cpp
===================================================================
--- kioslave/fish/fish.cpp	(revision 412449)
+++ kioslave/fish/fish.cpp	(working copy)
@@ -430,7 +430,7 @@
 #endif
 
         int pgrp = getpid();
-#if defined( _AIX) || defined( __hpux)
+#if defined( _AIX) || defined( __hpux) || defined(__CYGWIN__)
         tcsetpgrp(0, pgrp);
 #else
         ioctl(0, TIOCSPGRP, (char *)&pgrp);
Index: kioslave/remote/kdedmodule/Makefile.am
===================================================================
--- kioslave/remote/kdedmodule/Makefile.am	(revision 412449)
+++ kioslave/remote/kdedmodule/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 
 kded_remotedirnotify_la_SOURCES = remotedirnotify.cpp remotedirnotify.skel \
remotedirnotifymodule.cpp remotedirnotifymodule.skel  kded_remotedirnotify_la_LDFLAGS \
                = $(all_libraries) -module -avoid-version
-kded_remotedirnotify_la_LIBADD = $(LIB_KSYCOCA)
+kded_remotedirnotify_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDECORE) $(LIB_KDED) -ldcop
 
 
 servicesdir = $(kde_servicesdir)/kded
Index: kioslave/configure.in.in
===================================================================
--- kioslave/configure.in.in	(revision 412449)
+++ kioslave/configure.in.in	(working copy)
@@ -13,3 +13,14 @@
   AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
 fi
 AC_SUBST(SASL2_LIBS)
+
+AC_DEFUN([NFS_CHECK],
+[
+case $host in
+	*cygwin*) have_valid_nfs_header=no;;
+	*) have_valid_nfs_header=yes;;
+esac
+AM_CONDITIONAL(include_kioslave_nfs, test "$have_valid_nfs_header" = yes)
+])
+
+
Index: kioslave/Makefile.am
===================================================================
--- kioslave/Makefile.am	(revision 412449)
+++ kioslave/Makefile.am	(working copy)
@@ -6,6 +6,11 @@
 SMB_SUBDIR=smb
 endif
 
-SUBDIRS = about cgi floppy filter fish info mac man nfs nntp pop3 smtp \
+if include_kioslave_nfs
+NFS_SUBDIR=nfs
+endif
+
+
+SUBDIRS = about cgi floppy filter fish info mac man $(NFS_SUBDIR) nntp pop3 smtp \
   sftp tar finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) settings trash media \
   remote system
Index: konqueror/preloader/Makefile.am
===================================================================
--- konqueror/preloader/Makefile.am	(revision 412449)
+++ konqueror/preloader/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 INCLUDES= -I.. $(all_includes)
 kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
 kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA)
+kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) \
$(LIB_KDED) $(LIB_KDECORE) -ldcop  
 METASOURCES = AUTO
 
Index: konqueror/Makefile.am
===================================================================
--- konqueror/Makefile.am	(revision 412449)
+++ konqueror/Makefile.am	(working copy)
@@ -49,7 +49,7 @@
 	konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
 
 konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) \
$(LIB_KUTILS) +konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la \
$(LIBMALLOC) $(LIB_KUTILS) $(LIB_KDECORE)  
 # Hmm, this experiment of a static konq failed, don't trust it...
 # (but feel free to fix it :)
Index: ksplashml/themeengine/Makefile.am
===================================================================
--- ksplashml/themeengine/Makefile.am	(revision 412449)
+++ ksplashml/themeengine/Makefile.am	(working copy)
@@ -6,7 +6,7 @@
 
 libksplashthemes_la_SOURCES = themeengine.cpp objkstheme.cpp
 libksplashthemes_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libksplashthemes_la_LIBADD = $(LIB_KDEUI) $(LIB_XCURSOR)
+libksplashthemes_la_LIBADD = $(LIB_KDEUI) $(LIB_XCURSOR) $(LIB_KDECORE)
 METASOURCES = AUTO
 
 # install this header for theme developers.
Index: libkonq/favicons/Makefile.am
===================================================================
--- libkonq/favicons/Makefile.am	(revision 409835)
+++ libkonq/favicons/Makefile.am	(working copy)
@@ -3,7 +3,7 @@
 INCLUDES = $(all_includes)
 kded_favicons_la_SOURCES = favicons.cpp favicons.skel
 kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_favicons_la_LIBADD = $(LIB_KSYCOCA)
+kded_favicons_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDECORE) $(LIB_KDED) -ldcop
 
 METASOURCES = AUTO
 
Index: khotkeys/app/Makefile.am
===================================================================
--- khotkeys/app/Makefile.am	(revision 412449)
+++ khotkeys/app/Makefile.am	(working copy)
@@ -8,7 +8,7 @@
 khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 
 kded_khotkeys_la_SOURCES = kded.cpp kded.skel
-kded_khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KDECORE)
+kded_khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KDECORE) $(LIB_KDED)
 kded_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = app.h kded.h
Index: konsole/konsole/Makefile.am
===================================================================
--- konsole/konsole/Makefile.am	(revision 412449)
+++ konsole/konsole/Makefile.am	(working copy)
@@ -33,7 +33,7 @@
 
 # kwrited kded module
 kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel
-kded_kwrited_la_LIBADD  = $(LIB_KDECORE) 
+kded_kwrited_la_LIBADD  = $(LIB_KDECORE) $(LIB_KDED) -ldcop
 kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 # konsole kdeinit module
Index: kdm/backend/sessreg.c
===================================================================
--- kdm/backend/sessreg.c	(revision 412449)
+++ kdm/backend/sessreg.c	(working copy)
@@ -39,7 +39,7 @@
 #include "dm.h"
 #include "dm_error.h"
 
-#if defined(__svr4__) || defined(__Lynx__) || defined(__QNX__) || defined(__APPLE__) \
|| defined(_SEQUENT_) /*|| defined(USE_PAM)*/ +#if defined(__svr4__) || \
defined(__Lynx__) || defined(__QNX__) || defined(__APPLE__) || defined(_SEQUENT_) || \
defined(__CYGWIN__) /*|| defined(USE_PAM)*/  # define NO_LASTLOG
 #endif
 



[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic