haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove some useless/outdated recipes and patches

Browse Source
This commit is contained in:
Chris Roberts
2013-12-03 00:41:48 -07:00
parent 8a30e59744
commit 9a0dcbfa66
14 changed files with 0 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
haiku-apps/artpaint/artpaint-339.recipe
View File

@@ -1,20 +0,0 @@
DESCRIPTION="Artpaint is a painting and image processing program"
HOMEPAGE="http://dev.osdrawer.net/projects/artpaint"
SRC_URI="svn+http://svn.osdrawer.net/artpaint/trunk"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
#CHECKSUM_MD5=""
BUILD()
{
echo "Need to figure out how to build this still"
}
INSTALL()
{
echo "Need to figure out how to install this still"
}
LICENSE="MIT"
COPYRIGHT="2003, Heikki Suhonen
2008-2009 ArtPaint Maintainers"

19
haiku-apps/bowser/bowser-1.1.1_cvs.recipe
View File

@@ -1,19 +0,0 @@
DESCRIPTION="bowser"
HOMEPAGE="http://bowser.sourceforge.net"
SRC_URI="cvs://:pserver:anonymous@bowser.cvs.sourceforge.net:/cvsroot/bowser/Bowser"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD()
{
true
}
INSTALL()
{
true
}
#COPYRIGHT=""
#LICENSE="

35
haiku-apps/caya/caya-236.recipe
View File

@@ -1,35 +0,0 @@
DESCRIPTION="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#236"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.21.6"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-236
./configure
jam
}
INSTALL()
{
cd caya-236
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
}
LICENSE="MIT"
COPYRIGHT="2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

35
haiku-apps/caya/caya-240.recipe
View File

@@ -1,35 +0,0 @@
DESCRIPTION="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#240"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.21.6"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-240
./configure
jam
}
INSTALL()
{
cd caya-240
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
}
LICENSE="MIT"
COPYRIGHT="2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

36
haiku-apps/caya/caya-264.recipe
View File

@@ -1,36 +0,0 @@
DESCRIPTION="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#264"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/expat >= 2.0.1"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-264
./configure
jam
}
INSTALL()
{
cd caya-264
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
}
LICENSE="MIT"
COPYRIGHT="2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes
2011-2012 Casalinuovo Dario"

36
haiku-apps/caya/caya-278.recipe
View File

@@ -1,36 +0,0 @@
DESCRIPTION="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#278"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/expat >= 2.0.1"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-278
./configure
jam
}
INSTALL()
{
cd caya-278
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
}
LICENSE="MIT"
COPYRIGHT="2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes
2011-2012 Casalinuovo Dario"

36
haiku-apps/caya/caya-279.recipe
View File

@@ -1,36 +0,0 @@
DESCRIPTION="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#279"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/expat >= 2.0.1"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-279
./configure
jam
}
INSTALL()
{
cd caya-279
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
}
LICENSE="MIT"
COPYRIGHT="2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes
2011-2012 Casalinuovo Dario"

60
haiku-apps/caya/caya-293.recipe
View File

@@ -1,60 +0,0 @@
SUMMARY="Caya is a multiprotocol IM client."
HOMEPAGE="http://dev.osdrawer.net/projects/caya"
SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293"
REVISION="2"
ARCHITECTURES="x86 x86_gcc2"
PROVIDES="
caya = $portVersion
lib:libexpat
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
devel:libexpat
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
cmd:ld
cmd:jam
cmd:which
"
BUILD()
{
mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application
echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision
./configure
jam
}
INSTALL()
{
mkdir -p $appsDir/Caya
mkdir -p $appsDir/Caya/smileys
mkdir -p $appsDir/Caya/protocols
mkdir -p $includeDir/caya/
cp generated/distro-haiku-*-debug/Caya $appsDir/Caya
cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols
cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys
cp application/Caya.h $includeDir/caya/
cp application/CayaProtocol.h $includeDir/caya/
cp application/CayaConstants.h $includeDir/caya/
cp application/CayaProtocolMessages.h $includeDir/caya/
}
LICENSE="MIT"
COPYRIGHT="
2009-2011 Andrea Anzani
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes
2011-2012 Casalinuovo Dario
"
DESCRIPTION="
Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber,
google talk, and facebook.
"

49
haiku-apps/caya/patches/caya-293.patchset
View File

@@ -1,49 +0,0 @@
From abd4aac88a07ea0a9967be553833a121bf98ccf9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 13:17:26 +0200
Subject: Fix gcc4 detection
diff --git a/build/jam/CheckRules b/build/jam/CheckRules
index 6fbc213..294fab7 100644
--- a/build/jam/CheckRules
+++ b/build/jam/CheckRules
@@ -14,7 +14,7 @@ rule CheckGccPlatform
# /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus
# gcc 2 platform. This is not entirely correct, but should be good enough
# for the time being.
- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ;
+ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ;
if ! $(haveLibStdC++.R4) {
IS_GCC4_PLATFORM = 1 ;
Echo Using GCC4 platform ;
--
1.8.3.4
From db90c28cb36b59a010abec5406f77c1c4135f378 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 13:19:23 +0200
Subject: Let haikuporter compute the version
* The .svn dir isn't available in the chroot, so there is no way it can
be used to detect the SVN revision.
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 292a2a5..314c4d7 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -368,9 +368,7 @@ rule CreateSVNRevisionFile file
{
# CreateSVNRevisionFile <file>
- local svnEntries = <svn>entries ;
- SEARCH on $(svnEntries) = [ FDirName $(TOP) .svn ] ;
- Depends $(file) : $(svnEntries) ;
+ # Let haikuporter do it as the .svn dir is removed on checkout
}
actions CreateSVNRevisionFile
--
1.8.3.4

31
haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe
View File

@@ -1,31 +0,0 @@
DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP"
HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols"
SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="caya"
#CHECKSUM_MD5=""
BUILD()
{
cd caya-gpl-protocols-0.HEAD
./configure
jam
}
INSTALL()
{
cd caya-gpl-protocols-0.HEAD
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
PLATFORM=`setgcc|tr / -|cut -f3 -d' '`
cp generated/distro-haiku-$PLATFORM-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-$PLATFORM-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-$PLATFORM-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-$PLATFORM-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-$PLATFORM-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
}
LICENSE="GNU GPL v2"
COPYRIGHT="2010-2011 Casalinuovo Dario
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

30
haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe
View File

@@ -1,30 +0,0 @@
DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP"
HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols"
SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#19"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="caya"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-gpl-protocols-19
./configure
jam
}
INSTALL()
{
cd caya-gpl-protocols-19
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
}
LICENSE="GNU GPL v2"
COPYRIGHT="2010-2011 Casalinuovo Dario
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

31
haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe
View File

@@ -1,31 +0,0 @@
DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP"
HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols"
SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#24"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="caya"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-gpl-protocols-24
./configure
jam
}
INSTALL()
{
cd caya-gpl-protocols-24
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
}
LICENSE="GNU GPL v2"
COPYRIGHT="2010-2011 Casalinuovo Dario
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

31
haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe
View File

@@ -1,31 +0,0 @@
DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP"
HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols"
SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#35"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="caya"
#CHECKSUM_MD5=""
MESSAGE="This port only builds with gcc4."
BUILD()
{
cd caya-gpl-protocols-35
./configure
jam
}
INSTALL()
{
cd caya-gpl-protocols-35
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
}
LICENSE="GNU GPL v2"
COPYRIGHT="2010-2011 Casalinuovo Dario
2009-2011 Pierluigi Fiorini
2010-2011 Oliver Ruiz Dorantes"

214
haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
View File

@@ -1,214 +0,0 @@
Index: libs/libmsn/msnobject.cpp
===================================================================
--- libs/libmsn/msnobject.cpp (revision 36)
+++ libs/libmsn/msnobject.cpp (working copy)
@@ -30,7 +30,7 @@
{
void MSNObject::addMSNObject(std::string filename, int Type)
{
- std::ifstream::pos_type size;
+ std::streampos size;
char * memblock;
SHA_CTX ctx;
unsigned char digest[SHA_DIGEST_LENGTH];
Index: libs/libmsn/Jamfile
===================================================================
--- libs/libmsn/Jamfile (revision 36)
+++ libs/libmsn/Jamfile (working copy)
@@ -2,6 +2,7 @@
SubDirSysHdrs [ FDirName $(TOP) ] ;
SubDirSysHdrs [ FDirName $(TOP) libs ] ;
+SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ;
SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;
Index: libs/libmsn/connection.h
===================================================================
--- libs/libmsn/connection.h (revision 36)
+++ libs/libmsn/connection.h (working copy)
@@ -29,6 +29,7 @@
#include <vector>
#include <map>
#include <stdexcept>
+#include <sstream>
#ifdef _MSC_VER
#pragma warning( disable : 4290 )
Index: libs/libmsn/util.cpp
===================================================================
--- libs/libmsn/util.cpp (revision 36)
+++ libs/libmsn/util.cpp (working copy)
@@ -146,8 +146,8 @@
it1 != s1.end() && it2 != s2.end();
++it1, ++it2)
{
- if (std::toupper(*it1) != std::toupper(*it2))
- return std::toupper(*it1) - std::toupper(*it2);
+ if (toupper(*it1) != toupper(*it2))
+ return toupper(*it1) - toupper(*it2);
}
size_t size1 = s1.size(), size2 = s2.size();
return (int) (size1 - size2);
@@ -358,11 +358,11 @@
int FileSize(const char* sFileName)
{
std::ifstream f;
- f.open(sFileName, std::ios_base::binary | std::ios_base::in);
+ f.open(sFileName, std::ios::binary | std::ios::in);
if (!f.good() || f.eof() || !f.is_open()) { return 0; }
- f.seekg(0, std::ios_base::beg);
- std::ifstream::pos_type begin_pos = f.tellg();
- f.seekg(0, std::ios_base::end);
+ f.seekg(0, std::ios::beg);
+ std::streampos begin_pos = f.tellg();
+ f.seekg(0, std::ios::end);
return static_cast<int>(f.tellg() - begin_pos);
}
Index: libs/libmsn/message.cpp
===================================================================
--- libs/libmsn/message.cpp (revision 36)
+++ libs/libmsn/message.cpp (working copy)
@@ -124,7 +124,7 @@
{
std::string color = this->getFormatInfo()["CO"];
assert(color.size() <= 6 && color.size() >= 0);
- color.insert(0U, 6 - color.size(), '0');
+ color.insert((size_t)0, (size_t)(6 - color.size()), '0');
int r = 0, g = 0, b = 0;
b = strtol(color.substr(0, 2).c_str(), NULL, 16);
@@ -167,7 +167,7 @@
void Message::setColor(std::string color)
{
- color.insert(0U, 6 - color.size(), '0');
+ color.insert((size_t)0, (size_t)(6 - color.size()), '0');
int r = 0, g = 0, b = 0;
r = strtol(color.substr(0, 2).c_str(), NULL, 16);
Index: libs/libyahoo2/yahoo_httplib.c
===================================================================
--- libs/libyahoo2/yahoo_httplib.c (revision 36)
+++ libs/libyahoo2/yahoo_httplib.c (working copy)
@@ -29,19 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
-#if STDC_HEADERS
# include <string.h>
-#else
-# if !HAVE_STRCHR
-# define strchr index
-# define strrchr rindex
-# endif
-char *strchr(), *strrchr();
-# if !HAVE_MEMCPY
-# define memcpy(d, s, n) bcopy ((s), (d), (n))
-# define memmove(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
#include <errno.h>
#if HAVE_UNISTD_H
@@ -374,7 +362,6 @@
void yahoo_http_head(int id, const char *url, const char *cookies, int len,
char *payload, yahoo_get_fd_callback callback, void *data)
{
- printf("yahoo_http_read\n");
char host[255];
int port = 80;
char path[255];
Index: libs/libgloox/parser.cpp
===================================================================
--- libs/libgloox/parser.cpp (revision 36)
+++ libs/libgloox/parser.cpp (working copy)
@@ -141,7 +141,7 @@
{
if( pos + needle.length() <= data.length() )
{
- if( !data.compare( pos, needle.length(), needle ) )
+ if( !data.compare(pos, needle.length(), needle ) )
{
pos += needle.length() - 1;
return ForwardFound;
Index: libs/libgloox/siprofileft.cpp
===================================================================
--- libs/libgloox/siprofileft.cpp (revision 36)
+++ libs/libgloox/siprofileft.cpp (working copy)
@@ -84,11 +84,11 @@
DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" );
StringMultiMap sm;
if( streamTypes & FTTypeS5B )
- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) );
+ sm.insert( std::make_pair<const char*, std::string>( "s5b", XMLNS_BYTESTREAMS ) );
if( streamTypes & FTTypeIBB )
- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) );
+ sm.insert( std::make_pair<const char*, std::string>( "ibb", XMLNS_IBB ) );
if( streamTypes & FTTypeOOB )
- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) );
+ sm.insert( std::make_pair<const char*, std::string>( "oob", XMLNS_IQ_OOB ) );
dff->setOptions( sm );
feature->addChild( df.tag() );
Index: libs/libgloox/connectionbosh.cpp
===================================================================
--- libs/libgloox/connectionbosh.cpp (revision 36)
+++ libs/libgloox/connectionbosh.cpp (working copy)
@@ -303,7 +303,7 @@
bool ci_equal( char ch1, char ch2 )
{
- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 );
+ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 );
}
std::string::size_type ci_find( const std::string& str1, const std::string& str2 )
Index: libs/libgloox/gloox.h
===================================================================
--- libs/libgloox/gloox.h (revision 36)
+++ libs/libgloox/gloox.h (working copy)
@@ -1214,7 +1214,7 @@
/**
* A multimap of strings.
*/
- typedef std::multimap<std::string, std::string> StringMultiMap;
+ typedef std::multimap<const std::string, const std::string> StringMultiMap;
class StanzaExtension;
/**
Index: protocols/msn/MSN.cpp
===================================================================
--- protocols/msn/MSN.cpp (revision 36)
+++ protocols/msn/MSN.cpp (working copy)
@@ -52,7 +52,7 @@
const uint32 kAvatarCheckMessage = 'AVMs';
struct pollfd* kPollSockets = NULL;
-struct ssl {
+struct Ssl {
bool isSSL;
bool isConnected;
SSL *ssl;
@@ -718,7 +718,7 @@
return;
}
- kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl));
+ kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl));
if (kSocketsSsl == NULL) {
Error("Memory Error!!\n", NULL);
return;
Index: protocols/xmpp/Jamfile
===================================================================
--- protocols/xmpp/Jamfile (revision 36)
+++ protocols/xmpp/Jamfile (working copy)
@@ -2,6 +2,7 @@
SubDirSysHdrs [ FDirName $(TOP) ] ;
SubDirSysHdrs [ FDirName $(TOP) libs ] ;
+SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ;
SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;
SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ;