Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=0e2ce2853142dbb5291f8456256a817aa56a7969
commit 0e2ce2853142dbb5291f8456256a817aa56a7969
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Jun 15 17:20:41 2009 +0200
kdenetwork-3.5.10-2-i686
*rebuild with new xorg
*added glibc fix
*fixed gcc patch
diff --git a/source/kde/kdenetwork/FrugalBuild
b/source/kde/kdenetwork/FrugalBuild
index 823ceae..be031bd 100644
--- a/source/kde/kdenetwork/FrugalBuild
+++ b/source/kde/kdenetwork/FrugalBuild
@@ -3,16 +3,17 @@
pkgname=kdenetwork
pkgver=3.5.10
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Networking Programs."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
-depends=('libxtst' 'kdebase>=3.5.10' 'ppp' 'wireless_tools>=29' 'openslp'
'libidn')
+depends=('libxtst>=1.0.3-3' 'kdebase>=3.5.10-2' 'ppp' 'wireless_tools>=29'
'openslp' 'libidn')
makedepends=('ortp=0.7.1' 'expat' 'meanwhile' 'speex' 'gnutls'
'perl-io-socket-ssl' 'qca-tls' 'ilbc' 'qt-docs' 'doxygen')
Finclude kde
-source=($source kopete-gcc43.patch)
+source=($source kopete-gcc43.patch glibc.diff)
sha1sums=('eb280bffaf4642bfda442cc6a9fb38dc4163b720' \
- 'a15a0f72382730214861981e624efd6c095fb483')
+ '889b67f37c24af11e89623d94eaf7974b2c17527' \
+ '2f8747b46437a46660b36e0e5230cb949848ff23')
subpkgs=("$pkgname-docs" 'kopete')
subdescs=("Kdenetwork Documentation" "Kopete is a multi-protocol instant
messenger for the KDE Desktop.")
diff --git a/source/kde/kdenetwork/glibc.diff b/source/kde/kdenetwork/glibc.diff
new file mode 100644
index 0000000..09bf424
--- /dev/null
+++ b/source/kde/kdenetwork/glibc.diff
@@ -0,0 +1,46 @@
+--- kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll
2009-06-15 14:21:34.000000000 +0200
++++ new/kopete/protocols/groupwise/libgroupwise/rtf.ll 2009-06-15
14:22:19.000000000 +0200
+@@ -570,7 +570,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
+
+--- kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc
2009-06-15 14:21:34.000000000 +0200
++++ new/kopete/protocols/groupwise/libgroupwise/rtf.cc 2009-06-15
14:22:19.000000000 +0200
+@@ -2235,7 +2235,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
+--- kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc 2005-09-10
15:20:23.000000000 +0700
++++ kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc 2009-06-03
04:40:25.000000000 +0700
+@@ -2131,7 +2131,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
+--- kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll 2005-09-10
15:20:23.000000000 +0700
++++ kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll 2009-06-03
04:40:35.000000000 +0700
+@@ -568,7 +568,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
+
diff --git a/source/kde/kdenetwork/kopete-gcc43.patch
b/source/kde/kdenetwork/kopete-gcc43.patch
index dfb5926..c750b79 100644
--- a/source/kde/kdenetwork/kopete-gcc43.patch
+++ b/source/kde/kdenetwork/kopete-gcc43.patch
@@ -106,3 +106,13 @@ diff -Naur
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/x
namespace buzz {
class XmppPasswordImpl {
+---
kdenetwork-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
2006-10-01 19:26:44.000000000 +0200
++++
kdenetwork-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
2009-06-15 16:40:29.000000000 +0200
+@@ -25,6 +25,7 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <stdio.h>
+ #include "talk/base/logging.h"
+ #include "talk/session/receiver.h"
+ #include "talk/session/phone/phonesessionclient.h"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
