Get Caya protocol add-ons to work again.

haiku-apps/caya/caya-293.recipe

@@ -1,7 +1,7 @@
 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="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
@@ -23,14 +23,10 @@ BUILD_PREREQUIRES="
 	cmd:which
 	"
 
-PATCH()
+BUILD()
 {
 	mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application
 	echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision
-}
-
-BUILD()
-{
 	./configure
 	jam
 }
@@ -45,6 +41,7 @@ INSTALL()
 	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/

haiku-apps/caya/patches/caya-293.patchset

@@ -0,0 +1,49 @@
+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
+

haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe

@@ -2,27 +2,27 @@ SUMMARY="MSN and XMPPprotocols for Caya"
 HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" 
 SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36"
 REVISION="1"
-SUPPLEMENTS="caya"
+ARCHITECTURES="x86 x86_gcc2"
-ARCHITECTURES="!x86 !x86_gcc2"
 
+#SUPPLEMENTS="caya"
 PROVIDES="
 	caya_gpl_protocols = $portVersion
 	"
-REQUIRES="
+SUPPLEMENTS="caya"
-	caya
-	"
-
 BUILD_REQUIRES="
 	caya
+	lib:libssl
+	devel:libssl
+	devel:libz
 	"
-
 BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:jam
 	cmd:gcc
 	cmd:which
 	"
 
-PATCH="caya_gpl_protocol-36.patchset"
+PATCHES="caya_gpl_protocols-36.patchset"
 
 BUILD()
 {
@@ -32,12 +32,12 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	mkdir -p $appsDir/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	cp generated/distro-haiku-*-debug/msn $appsDir/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	cp generated/distro-haiku-*-debug/gtalk $appsDir/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	cp generated/distro-haiku-*-debug/facebook $appsDir/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	cp generated/distro-haiku-*-debug/jabber $appsDir/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
+	cp generated/distro-haiku-*-debug/yahoo $appsDir/Caya/protocols
 }
 
 LICENSE="GNU GPL v2"

haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset

@@ -1,4 +1,4 @@
-From 2fcbc23eca1e8c07e03ecffcbb4ecbfce71b3757 Mon Sep 17 00:00:00 2001
+From 9be75f010b3e37caf04d79ede962676731c6ded9 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 3 Oct 2013 22:52:00 +0200
 Subject: Import gcc2 compatibility fixes.
@@ -221,3 +221,110 @@ index 34351ec..3848ff7 100644
 -- 
 1.8.3.4
 
+
+From 26bcbc64e44c24a09085fa6d4d86bf05e2213035 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Oct 2013 14:01:13 +0200
+Subject: Fixes for directory moves in PM-Haiku
+
+
+diff --git a/build/jam/CheckRules b/build/jam/CheckRules
+index ac2e326..334eee2 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 ;
+diff --git a/configure b/configure
+index 6879cee..55a6251 100755
+--- a/configure
++++ b/configure
+@@ -122,22 +122,21 @@ MIMESET = ${mimesetbin} ;
+ SETVERSION = ${setversionbin} ;
+ COPYATTR = ${copyattrbin} ;
+ 
+-COMMON_DIRECTORY = $(finddir B_COMMON_DIRECTORY) ;
+-COMMON_BIN_DIRECTORY = $(finddir B_COMMON_BIN_DIRECTORY) ;
+-COMMON_INCLUDE_DIRECTORY = $(finddir B_COMMON_DIRECTORY)/include ;
+-COMMON_LIB_DIRECTORY = $(finddir B_COMMON_LIB_DIRECTORY) ;
+-COMMON_SERVERS_DIRECTORY = $(finddir B_COMMON_SERVERS_DIRECTORY) ;
+-COMMON_ADDONS_DIRECTORY = $(finddir B_COMMON_ADDONS_DIRECTORY) ;
+-COMMON_DEVELOP_DIRECTORY = $(finddir B_COMMON_DEVELOP_DIRECTORY) ;
++COMMON_BIN_DIRECTORY = $binDir ;
++COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
++COMMON_LIB_DIRECTORY = $libDir ;
++COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
++COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
++COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
+ USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ;
+-USER_INCLUDE_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/include ;
++USER_INCLUDE_DIRECTORY = $includeDir ;
+ SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ;
+-SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ;
++SYSTEM_LIB_DIRECTORY = $libDir ;
+ BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ;
+ PREFERENCES_DIRECTORY = $(finddir B_PREFERENCES_DIRECTORY) ;
+ USER_PREFERENCES_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/be/Preferences ;
+-APPS_DIRECTORY = $(finddir B_APPS_DIRECTORY) ;
+-CAYA_DIRECTORY = $(finddir B_APPS_DIRECTORY)/Caya ;
++APPS_DIRECTORY = $appsDir ;
++CAYA_DIRECTORY = $appsDir/Caya ;
+ 
+ DEFINES += ${defines} ;
+ EOF
+-- 
+1.8.3.4
+
+
+From 31ebae4d014682f95d0e1cc0d0ec6444619d59f2 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Oct 2013 14:12:42 +0200
+Subject: Use BeOS broken prototype for string::compare
+
+ * Our C++ lib has the args in the wrong order
+
+diff --git a/libs/libgloox/parser.cpp b/libs/libgloox/parser.cpp
+index 5884624..5a406d2 100644
+--- a/libs/libgloox/parser.cpp
++++ b/libs/libgloox/parser.cpp
+@@ -141,7 +141,7 @@ namespace gloox
+   {
+     if( pos + needle.length() <= data.length() )
+     {
+-      if( !data.compare(pos, needle.length(), needle ) )
++      if( !data.compare(needle, pos, needle.length()) )
+       {
+         pos += needle.length() - 1;
+         return ForwardFound;
+-- 
+1.8.3.4
+
+
+From 53370d0138ccb68d6fb4eb7b06ae1493fab140b7 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Oct 2013 14:31:20 +0200
+Subject: Fix lib directory so configure script finds OpenSSL
+
+
+diff --git a/configure b/configure
+index 55a6251..ca177ba 100755
+--- a/configure
++++ b/configure
+@@ -124,7 +124,7 @@ COPYATTR = ${copyattrbin} ;
+ 
+ COMMON_BIN_DIRECTORY = $binDir ;
+ COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
+-COMMON_LIB_DIRECTORY = $libDir ;
++COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
+ COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
+ COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
+ COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
+-- 
+1.8.3.4
+