fake
18 years ago
3 changed files with 327 additions and 0 deletions
Split View
Diff Options
-
+11 -0package/fake/kdebluetooth/gcc41.patch
-
+102 -0package/fake/kdebluetooth/kde-352.patch
-
+214 -0package/fake/kdebluetooth/openobex.patch
@ -0,0 +1,11 @@ |
|||
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h 2005-03-20 17:46:48.000000000 +0100
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h 2006-03-23 21:14:52.000000000 +0100
|
|||
@@ -58,7 +58,7 @@ namespace KSync
|
|||
~ClientManager(); |
|||
|
|||
|
|||
- void ClientManager::setObexClient(Client*);
|
|||
+ void setObexClient(Client*);
|
|||
|
|||
/** |
|||
Returns if the worker is idel at the monment. |
|||
@ -0,0 +1,102 @@ |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop 2006-04-08 22:55:57.000000000 +0930
|
|||
@@ -3,6 +3,7 @@
|
|||
Type=MimeType |
|||
MimeType=bluetooth/computer-device-class |
|||
Icon=konsole |
|||
+X-KDE-IsAlso=inode/directory
|
|||
Comment=Computer/PDA Bluetooth Device |
|||
Comment[bg]=ÐомпÑÑÑÑно/PDA ÑÑÑÑойÑÑво Bluetooth |
|||
Comment[bs]=RaÄunar/PDA Bluetooth ureÄaj |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop 2006-04-08 22:55:31.000000000 +0930
|
|||
@@ -3,6 +3,7 @@
|
|||
Type=MimeType |
|||
MimeType=bluetooth/misc-device-class |
|||
Icon=kdebluetooth |
|||
+X-KDE-IsAlso=inode/directory
|
|||
Comment=Miscellaneous Bluetooth Device |
|||
Comment[bg]=Разни ÑÑÑÑойÑÑва Bluetooth |
|||
Comment[da]=Diverse Bluetooth-enheder |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop 2006-04-08 22:54:46.000000000 +0930
|
|||
@@ -3,6 +3,7 @@
|
|||
Type=MimeType |
|||
MimeType=bluetooth/phone-device-class |
|||
Icon=kaddressbook |
|||
+X-KDE-IsAlso=inode/directory
|
|||
Comment=Phone Bluetooth Device |
|||
Comment[bg]=ТелеÑонно ÑÑÑÑойÑÑво Bluetooth |
|||
Comment[da]=Telefon Bluetooth-enhed |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol 2006-04-08 22:56:36.000000000 +0930
|
|||
@@ -4,6 +4,7 @@
|
|||
input=none |
|||
output=filesystem |
|||
reading=true |
|||
+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
|
|||
Icon=kdebluetooth |
|||
Description=Bluetooth inquiry protocol |
|||
Description[da]=Bluetooth forespørgselsprotokol |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp 2006-04-08 22:58:56.000000000 +0930
|
|||
@@ -64,6 +64,7 @@
|
|||
if (url.hasHost() == false && path == "/") |
|||
{ |
|||
createDirEntry(entry, "Bluetooth neighbourhood"); |
|||
+ statEntry(entry);
|
|||
finished(); |
|||
} |
|||
else { |
|||
@@ -284,7 +285,8 @@
|
|||
|
|||
addAtom(entry, UDS_MIME_TYPE, mimeType); |
|||
addAtom(entry, UDS_FILE_TYPE, S_IFDIR); |
|||
- addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
|
|||
+ // No more necessary
|
|||
+ // addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
|
|||
|
|||
return true; |
|||
} |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp 2006-04-08 23:06:53.000000000 +0930
|
|||
@@ -131,12 +131,21 @@
|
|||
if (path == "/") |
|||
{ |
|||
createDirEntry(entry, "Bluetooth neighbourhood"); |
|||
+ statEntry(entry);
|
|||
finished(); |
|||
} |
|||
else |
|||
{ |
|||
- error(KIO::ERR_SLAVE_DEFINED,
|
|||
+ QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/");
|
|||
+ if (reg.search(path) >= 0) {
|
|||
+ createDirEntry(entry, "More services");
|
|||
+ statEntry(entry);
|
|||
+ finished();
|
|||
+ }
|
|||
+ else {
|
|||
+ error(KIO::ERR_SLAVE_DEFINED,
|
|||
i18n("Could not stat %1. Unknown device").arg(url.url())); |
|||
+ }
|
|||
} |
|||
} |
|||
else { |
|||
diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol
|
|||
--- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol 2005-03-21 03:16:48.000000000 +1030
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol 2006-04-08 22:59:38.000000000 +0930
|
|||
@@ -5,6 +5,7 @@
|
|||
output=filesystem |
|||
reading=true |
|||
Icon=kdebluetooth |
|||
+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
|
|||
Description=Bluetooth service discovery protocol |
|||
Description[da]=Bluetooth-protokol til opdagelse af serviceydelser |
|||
Description[et]=Bluetoothi teenuste avastamise protokoll |
|||
@ -0,0 +1,214 @@ |
|||
diff -Nru kdebluetooth-1.0_beta1.orig/configure.in kdebluetooth-1.0_beta1/configure.in
|
|||
--- kdebluetooth-1.0_beta1.orig/configure.in 2005-03-20 18:46:50.000000000 +0200
|
|||
+++ kdebluetooth-1.0_beta1/configure.in 2006-04-23 20:42:41.850121250 +0300
|
|||
@@ -200,75 +200,7 @@
|
|||
fi |
|||
|
|||
|
|||
-
|
|||
-
|
|||
-dnl Check for openobex library
|
|||
-# Modified by Simone Gotti for kde-bluetooth on 2003-10-04
|
|||
-
|
|||
-AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
|
|||
-
|
|||
-if test "$OPENOBEX_CONFIG" = "no" ; then
|
|||
- AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.)
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
- OPENOBEX_CONFIG="false"
|
|||
-fi
|
|||
-
|
|||
-OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
|
|||
-openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
|
|||
-if test -f "$openobex_inc_dir/obex.h" ; then
|
|||
- :
|
|||
-else
|
|||
- if test -f "$openobex_inc_dir/openobex/obex.h" ; then
|
|||
- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
|
|||
- else
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
- fi
|
|||
-fi
|
|||
-OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
|
|||
-
|
|||
-min_obex_version=1.0.0
|
|||
-AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
|
|||
-obex_config_version=`$OPENOBEX_CONFIG --version`
|
|||
-
|
|||
-obex_config_major_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|||
-obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|||
-obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|||
-
|
|||
-obex_req_major_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|||
-obex_req_minor_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|||
-obex_req_micro_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|||
-
|
|||
-if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then
|
|||
- if test $obex_req_major_version -lt $obex_config_major_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- if test $obex_req_major_version -eq $obex_config_major_version ; then
|
|||
- if test $obex_req_minor_version -lt $obex_config_minor_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- if test $obex_req_minor_version -eq $obex_config_minor_version ; then
|
|||
- if test $obex_req_micro_version -le $obex_config_micro_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- fi
|
|||
- fi
|
|||
-fi
|
|||
-
|
|||
-if test "$obex_config_version_ok" != "yes" ; then
|
|||
- AC_MSG_WARN(Installed openobex library too old ($obex_config_version))
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
-fi
|
|||
-
|
|||
-
|
|||
-AC_SUBST(OPENOBEX_CFLAGS)
|
|||
-AC_SUBST(OPENOBEX_LIBS)
|
|||
-AC_MSG_RESULT(yes)
|
|||
+AM_PATH_OPENOBEX(1.0.0)
|
|||
|
|||
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" |
|||
|
|||
@@ -519,14 +451,6 @@
|
|||
echo "" |
|||
fi |
|||
|
|||
-if test "$obex_config_version_ok" != "yes" ; then
|
|||
- echo ""
|
|||
- echo "The installed openobex library version is too old: ($obex_config_version)"
|
|||
- echo "Kdebluetooth won't be compiled without a newer version, so you should"
|
|||
- echo "consider updating it."
|
|||
- echo ""
|
|||
-fi
|
|||
-
|
|||
|
|||
|
|||
|
|||
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h
|
|||
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h 2005-03-20 18:46:48.000000000 +0200
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h 2006-04-23 20:58:31.657480500 +0300
|
|||
@@ -30,7 +30,7 @@
|
|||
{ |
|||
#include <sys/socket.h> |
|||
#include <bluetooth/bluetooth.h> |
|||
-#include <obex.h>
|
|||
+#include <openobex/obex.h>
|
|||
} |
|||
|
|||
extern "C" void Obex_handleEvent(obex_t *, obex_object_t *, int, int, int, int); |
|||
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h
|
|||
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h 2005-03-20 18:46:48.000000000 +0200
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h 2006-04-23 20:58:43.326209750 +0300
|
|||
@@ -20,7 +20,7 @@
|
|||
#define KOBEXHEADER_H |
|||
|
|||
extern "C" { |
|||
- #include <obex.h>
|
|||
+ #include <openobex/obex.h>
|
|||
} |
|||
|
|||
class ObexObject; |
|||
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in
|
|||
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in 2006-06-30 14:03:45.000000000 +0200
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in 2006-06-30 14:04:58.000000000 +0200
|
|||
@@ -127,74 +127,7 @@
|
|||
|
|||
|
|||
|
|||
-
|
|||
-dnl Check for openobex library
|
|||
-# Modified by Simone Gotti for kde-bluetooth on 2003-10-04
|
|||
-
|
|||
-AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
|
|||
-
|
|||
-if test "$OPENOBEX_CONFIG" = "no" ; then
|
|||
- AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.)
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
- OPENOBEX_CONFIG="false"
|
|||
-fi
|
|||
-
|
|||
-OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
|
|||
-openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
|
|||
-if test -f "$openobex_inc_dir/obex.h" ; then
|
|||
- :
|
|||
-else
|
|||
- if test -f "$openobex_inc_dir/openobex/obex.h" ; then
|
|||
- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
|
|||
- else
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
- fi
|
|||
-fi
|
|||
-OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
|
|||
-
|
|||
-min_obex_version=1.0.0
|
|||
-AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
|
|||
-obex_config_version=`$OPENOBEX_CONFIG --version`
|
|||
-
|
|||
-obex_config_major_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|||
-obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|||
-obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|||
-
|
|||
-obex_req_major_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|||
-obex_req_minor_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|||
-obex_req_micro_version=`echo $min_obex_version | \
|
|||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|||
-
|
|||
-if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then
|
|||
- if test $obex_req_major_version -lt $obex_config_major_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- if test $obex_req_major_version -eq $obex_config_major_version ; then
|
|||
- if test $obex_req_minor_version -lt $obex_config_minor_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- if test $obex_req_minor_version -eq $obex_config_minor_version ; then
|
|||
- if test $obex_req_micro_version -le $obex_config_micro_version ; then
|
|||
- obex_config_version_ok="yes"
|
|||
- fi
|
|||
- fi
|
|||
- fi
|
|||
-fi
|
|||
-
|
|||
-if test "$obex_config_version_ok" != "yes" ; then
|
|||
- AC_MSG_WARN(Installed openobex library too old ($obex_config_version))
|
|||
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
|
|||
-fi
|
|||
-
|
|||
-
|
|||
-AC_SUBST(OPENOBEX_CFLAGS)
|
|||
-AC_SUBST(OPENOBEX_LIBS)
|
|||
-AC_MSG_RESULT(yes)
|
|||
+AM_PATH_OPENOBEX(1.0.0)
|
|||
|
|||
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" |
|||
|
|||
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.bot 2006-06-30 14:12:01.000000000 +0200
|
|||
+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.bot 2006-06-30 14:12:11.000000000 +0200
|
|||
@@ -26,13 +26,6 @@
|
|||
echo "" |
|||
fi |
|||
|
|||
-if test "$obex_config_version_ok" != "yes" ; then
|
|||
- echo ""
|
|||
- echo "The installed openobex library version is too old: ($obex_config_version)"
|
|||
- echo "Kdebluetooth won't be compiled without a newer version, so you should"
|
|||
- echo "consider updating it."
|
|||
- echo ""
|
|||
-fi
|
|||
|
|||
|
|||
|
|||