mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Psi-Plus: add recipe and patch for version 0.16.475
This commit is contained in:
Sergei Reznikov
154
net-im/psi_plus/additional-files/psi-plus.rdef
Normal file
154
net-im/psi_plus/additional-files/psi-plus.rdef
Normal file
@@ -0,0 +1,154 @@
|
||||
|
||||
resource app_signature "application/x-vnd.Psi-plus";
|
||||
|
||||
resource app_flags B_MULTIPLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = 0,
|
||||
middle = 16,
|
||||
minor = 475,
|
||||
|
||||
variety = B_APPV_DEVELOPMENT,
|
||||
internal = 0,
|
||||
|
||||
short_info = "Psi-plus",
|
||||
long_info = "Psi-plus IM XMPP/Jabber client"
|
||||
};
|
||||
|
||||
resource vector_icon array {
|
||||
$"6E6369661D034B91FE03D4E5F9010404063D01193BC9E803BBCCFD012E58D2EA"
|
||||
$"01312F3960012E63DBEF03FF0000039CBFFE01214DC3DD0396BAFE03C9DBFF03"
|
||||
$"FE94940100010254010001054C036697F5036DAEFE011F49B9E5036AACFE0154"
|
||||
$"5669AF0380BDFF03FE9F9F03A8D1FE0390C7FE010102044F03B5E4FE03EAF1F6"
|
||||
$"040068270408FCFFC61051205120C863B406CA67B7DBCA40B590CA62B814CA54"
|
||||
$"B8C0CA59B887C9EAB8C0C915B8C0C97FB8C0C8EFB6D5C5DCB46EC7B7B50DC5DC"
|
||||
$"B46EC582B445C582B445C5B2B3D8C61020C5DFB36CC610200204C5BEB3F5C650"
|
||||
$"B344C7BBB494C94DB880C952B657C97DB878CA0BB85BC9DBB865C9D0B6C2C7B0"
|
||||
$"B441C91DB524C71EB3ED020EC754BEC5C6E9C030C790BE3EC804BD29C7CEBDB5"
|
||||
$"C7ADC00FC4F9C556C705C322C373C705BF00C80EC13DC7EABEE1C89EBEA7C9C0"
|
||||
$"BEC1C930BEA7C9EFBEA9CA7BBEA9CA4DBD58CA89BAB2CA84BC04CA8BBAB2CA84"
|
||||
$"BABDCA62BABDCA62BACDCA5334CA2DBAEACA39BC10CA26BE44CA27BD2BCA29BE"
|
||||
$"59C981BE88C836BE6BC8D9BE95C81ABEBFC7C6BEB1C7E242C78DC3C4C5E1C256"
|
||||
$"C707C4D3C533C615C306C580C41AC6CFC1B7020CBB2BBECEBA5FBEB5BB49BE95"
|
||||
$"BBA2BDE6BB84BE20BB9FBE4DBB99BF7FBB9CBF19BB99BF7FBB98BF8FBB98BF8F"
|
||||
$"BAB7BFC8BAE7C184BACEC0D2BAD9C244BAB8C3C6BAC5C306BAB8C3C6BA64C31F"
|
||||
$"BA64C31FBA6AC26DBA78C10ABA70C1BCBA5FC122BA15C16BBA2EC153B9A2C160"
|
||||
$"B8BEC146B92FC154B886C0E9B814C02DB84DC08BB849BF99B8C7BE75B88CBF09"
|
||||
$"B993BE9A0204C5BEB3F5C7BBB494C650B344C7B0B441C71EB3EDC91DB524CA0B"
|
||||
$"B85BC9D0B6C2C9DBB865C94DB880C97DB878C952B6570049C550B597C550B597"
|
||||
$"C619B5DCC7A1B681C6DDB62CC7BBB690C80BB6C0C7F0B6B0C827B7AAC801B981"
|
||||
$"C823B896C804BA05C827BB0DC812BA89C821BBC2C804BD29C81BBC76C7CEBDB5"
|
||||
$"C754BEC5C790BE3EC5D2C042C305C36FC453C1C1C2A8C404C1AC49C219C38DC2"
|
||||
$"68C266C42CC0CDC34CC19AC4CBC045C5DDBF0FC559BFAEC604BEE7C674BE6BC6"
|
||||
$"50BE95C64DBDE4C5FFBCD5C625BD5DC59FBD4AC4DDBE30C53EBDBCC4BABDBDC4"
|
||||
$"80BCD4C49ABD4AC4A1BCC7C504BC9FC4E3BCACC5A0BC75C69FBBB2C623BC15C6"
|
||||
$"94BC92C69ABE56C693BD75C7C9BD69C7C633C7EFBBF7C71FBAA9C60FBB60C67E"
|
||||
$"BAD6C615BAA6C612B931C616B9ECC5BCB992C512BA55C566B9F1C4BBBA86C411"
|
||||
$"BAF6C466BABBC3F8BB15C3AEBB79C3C7BB59C396BB9CC34BBC02C365BBDFC301"
|
||||
$"BDD2C315C17CC368BFB0C315C17CC2C3C1DEC2C3C1DEC2A9C005C292BC50C2CE"
|
||||
$"3CC0E9BE4FC19FC36AC17AC108C17FC398C123C421C141C3F2C150C43EC1D8C4"
|
||||
$"97C1ABC479C0DFC528BF95C6FFC02BC60CC10DC6EFC3C4C5E1C25BC639C256C7"
|
||||
$"07BEBFC7C642C78DBE1FC77FBCDCC6F4BD7EC739BD2CC662BDB5C530BD75C5CB"
|
||||
$"BDD8C5D2BE1FC718BDFEC674BE7CC6A1BF354FBED8C62E41C4C5C129C248C15B"
|
||||
$"C3CDC0C1C2ABBFF5C374C059C30EC0094BBF6EC51EBFDAC4B0BF5DC341BF4FBF"
|
||||
$"8ABFA1C162BF30BFD7BEF3C06FBF11C022BECF42BE67C0EBBE8BC0CCBE2CC10A"
|
||||
$"BD79C167BDB5C147BD74C16FBD63C186BD68C17DBBB1C301BC14C71EBD4EC580"
|
||||
$"BC0DC5C5BBE6C317BC10C46EBB8EC3A1BADEC4B3BB37C429BAD5C640BADEC959"
|
||||
$"BADDC7CDBACEC971BA9FC9B8BAAEC9A0BA9EC97FBA99C8CFBA9BC909BA97C899"
|
||||
$"33C7F8BA94C82EBA71C7D1BA0DC75FBA2DC785BA45C62DBAB8C3C6BA7DC4F8BA"
|
||||
$"D0C37BBB14C299BAFDC2E5BBB4C1C8BD3DC06DBC6FC110BD68C04BBDEDBFEABD"
|
||||
$"C1C00BBE5BBF8EBF29BEC8BEC2BF2BBF51BEDDBFC9BF1ABFA1BF06BFEC41C03B"
|
||||
$"C238C010C12EC03BC238C0BFC207C0BFC207C130C1C5C139C0C7C159C15BC135"
|
||||
$"C01CC12EBEC1C136BF6FC11EBE4EC0F4BD68C10ABDDBC15EBCE4C22FBBD9C1C8"
|
||||
$"BC5FC2E234C4B7B9A7C384B9DFC4C0B975C4DEB8DEC4D4B90FC515B866C57FB7"
|
||||
$"75C54BB7EEC5ABB77FC633B79BC605B792C630B782C624B73FC628B755C624B7"
|
||||
$"3FC612B6D1C612B6D1C5BEB674C550B597C57EB60CC550B5970203C67DB892C7"
|
||||
$"1CB86BC687B918C69FBA24C693B99FC7BCB996C78DB753C800B86EC75DB7E202"
|
||||
$"09C5DCB46EC5BEB4A0C7B7B50DC915B8C0C8EFB6D5C97FB8C0CA54B8C0C9EAB8"
|
||||
$"C0CA59B887CA67B7DBCA62B814CAA3B871CAEFB9ACCAD7B90CC9F4B9A9C801B9"
|
||||
$"81C8FBB993C823B896C80BB6C0C827B7AAC7F0B6B0C7A1B681C7BBB690C6FCB5"
|
||||
$"E7C563B534C647B55DC581B504020AC03AB514BF76B8EBC17FB4B7C44BB518C2"
|
||||
$"F7B4EEC3D1B67EC2FBB958C35EB7E9C2BEBA2FC22FBBD9C27CBB05C1F5BAF3C2"
|
||||
$"5AB926C216BA05C2AFB7E7C378B571C30EB6AAC293B570C0CAB56AC1AEB56DC0"
|
||||
$"75B702BF9ABA26C012B898BF0CBC11BDEDBFEABE76BDFDBDC1C00BBD3DC06DBD"
|
||||
$"68C04BBE56BCAC0204C0CAB56AC075B702C1AEB56DC378B571C293B570C30EB6"
|
||||
$"AAC25AB926C2AFB7E7C179B98FBF9ABA26C0A9BA85C012B8980206C4F7B667C5"
|
||||
$"5DB6AEC519B600C563B534C53CB59AC647B55DC7A1B681C6FCB5E7C6DDB62CC5"
|
||||
$"50B597C619B5DCC57EB60CC612B6D1C5BEB674C612B6D1C624B73FC624B73FC5"
|
||||
$"C1B6F50209C46CB5BAC444B6D4C475B626C48BB6FBC480B68FC48BB6FBC499B7"
|
||||
$"74C499B774C49AB7EFC4DEB8DEC4A0B86FC4D4B90FC4B7B9A7C4C0B975C384B9"
|
||||
$"DFC22FBBD9C2E234C27CBB05C2FBB958C2BEBA2FC2FBB958C326B992C326B992"
|
||||
$"C380B965C42DB908C3D7B938C427B7EE0203C499B774C49AB7EFC4D2B775C57F"
|
||||
$"B775C545B775C54BB7EEC4DEB8DEC515B866C4A0B86F0203C67DB892C687B918"
|
||||
$"C71CB86BC78DB753C75DB7E2C800B86EC69FBA24C7BCB996C693B99F0207C512"
|
||||
$"BA55C50ABB19C566B9F1C612B931C5BCB992C616B9ECC60FBB60C615BAA6C67E"
|
||||
$"BAD6C7C633C71FBAA9C7EFBBF7C69ABE56C7C9BD69C693BD75C69FBBB2C694BC"
|
||||
$"92C623BC15C504BC9FC5A0BC75C50ABBDC0209C34BBC02C301BDD2C365BBDFC3"
|
||||
$"AEBB79C396BB9CC3AEBB79C43CBB59C43CBB59C455BD29C42CC0CDC447BEFCC3"
|
||||
$"4CC19AC1AC49C268C266C1AC49C19FC36AC19FC36AC17AC108C292BC50C0E9BE"
|
||||
$"4FC2CE3CC2C3C1DEC2A9C005C2C3C1DEC315C17CC315C17CC368BFB00205C5FF"
|
||||
$"BCD5C59FBD4AC625BD5DC674BE6BC64DBDE4C650BE95C5DDBF0FC604BEE7C5AB"
|
||||
$"BF30C513BF91C546BF71C507BF39C4DDBE30C4ECBE88C53EBDBC0208BEF3C06F"
|
||||
$"BECF42BF11C022BF4FBF8ABF30BFD7BFA1C162BF6EC51EBF5DC341BFDAC4B0BF"
|
||||
$"F5C374C0094BC059C30EC129C248C0C1C2ABC15BC3CDBF354F41C4C5BEFDC5DE"
|
||||
$"BE50C64DBE8AC628BE62C482BE67C0EBBE5BC2B6BE8BC0CC020CBC14C71EBC0D"
|
||||
$"C5C5BD4EC580BD63C186BBB1C301BD9AC2BCBDB5C530BDA1C3F5BD75C5CBBCDC"
|
||||
$"C6F4BD2CC662BCDCC6F4BCC2C724BCC2C724BC9BC750BC26C7D1BC4DC7A5BC0E"
|
||||
$"C8BB34CA2DBB85C97ABAEACA39BABDCA62BACDCA53BAB7CA37BA9FC9B8BAA7C9"
|
||||
$"E4BAAEC9A0BADEC959BACEC971BADDC7CDBADEC4B3BAD5C640BB37C429BBE6C3"
|
||||
$"17BB8EC3A1BC10C46E0208BF9ABA26BF0CBC11C0A9BA85C25AB926C179B98FC2"
|
||||
$"16BA05C22FBBD9C1F5BAF3C1C8BC5FC0F4BD68C15EBCE4C10ABDDBC12EBEC1C1"
|
||||
$"1EBE4EC0B8BEE1BFC9BF1AC040BEFEBFA1BF06BF29BEC8BF51BEDDBEC2BF2BBD"
|
||||
$"EDBFEABE5BBF8EBE76BDFD021227BABDB61DBBB8B792B9D1BBC3BA56B9F8B919"
|
||||
$"BD21BBBFBB99BF7FBC54BDF5BB9CBF19BBA2BDE6BB9FBE4DBBF8BCBDBAC1BA7A"
|
||||
$"BC4BBAE8B9F0BA28B82FBA79B905BA47B79FBA97B682BAE9B710BAC1B6B5BB9F"
|
||||
$"B722BD0EB6EBBC57B7ACBCDCB8C1BC85B833BCA6B993BCE9B8C7BE75B8F1BDDA"
|
||||
$"B88CBF09B814C02DB849BF99B7EFC0ADB7B7C1B3B7CDC12EB714C3DBBA0DC75F"
|
||||
$"B7EEC667BA2DC78533C7F8BA71C7D1B9DEC798B87EC6C7B928C737B6874CB830"
|
||||
$"BED9B739C15CB85BBE48B8ADBD27B885BDB6B807BD61B6B1BDB5B75DBD93B671"
|
||||
$"BCB50208B682BAE9B6B5BB9FB710BAC1B82FBA79B79FBA972FBAE0BAC1BA7ABA"
|
||||
$"0BBB3FBC4BBAE8BBA2BDE6BBF8BCBDBB84BE20BB2BBECEBB49BE95BA5FBEB5B8"
|
||||
$"C7BE75B993BE9AB8F1BDDAB8C1BC85B993BCE9B833BCA6B722BD0EB7ACBCDCB6"
|
||||
$"EBBC570202B82FBA792FBAE0B905BA47BAC1BA7AB9F0BA28BA0BBB3F020AC411"
|
||||
$"BAF6C3F8BB15C466BABBC512BA55C4BBBA86C50ABB19C504BC9FC50ABBDCC4E3"
|
||||
$"BCACC480BCD4C4A1BCC7C49ABD4AC4DDBE30C4BABDBDC4ECBE88C513BF91C507"
|
||||
$"BF39C546BF71C5DDBF0FC5ABBF30C559BFAEC42CC0CDC4CBC045C447BEFCC43C"
|
||||
$"BB59C455BD29C43CBB59C3AEBB79C3AEBB79C3C7BB590206C827BB0DC821BBC2"
|
||||
$"C923BFBBC33DC7F6C79BC579C1D6C8E0BEA7C9C0C002C8BCBEC1C930BF00C80E"
|
||||
$"BEE1C89EC13DC7EAC4F9C556C373C705C705C322C804BD29C7ADC00FC81BBC76"
|
||||
$"0204B6B1BDB5B6BCBDE4B75DBD93B8ADBD27B807BD61B885BDB6B830BED9B85B"
|
||||
$"BE48B7C1BEB4B6DDBE70B74EBE92B6D3BE410205BFC9BF1ABFEC41C040BEFEC1"
|
||||
$"2EBEC1C0B8BEE1C136BF6FC139C0C7C135C01CC0BAC10BC0BFC207C090C175C0"
|
||||
$"BFC207C03BC238C03BC238C010C12E0208C305C36FC2A8C404C453C1C1C754BE"
|
||||
$"C5C5D2C042C6E9C030C615C306C6CFC1B7C527C359C407C4EAC491C423C34AC4"
|
||||
$"E6C1D8C497C288C4E8C1ABC479C123C421C150C43EC141C3F2C19FC36AC17FC3"
|
||||
$"98C19FC36AC1AC49C1AC49C219C38D0202BAE7C184BB91C11BBACEC0D2BB98BF"
|
||||
$"8FBAB7BFC8BB91C0400206B814C02DB7EFC0ADB84DC08BB8BEC146B886C0E9B9"
|
||||
$"2FC154BA15C16BB9A2C160B9E3C20FB98EC35FB9B9C2B9B90FC371B813C394B8"
|
||||
$"92C383B7F4C2F3B7B7C1B3B7D4C253B7CDC12E0202C0BFC207C130C1C5C090C1"
|
||||
$"75C139C0C7C0BAC10BC159C15B0206BA15C16BB9E3C20FBA2EC153BA78C10ABA"
|
||||
$"5FC122BA70C1BCBA64C31FBA6AC26DBA36C431B987C643BA224EB8D7C57FB813"
|
||||
$"C394B82DC4A5B892C383B98EC35FB90FC371B9B9C2B90207BD79C167BD74C16F"
|
||||
$"BDB5C147BE67C0EBBE2CC10ABE5BC2B6BE50C64DBE62C482BE8AC628BF354FBE"
|
||||
$"FDC5DEBED8C62EBE1FC718BE7CC6A1BDFEC674BDB5C530BDD8C5D2BDA1C3F5BD"
|
||||
$"63C186BD9AC2BCBD68C17D0206B7B7C1B3B714C3DBB7D4C253B813C394B7F4C2"
|
||||
$"F3B82DC4A5B987C643B8D7C57FBA224EBA64C31FBA36C431BA64C31FBAB8C3C6"
|
||||
$"BAB8C3C6BA7DC4F8BA0DC75FBA45C62DB7EEC6670205C407C4EAC34AC4E6C491"
|
||||
$"C423C615C306C527C359C580C41AC3C4C5E1C4D3C533C25BC639BF95C6FFC10D"
|
||||
$"C6EFC02BC60CC1D8C497C0DFC528C288C4E80203B87EC6C7B8E0C7BDB928C737"
|
||||
$"33C7F8B9DEC798BA94C82EBA99C8CFBA97C899B9AEC85E0206BCDCC6F4BCDCC6"
|
||||
$"F4BD7EC739BEBFC7C6BE1FC77FBEB1C7E2BE88C836BE95C81ABE46C8B2BDC9C9"
|
||||
$"AFBE07C9313AC9ACBC83C9A4BCF0C9A7BC93C8CFBCC2C724BCA5C7FABCC2C724"
|
||||
$"0207BC26C7D1BC0EC8BBBC4DC7A5BCC2C724BC9BC750BCA5C7FABC83C9A4BC93"
|
||||
$"C8CFBCF0C9A7BDC9C9AF3AC9ACBE07C931BE88C836BE46C8B2BE6BC8D9BE44CA"
|
||||
$"27BE59C981BD2BCA2934CA2DBC10CA26BB85C97A0203BAB2CA84BB6CCC11BC04"
|
||||
$"CA8BBEA9CA7BBD58CA89BEAACAB4BEAFCB5CBEAECB23BD5BCB68250A00020001"
|
||||
$"000A000102000A000103000A010104000A01020506000A020107000A03010800"
|
||||
$"0A040109000A05010A000A06010B000A07010C000A08010D000A08010E000A08"
|
||||
$"010F000A080110000A080111000A080112000A090113000A0A0114000A0B0115"
|
||||
$"000A0C0116000A0D0117000A0E0118000A0F0119000A10011A000A11011B000A"
|
||||
$"12011C000A13011D000A14011E000A15011F000A160120000A170121000A1801"
|
||||
$"22000A190123000A1A0124000A1B0125000A1C012600"
|
||||
};
|
||||
|
||||
resource file_types message;
|
||||
594
net-im/psi_plus/patches/psi_plus_x86-0.16.475.patchset
Normal file
594
net-im/psi_plus/patches/psi_plus_x86-0.16.475.patchset
Normal file
@@ -0,0 +1,594 @@
|
||||
From 2ea514fb57b8ecaee7add7fb63a8542b17a403f4 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Mon, 12 Oct 2015 10:52:30 +0300
|
||||
Subject: Haiku fixes
|
||||
|
||||
|
||||
diff --git a/iris/src/jdns/src/jdns/jdns_p.h b/iris/src/jdns/src/jdns/jdns_p.h
|
||||
index 0fe1aa5..70927ff 100644
|
||||
--- a/iris/src/jdns/src/jdns/jdns_p.h
|
||||
+++ b/iris/src/jdns/src/jdns/jdns_p.h
|
||||
@@ -46,6 +46,8 @@
|
||||
# define JDNS_OS_SOLARIS
|
||||
#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
|
||||
# define JDNS_OS_MAC
|
||||
+#elif defined(__HAIKU__)
|
||||
+# define JDNS_OS_HAIKU
|
||||
#endif
|
||||
|
||||
#ifdef JDNS_OS_WIN
|
||||
diff --git a/iris/src/jdns/src/jdns/jdns_sys.c b/iris/src/jdns/src/jdns/jdns_sys.c
|
||||
index 67d8e70..3b5fbb4 100644
|
||||
--- a/iris/src/jdns/src/jdns/jdns_sys.c
|
||||
+++ b/iris/src/jdns/src/jdns/jdns_sys.c
|
||||
@@ -726,8 +726,8 @@ static int my_res_init()
|
||||
// a define, so the #ifdef doesn't work. as a workaround, we'll explicitly
|
||||
// specify the platforms that have __res_state_ext
|
||||
//#ifdef __res_state_ext
|
||||
-#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \
|
||||
- defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS)
|
||||
+#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || defined(JDNS_OS_NETBSD) \
|
||||
+ || defined (JDNS_OS_SOLARIS) || defined (JDNS_OS_HAIKU)
|
||||
# define USE_EXTEXT
|
||||
#endif
|
||||
#if defined(JDNS_OS_OPENBSD)
|
||||
diff --git a/iris/src/jdns/src/qjdns/qjdns_sock.cpp b/iris/src/jdns/src/qjdns/qjdns_sock.cpp
|
||||
index 54620bc..044be4e 100644
|
||||
--- a/iris/src/jdns/src/qjdns/qjdns_sock.cpp
|
||||
+++ b/iris/src/jdns/src/qjdns/qjdns_sock.cpp
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
#ifndef QT_NO_IPV6
|
||||
# define HAVE_IPV6
|
||||
+#ifndef Q_OS_HAIKU
|
||||
# ifndef s6_addr
|
||||
# define IPPROTO_IPV6 41
|
||||
struct in6_addr
|
||||
@@ -59,6 +60,7 @@
|
||||
};
|
||||
# define s6_addr _S6_un._S6_u8
|
||||
# endif
|
||||
+#endif
|
||||
# ifndef IPV6_JOIN_GROUP
|
||||
# define IPV6_JOIN_GROUP 12
|
||||
# define IPV6_MULTICAST_HOPS 10
|
||||
diff --git a/patches/haiku/4000-fix-psiplus-build-in-haiku.patch b/patches/haiku/4000-fix-psiplus-build-in-haiku.patch
|
||||
index de84b28..e02cc3b 100644
|
||||
--- a/patches/haiku/4000-fix-psiplus-build-in-haiku.patch
|
||||
+++ b/patches/haiku/4000-fix-psiplus-build-in-haiku.patch
|
||||
@@ -1,5 +1,5 @@
|
||||
---- a/iris/src/jdns/jdns_p.h
|
||||
-+++ b/iris/src/jdns/jdns_p.h
|
||||
+--- a/iris/src/jdns/src/jdns/jdns_p.h
|
||||
++++ b/iris/src/jdns/src/jdns/jdns_p.h
|
||||
@@ -44,6 +44,8 @@
|
||||
# define JDNS_OS_SOLARIS
|
||||
#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
|
||||
@@ -9,8 +9,8 @@
|
||||
#endif
|
||||
|
||||
#ifdef JDNS_OS_WIN
|
||||
---- a/iris/src/jdns/jdns_sys.c
|
||||
-+++ b/iris/src/jdns/jdns_sys.c
|
||||
+--- a/iris/src/jdns/src/jdns/jdns_sys.c
|
||||
++++ b/iris/src/jdns/src/jdns/jdns_sys.c
|
||||
@@ -726,8 +726,8 @@ static int my_res_init()
|
||||
// a define, so the #ifdef doesn't work. as a workaround, we'll explicitly
|
||||
// specify the platforms that have __res_state_ext
|
||||
@@ -22,8 +22,8 @@
|
||||
# define USE_EXTEXT
|
||||
#endif
|
||||
|
||||
---- a/iris/src/jdns/qjdns_sock.cpp
|
||||
-+++ b/iris/src/jdns/qjdns_sock.cpp
|
||||
+--- a/iris/src/jdns/src/qjdns/qjdns_sock.cpp
|
||||
++++ b/iris/src/jdns/src/qjdns/qjdns_sock.cpp
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
#ifndef QT_NO_IPV6
|
||||
diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
|
||||
index a10ed8c..7962797 100644
|
||||
--- a/src/applicationinfo.cpp
|
||||
+++ b/src/applicationinfo.cpp
|
||||
@@ -160,7 +160,7 @@ QString ApplicationInfo::resourcesDir()
|
||||
{
|
||||
#if defined(HAVE_X11)
|
||||
return PSI_DATADIR;
|
||||
-#elif defined(Q_OS_WIN)
|
||||
+#elif defined(Q_OS_WIN) || defined(Q_WS_HAIKU)
|
||||
return qApp->applicationDirPath();
|
||||
#elif defined(Q_OS_MAC)
|
||||
// FIXME: Clean this up (remko)
|
||||
@@ -297,6 +297,10 @@ QString ApplicationInfo::homeDir(ApplicationInfo::HomedirType type)
|
||||
QMessageBox::information(0, QObject::tr("Conversion Error"), QObject::tr("Configuration data for a previous version of Psi was found, but it was not possible to convert it to work with the current version. Ensure you have appropriate permission and that another copy of Psi is not running, and try again."));
|
||||
exit(0);
|
||||
}
|
||||
+#elif defined Q_OS_HAIKU
|
||||
+ QDir configDir(QDir::homePath() + "/.config/" + sname());
|
||||
+ QDir cacheDir(QDir::homePath() + "/.cache/" + sname());
|
||||
+ QDir dataDir(configDir);
|
||||
#endif
|
||||
configDir_ = configDir.path();
|
||||
cacheDir_ = cacheDir.path();
|
||||
diff --git a/src/libpsi/tools/globalshortcut/globalshortcut.pri b/src/libpsi/tools/globalshortcut/globalshortcut.pri
|
||||
index 0c788ac..3bb2d77 100644
|
||||
--- a/src/libpsi/tools/globalshortcut/globalshortcut.pri
|
||||
+++ b/src/libpsi/tools/globalshortcut/globalshortcut.pri
|
||||
@@ -2,7 +2,7 @@ HEADERS += $$PWD/globalshortcutmanager.h $$PWD/globalshortcuttrigger.h
|
||||
SOURCES += $$PWD/globalshortcutmanager.cpp
|
||||
DEPENDPATH += $$PWD
|
||||
|
||||
-unix:!mac {
|
||||
+unix:!mac:!haiku {
|
||||
SOURCES += $$PWD/globalshortcutmanager_x11.cpp
|
||||
}
|
||||
win32: {
|
||||
@@ -16,3 +16,6 @@ mac: {
|
||||
HEADERS += \
|
||||
$$PWD/NDKeyboardLayout.h
|
||||
}
|
||||
+haiku: {
|
||||
+ SOURCES += $$PWD/globalshortcutmanager_haiku.cpp
|
||||
+}
|
||||
diff --git a/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp b/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..7713b4f
|
||||
--- /dev/null
|
||||
+++ b/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp
|
||||
@@ -0,0 +1,333 @@
|
||||
+/*
|
||||
+ * globalshortcutmanager_haiku.cpp - Haiku implementation of global shortcuts by Vitaly (Diger)
|
||||
+ * Based on X11 implementation of global shortcuts
|
||||
+ * Copyright (C) 2003-2006 Justin Karneges, Maciej Niedzielski
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License
|
||||
+ * as published by the Free Software Foundation; either version 2
|
||||
+ * of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include "globalshortcutmanager.h"
|
||||
+#include "globalshortcuttrigger.h"
|
||||
+
|
||||
+#include <InterfaceDefs.h>
|
||||
+
|
||||
+#include <QWidget>
|
||||
+#include <QCoreApplication>
|
||||
+
|
||||
+
|
||||
+class HKeyTrigger
|
||||
+{
|
||||
+public:
|
||||
+ virtual ~HKeyTrigger() {}
|
||||
+ virtual void activate() = 0;
|
||||
+ virtual bool isAccepted(int qkey) const = 0;
|
||||
+};
|
||||
+
|
||||
+class HKeyTriggerManager : public QObject
|
||||
+{
|
||||
+public:
|
||||
+ static HKeyTriggerManager* instance()
|
||||
+ {
|
||||
+ if(!instance_)
|
||||
+ instance_ = new HKeyTriggerManager();
|
||||
+ return instance_;
|
||||
+ }
|
||||
+
|
||||
+ void addTrigger(HKeyTrigger* trigger)
|
||||
+ {
|
||||
+ triggers_ << trigger;
|
||||
+ }
|
||||
+
|
||||
+ void removeTrigger(HKeyTrigger* trigger)
|
||||
+ {
|
||||
+ triggers_.removeAll(trigger);
|
||||
+ }
|
||||
+
|
||||
+ struct Qt_HK_Keygroup
|
||||
+ {
|
||||
+ char num;
|
||||
+ int sym[3];
|
||||
+ };
|
||||
+
|
||||
+protected:
|
||||
+ // reimplemented
|
||||
+ bool eventFilter(QObject* o, QEvent* e)
|
||||
+ {
|
||||
+ if(e->type() == QEvent::KeyPress) {
|
||||
+ QKeyEvent* k = static_cast<QKeyEvent*>(e);
|
||||
+ int qkey = k->key();
|
||||
+ if (k->modifiers() & Qt::ShiftModifier)
|
||||
+ qkey |= Qt::SHIFT;
|
||||
+ if (k->modifiers() & Qt::ControlModifier)
|
||||
+ qkey |= Qt::CTRL;
|
||||
+ if (k->modifiers() & Qt::AltModifier)
|
||||
+ qkey |= Qt::ALT;
|
||||
+ if (k->modifiers() & Qt::MetaModifier)
|
||||
+ qkey |= Qt::META;
|
||||
+
|
||||
+ foreach(HKeyTrigger* trigger, triggers_) {
|
||||
+ if (trigger->isAccepted(qkey)) {
|
||||
+ trigger->activate();
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return QObject::eventFilter(o, e);
|
||||
+ }
|
||||
+
|
||||
+private:
|
||||
+ HKeyTriggerManager()
|
||||
+ : QObject(QCoreApplication::instance())
|
||||
+ {
|
||||
+ QCoreApplication::instance()->installEventFilter(this);
|
||||
+ }
|
||||
+
|
||||
+ static HKeyTriggerManager* instance_;
|
||||
+ QList<HKeyTrigger*> triggers_;
|
||||
+
|
||||
+private:
|
||||
+ struct Qt_HK_Keymap
|
||||
+ {
|
||||
+ int key;
|
||||
+ Qt_HK_Keygroup hk;
|
||||
+ };
|
||||
+
|
||||
+ static Qt_HK_Keymap qt_hk_table[];
|
||||
+ static long alt_mask;
|
||||
+ static long meta_mask;
|
||||
+ static long super_mask;
|
||||
+ static long hyper_mask;
|
||||
+ static long numlock_mask;
|
||||
+ static bool haveMods;
|
||||
+
|
||||
+ // adapted from qapplication_x11.cpp
|
||||
+ static void ensureModifiers()
|
||||
+ {
|
||||
+ if (haveMods)
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+public:
|
||||
+ static bool convertKeySequence(const QKeySequence& ks, unsigned int* _mod, Qt_HK_Keygroup* _kg)
|
||||
+ {
|
||||
+ int code = ks;
|
||||
+ ensureModifiers();
|
||||
+
|
||||
+ unsigned int mod = 0;
|
||||
+ /*
|
||||
+ if (code & Qt::META)
|
||||
+ mod |= meta_mask;
|
||||
+ if (code & Qt::SHIFT)
|
||||
+ mod |= ShiftMask;
|
||||
+ if (code & Qt::CTRL)
|
||||
+ mod |= ControlMask;
|
||||
+ if (code & Qt::ALT)
|
||||
+ mod |= alt_mask;
|
||||
+ */
|
||||
+ Qt_HK_Keygroup kg;
|
||||
+ kg.num = 0;
|
||||
+ kg.sym[0] = 0;
|
||||
+ code &= ~Qt::KeyboardModifierMask;
|
||||
+
|
||||
+ bool found = false;
|
||||
+ for (int n = 0; qt_hk_table[n].key != Qt::Key_unknown; ++n) {
|
||||
+ if (qt_hk_table[n].key == code) {
|
||||
+ kg = qt_hk_table[n].hk;
|
||||
+ found = true;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!found) {
|
||||
+ // try latin1
|
||||
+ if (code >= 0x20 && code <= 0x7f) {
|
||||
+ kg.num = 1;
|
||||
+ kg.sym[0] = code;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!kg.num)
|
||||
+ return false;
|
||||
+
|
||||
+ if (_mod)
|
||||
+ *_mod = mod;
|
||||
+ if (_kg)
|
||||
+ *_kg = kg;
|
||||
+
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ static QList<long> ignModifiersList()
|
||||
+ {
|
||||
+ QList<long> ret;
|
||||
+ /*
|
||||
+ if (numlock_mask) {
|
||||
+ ret << 0 << LockMask << numlock_mask << (LockMask | numlock_mask);
|
||||
+ }
|
||||
+ else {
|
||||
+ ret << 0 << LockMask;
|
||||
+ }
|
||||
+ */
|
||||
+ return ret;
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+
|
||||
+HKeyTriggerManager* HKeyTriggerManager::instance_ = NULL;
|
||||
+class GlobalShortcutManager::KeyTrigger::Impl : public HKeyTrigger
|
||||
+{
|
||||
+private:
|
||||
+ KeyTrigger* trigger_;
|
||||
+ int qkey_;
|
||||
+
|
||||
+ struct GrabbedKey {
|
||||
+ int code;
|
||||
+ uint mod;
|
||||
+ };
|
||||
+ QList<GrabbedKey> grabbedKeys_;
|
||||
+
|
||||
+ static bool failed;
|
||||
+
|
||||
+public:
|
||||
+ /**
|
||||
+ * Constructor registers the hotkey.
|
||||
+ */
|
||||
+ Impl(GlobalShortcutManager::KeyTrigger* t, const QKeySequence& ks)
|
||||
+ : trigger_(t)
|
||||
+ , qkey_(ks)
|
||||
+ {
|
||||
+ HKeyTriggerManager::instance()->addTrigger(this);
|
||||
+
|
||||
+ HKeyTriggerManager::Qt_HK_Keygroup kg;
|
||||
+ unsigned int mod;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Destructor unregisters the hotkey.
|
||||
+ */
|
||||
+ ~Impl()
|
||||
+ {
|
||||
+ HKeyTriggerManager::instance()->removeTrigger(this);
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ void activate()
|
||||
+ {
|
||||
+ emit trigger_->triggered();
|
||||
+ }
|
||||
+
|
||||
+ bool isAccepted(int qkey) const
|
||||
+ {
|
||||
+ return qkey_ == qkey;
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+bool GlobalShortcutManager::KeyTrigger::Impl::failed;
|
||||
+long HKeyTriggerManager::alt_mask = 0;
|
||||
+long HKeyTriggerManager::meta_mask = 0;
|
||||
+long HKeyTriggerManager::super_mask = 0;
|
||||
+long HKeyTriggerManager::hyper_mask = 0;
|
||||
+long HKeyTriggerManager::numlock_mask = 0;
|
||||
+bool HKeyTriggerManager::haveMods = false;
|
||||
+
|
||||
+
|
||||
+HKeyTriggerManager::Qt_HK_Keymap
|
||||
+HKeyTriggerManager::qt_hk_table[] = {
|
||||
+ { Qt::Key_Escape, B_ESCAPE },
|
||||
+ { Qt::Key_Tab, B_TAB},
|
||||
+ { Qt::Key_Backtab, 0 },
|
||||
+ { Qt::Key_Backspace, B_BACKSPACE},
|
||||
+ { Qt::Key_Return, B_RETURN},
|
||||
+ { Qt::Key_Enter, B_ENTER},
|
||||
+ { Qt::Key_Insert, B_INSERT},
|
||||
+ { Qt::Key_Delete, B_DELETE},
|
||||
+ { Qt::Key_Pause, B_PAUSE_KEY},
|
||||
+ { Qt::Key_Print, B_PRINT_KEY},
|
||||
+ { Qt::Key_SysReq, 0 },
|
||||
+ //{ Qt::Key_Clear, B_CLEAR_KEY},
|
||||
+ { Qt::Key_Home, B_HOME},
|
||||
+ { Qt::Key_End, B_END},
|
||||
+ { Qt::Key_Left, B_LEFT_ARROW},
|
||||
+ { Qt::Key_Up, B_UP_ARROW},
|
||||
+ { Qt::Key_Right, B_RIGHT_ARROW},
|
||||
+ { Qt::Key_Down, B_DOWN_ARROW},
|
||||
+ { Qt::Key_PageUp, B_PAGE_UP},
|
||||
+ { Qt::Key_PageDown, B_PAGE_DOWN},
|
||||
+ { Qt::Key_Shift, B_SHIFT_KEY},
|
||||
+ { Qt::Key_Control, B_CONTROL_KEY},
|
||||
+ { Qt::Key_Meta, B_LEFT_OPTION_KEY},
|
||||
+ { Qt::Key_Alt, B_MENU_KEY},
|
||||
+ { Qt::Key_CapsLock, B_CAPS_LOCK},
|
||||
+ { Qt::Key_NumLock, B_NUM_LOCK},
|
||||
+ { Qt::Key_ScrollLock, B_SCROLL_KEY},
|
||||
+ { Qt::Key_F1, B_F1_KEY},
|
||||
+ { Qt::Key_F2, B_F2_KEY},
|
||||
+ { Qt::Key_F3, B_F3_KEY},
|
||||
+ { Qt::Key_F4, B_F4_KEY},
|
||||
+ { Qt::Key_F5, B_F5_KEY},
|
||||
+ { Qt::Key_F6, B_F6_KEY},
|
||||
+ { Qt::Key_F7, B_F7_KEY},
|
||||
+ { Qt::Key_F8, B_F8_KEY},
|
||||
+ { Qt::Key_F9, B_F9_KEY},
|
||||
+ { Qt::Key_F10, B_F10_KEY},
|
||||
+ { Qt::Key_F11, B_F11_KEY},
|
||||
+ { Qt::Key_F12, B_F12_KEY},
|
||||
+ { Qt::Key_F13, 0 },
|
||||
+ { Qt::Key_F14, 0 },
|
||||
+ { Qt::Key_F15, 0 },
|
||||
+ { Qt::Key_F16, 0 },
|
||||
+ { Qt::Key_F17, 0 },
|
||||
+ { Qt::Key_F18, 0 },
|
||||
+ { Qt::Key_F19, 0 },
|
||||
+ { Qt::Key_F20, 0 },
|
||||
+ { Qt::Key_F21, 0 },
|
||||
+ { Qt::Key_F22, 0 },
|
||||
+ { Qt::Key_F23, 0 },
|
||||
+ { Qt::Key_F24, 0 },
|
||||
+ { Qt::Key_F25, 0 },
|
||||
+ { Qt::Key_F26, 0 },
|
||||
+ { Qt::Key_F27, 0 },
|
||||
+ { Qt::Key_F28, 0 },
|
||||
+ { Qt::Key_F29, 0 },
|
||||
+ { Qt::Key_F30, 0 },
|
||||
+ { Qt::Key_F31, 0 },
|
||||
+ { Qt::Key_F32, 0 },
|
||||
+ { Qt::Key_F33, 0 },
|
||||
+ { Qt::Key_F34, 0 },
|
||||
+ { Qt::Key_F35, 0 },
|
||||
+ { Qt::Key_Super_L, 0 },
|
||||
+ { Qt::Key_Super_R, 0 },
|
||||
+ { Qt::Key_Menu, 0 },
|
||||
+ { Qt::Key_Hyper_L, 0 },
|
||||
+ { Qt::Key_Hyper_R, 0 },
|
||||
+ { Qt::Key_Help, 0 },
|
||||
+ { Qt::Key_Direction_L, 0 },
|
||||
+ { Qt::Key_Direction_R, 0 },
|
||||
+
|
||||
+ { Qt::Key_unknown, 0 },
|
||||
+};
|
||||
+
|
||||
+GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
|
||||
+{
|
||||
+ d = new Impl(this, key);
|
||||
+}
|
||||
+
|
||||
+GlobalShortcutManager::KeyTrigger::~KeyTrigger()
|
||||
+{
|
||||
+ delete d;
|
||||
+ d = 0;
|
||||
+}
|
||||
diff --git a/src/src.pri b/src/src.pri
|
||||
index 51c2d92..3f0bc66 100644
|
||||
--- a/src/src.pri
|
||||
+++ b/src/src.pri
|
||||
@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT += x11extras
|
||||
}
|
||||
}
|
||||
-unix:!mac:DEFINES += HAVE_X11
|
||||
+unix:!mac:!haiku:DEFINES += HAVE_X11
|
||||
|
||||
# modules
|
||||
include($$PWD/protocol/protocol.pri)
|
||||
diff --git a/src/systeminfo.cpp b/src/systeminfo.cpp
|
||||
index cd09500..aa44d52 100644
|
||||
--- a/src/systeminfo.cpp
|
||||
+++ b/src/systeminfo.cpp
|
||||
@@ -26,6 +26,14 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
+#if defined(Q_WS_HAIKU)
|
||||
+#include <sys/utsname.h>
|
||||
+#include <Path.h>
|
||||
+#include <FindDirectory.h>
|
||||
+#include <AppFileInfo.h>
|
||||
+extern "C" const char* __get_haiku_revision();
|
||||
+#endif
|
||||
+
|
||||
#include "systeminfo.h"
|
||||
|
||||
#if defined(HAVE_X11)
|
||||
@@ -172,7 +180,7 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
|
||||
os_str_ = "Unknown";
|
||||
|
||||
// Detect
|
||||
-#if defined(HAVE_X11) || defined(Q_OS_MAC)
|
||||
+#if defined(HAVE_X11) || defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
|
||||
time_t x;
|
||||
time(&x);
|
||||
char str[256];
|
||||
@@ -228,6 +236,31 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
|
||||
default:
|
||||
os_str_ = "Mac OS X";
|
||||
}
|
||||
+#elif defined(Q_WS_HAIKU)
|
||||
+ QString strVersion("Haiku");
|
||||
+ BPath path;
|
||||
+ if (find_directory(B_BEOS_LIB_DIRECTORY, &path) == B_OK) {
|
||||
+ path.Append("libbe.so");
|
||||
+
|
||||
+ BAppFileInfo appFileInfo;
|
||||
+ version_info versionInfo;
|
||||
+ BFile file;
|
||||
+ if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
|
||||
+ && appFileInfo.SetTo(&file) == B_OK
|
||||
+ && appFileInfo.GetVersionInfo(&versionInfo,
|
||||
+ B_APP_VERSION_KIND) == B_OK
|
||||
+ && versionInfo.short_info[0] != '\0')
|
||||
+ strVersion = versionInfo.short_info;
|
||||
+ }
|
||||
+
|
||||
+ const char* haikuRevision = __get_haiku_revision();
|
||||
+ if (haikuRevision != NULL) {
|
||||
+ os_str_ = "Haiku";
|
||||
+ os_str_ += " ( " + strVersion + " Rev. ";
|
||||
+ os_str_ += haikuRevision;
|
||||
+ os_str_ += ")";
|
||||
+ }
|
||||
+
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
--
|
||||
2.2.2
|
||||
|
||||
|
||||
From bbbeab1f8de9dfb916d8ea4ee778324734577220 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Mon, 12 Oct 2015 12:28:45 +0300
|
||||
Subject: Link against libbe on Haiku
|
||||
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index 4023ad7..cbe8d4e 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -57,6 +57,9 @@ unix {
|
||||
INSTALLS += dt icon1 icon2 icon3 icon4 icon5
|
||||
}
|
||||
|
||||
+haiku {
|
||||
+ LIBS += -lbe
|
||||
+}
|
||||
windows {
|
||||
LIBS += -lWSock32 -lUser32 -lShell32 -lGdi32 -lAdvAPI32
|
||||
DEFINES += QT_STATICPLUGIN
|
||||
--
|
||||
2.2.2
|
||||
|
||||
|
||||
From 5053a5ea1c741ff77c7338d104abff57a40407b5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Mon, 12 Oct 2015 14:20:08 +0300
|
||||
Subject: Fix build on Haiku
|
||||
|
||||
|
||||
diff --git a/src/plugins/generic/screenshotplugin/screenshotplugin.pro b/src/plugins/generic/screenshotplugin/screenshotplugin.pro
|
||||
index 0d637ad..4e90f3d 100644
|
||||
--- a/src/plugins/generic/screenshotplugin/screenshotplugin.pro
|
||||
+++ b/src/plugins/generic/screenshotplugin/screenshotplugin.pro
|
||||
@@ -53,7 +53,7 @@ HEADERS += qxt/core/qxtglobal.h \
|
||||
SOURCES += qxt/core/qxtglobal.cpp \
|
||||
qxt/gui/qxtwindowsystem.cpp
|
||||
|
||||
-unix:!macx {
|
||||
+unix:!macx:!haiku {
|
||||
CONFIG += X11
|
||||
SOURCES += qxt/gui/qxtwindowsystem_x11.cpp
|
||||
HEADERS += qxt/gui/x11info.h
|
||||
--
|
||||
2.2.2
|
||||
|
||||
87
net-im/psi_plus/psi_plus-0.16.475.recipe
Normal file
87
net-im/psi_plus/psi_plus-0.16.475.recipe
Normal file
@@ -0,0 +1,87 @@
|
||||
SUMMARY="A development branch of Psi IM XMPP/Jabber client"
|
||||
DESCRIPTION="Psi is a cross-platform powerful XMPP/Jabber client (Qt, C++) \
|
||||
designed for the Jabber power users."
|
||||
HOMEPAGE="https://code.google.com/p/psi-dev/"
|
||||
SOURCE_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/$portVersion.tar.gz"
|
||||
SOURCE_FILENAME="psi-plus-$portVersion.tar.gz"
|
||||
SOURCE_DIR="psi-plus-snapshots-$portVersion"
|
||||
CHECKSUM_SHA256="d20f79845da742a0711c76834e4c3199648d032bf49267fe28c2f1a2b494adb7"
|
||||
REVISION="1"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2015, Psi+ Project"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86"
|
||||
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
psi$secondaryArchSuffix = $portVersion
|
||||
app:Psi$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku${secondaryArchSuffix}
|
||||
libqt4${secondaryArchSuffix} >= 4.8
|
||||
lib:libqca$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:g++${secondaryArchSuffix}
|
||||
cmd:patch
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:cmake
|
||||
cmd:make
|
||||
cmd:which
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
libqt4${secondaryArchSuffix}_devel >= 4.8
|
||||
devel:libaspell$secondaryArchSuffix
|
||||
devel:libidn$secondaryArchSuffix
|
||||
devel:libqca$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
sed -i 's/ qca2-qt4//g' configure
|
||||
}
|
||||
|
||||
PATCHES="psi_plus_x86-0.16.475.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
./configure --disable-qdbus --enable-plugins \
|
||||
--prefix=$prefix \
|
||||
--bindir=$appsDir/Psi-plus \
|
||||
--libdir=$appsDir/Psi-plus/lib \
|
||||
--datadir=$appsDir/Psi-plus/data
|
||||
make $jobArgs
|
||||
|
||||
cd src/plugins/generic
|
||||
mkdir -p $appsDir/Psi-plus/plugins
|
||||
|
||||
# TODO: fix screenshotplugin, otrplugin and python plugins
|
||||
|
||||
for dir in attentionplugin autoreplyplugin birthdayreminderplugin \
|
||||
captchaformsplugin cleanerplugin clientswitcherplugin \
|
||||
conferenceloggerplugin contentdownloaderplugin chessplugin \
|
||||
gomokugameplugin jabberdiskplugin \
|
||||
extendedmenuplugin extendedoptionsplugin gmailserviceplugin gnupgplugin \
|
||||
historykeeperplugin icqdieplugin imageplugin juickplugin \
|
||||
pepchangenotifyplugin qipxstatusesplugin skinsplugin stopspamplugin \
|
||||
storagenotesplugin translateplugin watcherplugin
|
||||
do
|
||||
pushd "$dir" && qmake && make && cp *.so $appsDir/Psi-plus/plugins && popd
|
||||
done
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
rm -rf $prefix/share
|
||||
rm -rf $appsDir/Psi-plus/psi-plus.debug
|
||||
|
||||
mv $appsDir/Psi-plus/psi-plus $appsDir/Psi-plus/Psi-plus
|
||||
addResourcesToBinaries $portDir/additional-files/psi-plus.rdef $appsDir/Psi-plus/Psi-plus
|
||||
addAppDeskbarSymlink $appsDir/Psi-plus/Psi-plus
|
||||
}
|
||||
Reference in New Issue
Block a user