From 1b0dcf7c775e66c2b4349d38b73ddcc7a495f0cb Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 25 Jun 2015 13:22:03 -0700 Subject: [PATCH 1/6] Update -- facebook now logs in --- haiku-apps/caya/caya-2013.10.12.recipe | 71 ------------------ haiku-apps/caya/caya-2016.06.a3.recipe | 75 +++++++++++++++++++ .../caya/patches/caya-2013.10.12.patchset | 72 ------------------ 3 files changed, 75 insertions(+), 143 deletions(-) delete mode 100644 haiku-apps/caya/caya-2013.10.12.recipe create mode 100644 haiku-apps/caya/caya-2016.06.a3.recipe delete mode 100644 haiku-apps/caya/patches/caya-2013.10.12.patchset diff --git a/haiku-apps/caya/caya-2013.10.12.recipe b/haiku-apps/caya/caya-2013.10.12.recipe deleted file mode 100644 index 8dfa67c0d..000000000 --- a/haiku-apps/caya/caya-2013.10.12.recipe +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY="Caya is a multiprotocol IM client" -DESCRIPTION=" -Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ -google talk, and facebook. -" -HOMEPAGE="http://www.versut.com/caya" -REVISION="2" -ARCHITECTURES="x86 x86_gcc2" - -SRC_URI="git+https://github.com/Barrett17/Caya.git#0746cacb94f78b656226d8679baa3a4d968a03e6" -LICENSE="MIT" -COPYRIGHT=" - 2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario - " - -PATCHES="caya-$portVersion.patchset" - -PROVIDES=" - caya = $portVersion - app:Caya - " -REQUIRES=" - haiku - lib:libz - lib:libexpat - lib:libssl - " -BUILD_REQUIRES=" - devel:libexpat - devel:libssl - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:gcc - cmd:ld - cmd:jam - cmd:which - cmd:tr - " - -BUILD() -{ - mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-release/application - echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-release/application/svn_revision - ./configure - jam $jobArgs -sDEBUG=0 -} - -INSTALL() -{ - mkdir -p $appsDir/Caya - mkdir -p $appsDir/Caya/smileys - mkdir -p $appsDir/Caya/protocols - mkdir -p $includeDir/caya - - cd generated/distro-haiku-*-release - cp Caya $appsDir/Caya - cp aim msn gtalk facebook jabber yahoo $appsDir/Caya/protocols - cd ../.. - 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 - - addAppDeskbarSymlink $appsDir/Caya/Caya -} diff --git a/haiku-apps/caya/caya-2016.06.a3.recipe b/haiku-apps/caya/caya-2016.06.a3.recipe new file mode 100644 index 000000000..7b3138dc3 --- /dev/null +++ b/haiku-apps/caya/caya-2016.06.a3.recipe @@ -0,0 +1,75 @@ +SUMMARY="Caya is a multiprotocol IM client" +DESCRIPTION=" +Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ +google talk, and facebook. +" +HOMEPAGE="http://www.versut.com/caya/" +SRC_URI="https://github.com/Barrett17/Caya/archive/pre-alpha3.tar.gz" +CHECKSUM_SHA256="d06120c42eefd8547037a7bff072be0da918e57f76284b01869dc195ddde937a" + +REVISION="1" +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +# no secondary architectures due to Deskbar's replicant handeling. +PROVIDES=" + caya = $portVersion + app:Caya + " +REQUIRES=" + haiku + lib:libz + lib:libexpat + lib:libssl + " +BUILD_REQUIRES=" + haiku_devel + devel:libexpat + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:jam + cmd:ld + cmd:tr + cmd:which + " +SOURCE_DIR=Caya-pre-alpha3 + +BUILD() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-release/application + echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-release/application/svn_revision + ./configure + jam $jobArgs -sDEBUG=0 +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-release/Caya $appsDir/Caya + cp generated/distro-haiku-*-release/aim $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/yahoo $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/ + + addAppDeskbarSymlink $appsDir/Caya/Caya +} diff --git a/haiku-apps/caya/patches/caya-2013.10.12.patchset b/haiku-apps/caya/patches/caya-2013.10.12.patchset deleted file mode 100644 index 9343096c0..000000000 --- a/haiku-apps/caya/patches/caya-2013.10.12.patchset +++ /dev/null @@ -1,72 +0,0 @@ -From 241d9736631a758e2f6ef71e5076ce3145301a51 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 30 Aug 2014 15:05:07 +0200 -Subject: Build fixes. - - -diff --git a/application/preferences/PreferencesAccounts.cpp b/application/preferences/PreferencesAccounts.cpp -index bf175dd..e4cea6e 100644 ---- a/application/preferences/PreferencesAccounts.cpp -+++ b/application/preferences/PreferencesAccounts.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/application/views/RosterListView.cpp b/application/views/RosterListView.cpp -index 6a78237..f098dd8 100644 ---- a/application/views/RosterListView.cpp -+++ b/application/views/RosterListView.cpp -@@ -14,6 +14,7 @@ - #include - - #include -+#include - #include - - #include "ContactInfoWindow.h" -diff --git a/configure b/configure -index dd8aa72..6dc5c27 100755 ---- a/configure -+++ b/configure -@@ -130,8 +130,8 @@ 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_HEADERS_DIRECTORY) ; --USER_LIB_DIRECTORY = $(finddir B_USER_DEVELOP_DIRECTORY)/lib ; -+USER_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; -+USER_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; - - SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; - SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; -diff --git a/libs/libmsn/xmlParser.cpp b/libs/libmsn/xmlParser.cpp -index 3f4a582..17ada69 100644 ---- a/libs/libmsn/xmlParser.cpp -+++ b/libs/libmsn/xmlParser.cpp -@@ -88,6 +88,7 @@ - #include - #include - #include -+#include - #include - - XMLCSTR XMLNode::getVersion() { return _T("v2.29"); } -diff --git a/protocols/aim/AIM.cpp b/protocols/aim/AIM.cpp -index 763a168..0184e70 100644 ---- a/protocols/aim/AIM.cpp -+++ b/protocols/aim/AIM.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - #include - --- -1.8.3.4 - From 462ab9ccfc5e618d5ec391873dbeb6c70299c901 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 26 Jun 2015 12:30:15 -0700 Subject: [PATCH 2/6] update copyright, changed name to caya-pre.alpha.recipe --- .../caya/{caya-2016.06.a3.recipe => caya-pre.alpha3.recipe} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename haiku-apps/caya/{caya-2016.06.a3.recipe => caya-pre.alpha3.recipe} (95%) diff --git a/haiku-apps/caya/caya-2016.06.a3.recipe b/haiku-apps/caya/caya-pre.alpha3.recipe similarity index 95% rename from haiku-apps/caya/caya-2016.06.a3.recipe rename to haiku-apps/caya/caya-pre.alpha3.recipe index 7b3138dc3..42eb53aed 100644 --- a/haiku-apps/caya/caya-2016.06.a3.recipe +++ b/haiku-apps/caya/caya-pre.alpha3.recipe @@ -11,9 +11,7 @@ REVISION="1" LICENSE="MIT" COPYRIGHT=" 2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario + 2009-2011 Pier luigi Fiorini " ARCHITECTURES="x86_gcc2 x86 ?x86_64" From 8bb59376cfc512879f4f8716a3d510473978a211 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 26 Jun 2015 12:57:14 -0700 Subject: [PATCH 3/6] Change license to gpl v2, update copyright again. --- haiku-apps/caya/caya-pre.alpha3.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/haiku-apps/caya/caya-pre.alpha3.recipe b/haiku-apps/caya/caya-pre.alpha3.recipe index 42eb53aed..007d93a6a 100644 --- a/haiku-apps/caya/caya-pre.alpha3.recipe +++ b/haiku-apps/caya/caya-pre.alpha3.recipe @@ -8,9 +8,10 @@ SRC_URI="https://github.com/Barrett17/Caya/archive/pre-alpha3.tar.gz" CHECKSUM_SHA256="d06120c42eefd8547037a7bff072be0da918e57f76284b01869dc195ddde937a" REVISION="1" -LICENSE="MIT" +LICENSE="GNU GPL v2" COPYRIGHT=" 2009-2011 Andrea Anzani + 2010-2015 Dario Casalinuovo 2009-2011 Pier luigi Fiorini " From 102ad27f868d5a661724c8858d95fea1e0e9f6f5 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 26 Jun 2015 13:43:45 -0700 Subject: [PATCH 4/6] rename recipe file again --- .../caya/{caya-pre.alpha3.recipe => caya-0.0.0.pre_alpha3.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename haiku-apps/caya/{caya-pre.alpha3.recipe => caya-0.0.0.pre_alpha3.recipe} (100%) diff --git a/haiku-apps/caya/caya-pre.alpha3.recipe b/haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe similarity index 100% rename from haiku-apps/caya/caya-pre.alpha3.recipe rename to haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe From 9e9f9e254de7042548401f9f199a2d52f89f2ec5 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 26 Jun 2015 14:53:46 -0700 Subject: [PATCH 5/6] update to a new release, change the name again. --- haiku-apps/caya/caya-0.0.3.recipe | 74 +++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 haiku-apps/caya/caya-0.0.3.recipe diff --git a/haiku-apps/caya/caya-0.0.3.recipe b/haiku-apps/caya/caya-0.0.3.recipe new file mode 100644 index 000000000..78df21413 --- /dev/null +++ b/haiku-apps/caya/caya-0.0.3.recipe @@ -0,0 +1,74 @@ +SUMMARY="Caya is a multiprotocol IM client" +DESCRIPTION=" +Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ +google talk, and facebook. +" +HOMEPAGE="http://www.versut.com/caya/" +SRC_URI="https://github.com/Barrett17/Caya/archive/caya-0.0.3.tar.gz" +CHECKSUM_SHA256="cb4580557671cdd7cc74d8cfd1301e407d266f71145dea8aa96d5c42daec397a" + +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2010-2015 Dario Casalinuovo + 2009-2011 Pier luigi Fiorini + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +# no secondary architectures due to Deskbar's replicant handeling. +PROVIDES=" + caya = $portVersion + app:Caya + " +REQUIRES=" + haiku + lib:libz + lib:libexpat + lib:libssl + " +BUILD_REQUIRES=" + haiku_devel + devel:libexpat + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:jam + cmd:ld + cmd:tr + cmd:which + " +SOURCE_DIR=Caya-caya-0.0.3 + +BUILD() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-release/application + echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-release/application/svn_revision + ./configure + jam $jobArgs -sDEBUG=0 +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-release/Caya $appsDir/Caya + cp generated/distro-haiku-*-release/aim $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-release/yahoo $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/ + + addAppDeskbarSymlink $appsDir/Caya/Caya +} From 59db1403f022fd6d0aa2c16ec8c245af11bc1f43 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 26 Jun 2015 14:54:39 -0700 Subject: [PATCH 6/6] remove un-needed file --- haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe | 74 -------------------- 1 file changed, 74 deletions(-) delete mode 100644 haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe diff --git a/haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe b/haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe deleted file mode 100644 index 007d93a6a..000000000 --- a/haiku-apps/caya/caya-0.0.0.pre_alpha3.recipe +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY="Caya is a multiprotocol IM client" -DESCRIPTION=" -Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ -google talk, and facebook. -" -HOMEPAGE="http://www.versut.com/caya/" -SRC_URI="https://github.com/Barrett17/Caya/archive/pre-alpha3.tar.gz" -CHECKSUM_SHA256="d06120c42eefd8547037a7bff072be0da918e57f76284b01869dc195ddde937a" - -REVISION="1" -LICENSE="GNU GPL v2" -COPYRIGHT=" - 2009-2011 Andrea Anzani - 2010-2015 Dario Casalinuovo - 2009-2011 Pier luigi Fiorini - " - -ARCHITECTURES="x86_gcc2 x86 ?x86_64" -# no secondary architectures due to Deskbar's replicant handeling. -PROVIDES=" - caya = $portVersion - app:Caya - " -REQUIRES=" - haiku - lib:libz - lib:libexpat - lib:libssl - " -BUILD_REQUIRES=" - haiku_devel - devel:libexpat - devel:libssl - devel:libz - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:jam - cmd:ld - cmd:tr - cmd:which - " -SOURCE_DIR=Caya-pre-alpha3 - -BUILD() -{ - mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-release/application - echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-release/application/svn_revision - ./configure - jam $jobArgs -sDEBUG=0 -} - -INSTALL() -{ - mkdir -p $appsDir/Caya - mkdir -p $appsDir/Caya/smileys - mkdir -p $appsDir/Caya/protocols - mkdir -p $includeDir/caya/ - - cp generated/distro-haiku-*-release/Caya $appsDir/Caya - cp generated/distro-haiku-*-release/aim $appsDir/Caya/protocols - cp generated/distro-haiku-*-release/msn $appsDir/Caya/protocols - cp generated/distro-haiku-*-release/gtalk $appsDir/Caya/protocols - cp generated/distro-haiku-*-release/facebook $appsDir/Caya/protocols - cp generated/distro-haiku-*-release/jabber $appsDir/Caya/protocols - cp generated/distro-haiku-*-release/yahoo $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/ - - addAppDeskbarSymlink $appsDir/Caya/Caya -}