diff options
author | Mounir Lamouri <volkmar@gentoo.org> | 2009-04-18 01:56:37 +0000 |
---|---|---|
committer | Mounir Lamouri <volkmar@gentoo.org> | 2009-04-18 01:56:37 +0000 |
commit | 0512e6231ad17684806ede5165af533ef54a239b (patch) | |
tree | ad6f1b066f4155f301bf843201c674b9c9fe42cd | |
parent | net-libs/ekiga: fixing kde-4 support (diff) | |
download | voip-0512e6231ad17684806ede5165af533ef54a239b.tar.gz voip-0512e6231ad17684806ede5165af533ef54a239b.tar.bz2 voip-0512e6231ad17684806ede5165af533ef54a239b.zip |
net-im/ekiga: try to fix preferences segfault bug and kab configure
svn path=/trunk/; revision=837
-rw-r--r-- | net-im/ekiga/Manifest | 5 | ||||
-rw-r--r-- | net-im/ekiga/ekiga-3.2.0-r1.ebuild | 6 | ||||
-rw-r--r-- | net-im/ekiga/files/ekiga-3.2.0-configure.patch | 25 | ||||
-rw-r--r-- | net-im/ekiga/files/ekiga-3.2.0-preferences.patch | 24 |
4 files changed, 39 insertions, 21 deletions
diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest index 1199407..14d2043 100644 --- a/net-im/ekiga/Manifest +++ b/net-im/ekiga/Manifest @@ -1,10 +1,11 @@ AUX ekiga-3.0.2-ptracing.patch 5708 RMD160 1031c2a8fa5b2ade6ceb513a56e9b5ae95a60809 SHA1 419c06ac2058943bea9fa21f96b231cc11b9fdba SHA256 1a83b04db2ab039c616ccf1b4f1071290b08d64a4929643d5147da53d353d3fe -AUX ekiga-3.2.0-configure.patch 11578 RMD160 685c79d791645c2d5259e884b347bb89d8c5ca87 SHA1 2e91aacfbf6d825dbc78d7dd4fd1f33f3c1107fd SHA256 4381759e0885a8b4bd23ad2d37a662ae1a072e005d55f103f8144d08ab3681f8 +AUX ekiga-3.2.0-configure.patch 11122 RMD160 9f879bf47f989f71a3c6d0e34a68ccc07e3c8d27 SHA1 7247a0fa274844b3e7a169dca62782d3b1c07b89 SHA256 76872ab7779dc34d922613aefa8eaa52cc8a9f37b35daa06a77091ab4ba92c98 +AUX ekiga-3.2.0-preferences.patch 1066 RMD160 9815e6d34c96a9fef53e8de1b5ea298751046835 SHA1 d907efac2658f99eee6d2d2c7d8aad048f7a8ba6 SHA256 536af6033d2e8d65e92c2e2255c0b0baabc5b1692a98f767cf79e96b8a10fc37 AUX ekiga-3.2.0-ptracing.patch 5073 RMD160 bad220709a9238347f2ed219a4ffe0ee9f5e1d0a SHA1 3050a2c4c2dc04b2ade582652df9fe8ea0c6e5e3 SHA256 78070f8e94c457d872979da177f612b1609e533ecbe943e2f13e863c67d8ffe8 AUX ekiga-3.2.0-xcap.patch 2640 RMD160 c112e0a93c5dd121f83368ccf3dcf6f78bdd7eb6 SHA1 761ca9e87085e9cae194e47267ee4ed4b48cfd5b SHA256 e5284d49e703e43256f2a136159598c2f088d4e12698e158ae1b27ef357a26f2 DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e DIST ekiga-3.2.0.tar.bz2 7679645 RMD160 f31e94dbe03038e39fb5b50bd71372992c13ae8b SHA1 6a8d6f203cd982cbfb37822b2a96f176176cd763 SHA256 998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd -EBUILD ekiga-3.2.0-r1.ebuild 6170 RMD160 50e5099cd2ee9cf7bd962b5f926f200345d270b1 SHA1 fba8aec969929441cbae8d038b80c05a8f895282 SHA256 ca08c39985dc15d4d341cd9ae3903864f57537f03abb05899c0b4ecabd65ef96 +EBUILD ekiga-3.2.0-r1.ebuild 6305 RMD160 0c3c0d1209a8a182a7349c739e188fb9b61a4935 SHA1 21feda6051c0839582b0dbe0925ab2bfae966055 SHA256 7c99633b5e2114e7b9252461fbeeae2295538e5ba70789852526fd3a91230b73 MISC ChangeLog 984 RMD160 ea1c8d10dfe3d844046971b80190e6adb1887639 SHA1 55c39b5413f44f3256e7bf3678eb693e75e36abc SHA256 8068c6b9b27d89ab382cf67a80185b64729cbb46c2da1cea4648f3ffa94e5b1f MISC metadata.xml 528 RMD160 e925e497011180300d392e98206ff24e4b06911b SHA1 cf734d7d2b7c55c01e5ce3779e4bd3c89ffcad35 SHA256 b9895d5d6170742d1d26a135bab40a97c3aa1f4941c96d6018a3daead65bf12a diff --git a/net-im/ekiga/ekiga-3.2.0-r1.ebuild b/net-im/ekiga/ekiga-3.2.0-r1.ebuild index 83836b4..8eb77f1 100644 --- a/net-im/ekiga/ekiga-3.2.0-r1.ebuild +++ b/net-im/ekiga/ekiga-3.2.0-r1.ebuild @@ -129,8 +129,12 @@ src_prepare() { # upstream has been contacted, see bug 575433 in their bugtracker epatch "${FILESDIR}"/${P}-ptracing.patch + # fix segfault when accessing to preferences window in debug mode + # backporting patch from upstream repository + epatch "${FILESDIR}"/${P}-preferences.patch + # compilation breaks with xcap enabled - # it has been fixed in ekiga svn repository so backporting the patch + # backporting patch from upstream repository if use xcap; then epatch "${FILESDIR}"/${P}-xcap.patch fi diff --git a/net-im/ekiga/files/ekiga-3.2.0-configure.patch b/net-im/ekiga/files/ekiga-3.2.0-configure.patch index 30f571f..702c8fe 100644 --- a/net-im/ekiga/files/ekiga-3.2.0-configure.patch +++ b/net-im/ekiga/files/ekiga-3.2.0-configure.patch @@ -1,5 +1,5 @@ --- configure.old 2009-03-29 14:53:29.000000000 -0400 -+++ configure 2009-04-17 20:06:09.000000000 -0400 ++++ configure 2009-04-17 21:52:44.000000000 -0400 @@ -1129,6 +1129,8 @@ AVAHI_LIBS GSTREAMER_CFLAGS @@ -286,26 +286,17 @@ CPPFLAGS_save="$CPPFLAGS" LIBS_save="$LIBS" CPPFLAGS="$CPPFLAGS $KDE_CFLAGS" -@@ -25373,12 +25450,16 @@ - - CPPFLAGS="$CPPFLAGS_save" - LIBS="$LIBS_save" -+ - if test "x$found_kde" = "xno"; then -- { { $as_echo "$as_me:$LINENO: error: We need this header!" >&5 --$as_echo "$as_me: error: We need this header!" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: You need QtCore and kapplication.h to enable KDE support" >&5 -+$as_echo "$as_me: error: You need QtCore and kapplication.h to enable KDE support" >&2;} +@@ -25379,6 +25456,9 @@ { (exit 1); exit 1; }; } fi -+ KDE_LIBS="$KDE_LIBS -lkdeui" ++ KDE_LIBS="$KDE_LIBS -lkdeui" + + KDE="enabled" -@@ -25401,7 +25482,9 @@ +@@ -25401,7 +25481,9 @@ # Check whether --enable-kab was given. if test "${enable_kab+set}" = set; then @@ -316,18 +307,16 @@ fi -@@ -25413,8 +25496,8 @@ - { (exit 1); exit 1; }; } +@@ -25414,7 +25496,7 @@ fi found_kab=yes -- KAB_CFLAGS="-I/usr/include/qt4" + KAB_CFLAGS="-I/usr/include/qt4" - KAB_LIBS="-lQtCore -lkabc" -+ KAB_CFLAGS="" + KAB_LIBS="-lkabc" CPPFLAGS_save="$CPPFLAGS" LIBS_save="$LIBS" CPPFLAGS="$CPPFLAGS $KAB_CFLAGS" -@@ -25588,7 +25671,9 @@ +@@ -25588,7 +25670,9 @@ # Check whether --enable-xcap was given. if test "${enable_xcap+set}" = set; then diff --git a/net-im/ekiga/files/ekiga-3.2.0-preferences.patch b/net-im/ekiga/files/ekiga-3.2.0-preferences.patch new file mode 100644 index 0000000..60cd4e5 --- /dev/null +++ b/net-im/ekiga/files/ekiga-3.2.0-preferences.patch @@ -0,0 +1,24 @@ +diff -ur ekiga-3.2.0-old/src/gui/assistant.cpp ekiga-3.2.0/src/gui/assistant.cpp +--- ekiga-3.2.0-old/src/gui/assistant.cpp 2009-03-07 12:09:14.000000000 +0100 ++++ ekiga-3.2.0/src/gui/assistant.cpp 2009-04-10 17:31:01.000000000 +0200 +@@ -1299,7 +1299,7 @@ + gchar **array = NULL; + unsigned i; + +- array = (gchar**) malloc (sizeof(gchar*) * (list.size() + 1)); ++ array = (gchar**) g_malloc (sizeof(gchar*) * (list.size() + 1)); + for (i = 0; i < list.size(); i++) + array[i] = (gchar*) list[i].c_str(); + array[i] = NULL; +diff -ur ekiga-3.2.0-old/src/gui/preferences.cpp ekiga-3.2.0/src/gui/preferences.cpp +--- ekiga-3.2.0-old/src/gui/preferences.cpp 2009-01-07 11:02:09.000000000 +0100 ++++ ekiga-3.2.0/src/gui/preferences.cpp 2009-04-16 14:28:08.000000000 +0200 +@@ -862,7 +862,7 @@ + gchar **array = NULL; + unsigned i; + +- array = (gchar**) malloc (sizeof(gchar*) * (list.size() + 1)); ++ array = (gchar**) g_malloc (sizeof(gchar*) * (list.size() + 1)); + for (i = 0; i < list.size(); i++) + array[i] = (gchar*) list[i].c_str(); + array[i] = NULL; |