summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-03 15:41:04 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-03 15:41:04 +0200
commit2b941bff2af16528345b64c0c2747d4d7624a638 (patch)
treeb1d1fae5017bbb38779038c11ea43ec87fe61506
parent89f2fe7f25e82999ed02974dd765bc72d7c3af65 (diff)
downloadnutyx-extra-2b941bff2af16528345b64c0c2747d4d7624a638.tar.gz
nutyx-extra-2b941bff2af16528345b64c0c2747d4d7624a638.tar.bz2
nutyx-extra-2b941bff2af16528345b64c0c2747d4d7624a638.tar.xz
nutyx-extra-2b941bff2af16528345b64c0c2747d4d7624a638.zip
Maj kdenetwork3#3.5.10-2
-rw-r--r--kde3/kdenetwork3/.footprint20
-rwxr-xr-xkde3/kdenetwork3/Pkgfile18
-rw-r--r--kde3/kdenetwork3/kdenetwork-3.5.10-gcc44-1.patch55
3 files changed, 29 insertions, 64 deletions
diff --git a/kde3/kdenetwork3/.footprint b/kde3/kdenetwork3/.footprint
index 28c5321bc..65ee0e3e6 100644
--- a/kde3/kdenetwork3/.footprint
+++ b/kde3/kdenetwork3/.footprint
@@ -1,3 +1,23 @@
+drwxr-xr-x root/root etc/
+drwxr-xr-x root/root etc/rc.d/
+drwxr-xr-x root/root etc/rc.d/init.d/
+-rwxr-xr-- root/root etc/rc.d/init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc0.d/
+lrwxrwxrwx root/root etc/rc.d/rc0.d/K35lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc1.d/
+lrwxrwxrwx root/root etc/rc.d/rc1.d/K35lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc2.d/
+lrwxrwxrwx root/root etc/rc.d/rc2.d/K35lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc3.d/
+lrwxrwxrwx root/root etc/rc.d/rc3.d/S30lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc4.d/
+lrwxrwxrwx root/root etc/rc.d/rc4.d/S30lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc5.d/
+lrwxrwxrwx root/root etc/rc.d/rc5.d/S30lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rc6.d/
+lrwxrwxrwx root/root etc/rc.d/rc6.d/K35lisa -> ../init.d/lisa
+drwxr-xr-x root/root etc/rc.d/rcsysinit.d/
+drwxr-xr-x root/root etc/sysconfig/
drwxr-xr-x root/root opt/
drwxr-xr-x root/root opt/kde/
drwxr-xr-x root/root opt/kde/bin/
diff --git a/kde3/kdenetwork3/Pkgfile b/kde3/kdenetwork3/Pkgfile
index 3b211889f..4e9257d6c 100755
--- a/kde3/kdenetwork3/Pkgfile
+++ b/kde3/kdenetwork3/Pkgfile
@@ -2,20 +2,20 @@
# URL: http://kde.org
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: kdebase3, qca-tls, gnupg1, gnutls, wireless_tools, p5-io-socket-ssl, ortp, meanwhile, libgadu, openslp
+# Depends on: kdebase3, gnupg1, gnutls, wireless_tools, ortp, meanwhile, libgadu, openslp
name=kdenetwork3
version=3.5.10
-release=1
+release=2
source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/kdenetwork-$version.tar.bz2 \
- kdenetwork-3.5.10-gcc44-1.patch )
+ http://nutyx.meticul.eu/files/patchs/$name/kdenetwork-3.5.10-gcc44-1.patch )
build() {
-# source /etc/blfs-bootscripts
-# wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
-# tar xvf $scripts-$scriptsversion.tar.bz2
-# cd $scripts-$scriptsversion
-# make DESTDIR=$PKG install-lisa
- cd kdenetwork-$version
+ source /etc/blfs-bootscripts
+ wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+ tar xvf $scripts-$scriptsversion.tar.bz2
+ cd $scripts-$scriptsversion
+ make DESTDIR=$PKG install-lisa
+ cd ../kdenetwork-$version
patch -Np1 -i ../kdenetwork-3.5.10-gcc44-1.patch
export DO_NOT_COMPILE=kopete
./configure --prefix=/opt/kde \
diff --git a/kde3/kdenetwork3/kdenetwork-3.5.10-gcc44-1.patch b/kde3/kdenetwork3/kdenetwork-3.5.10-gcc44-1.patch
deleted file mode 100644
index 33a4c6adb..000000000
--- a/kde3/kdenetwork3/kdenetwork-3.5.10-gcc44-1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc
---- kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc 2005-09-10
-10:20:20.000000000 +0200
-+++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc 2009-11-24
-07:58:04.000000000 +0100
-@@ -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);
-diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.ll kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll
---- kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.ll 2005-09-10
-10:20:20.000000000 +0200
-+++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll 2009-11-24
-07:53:01.000000000 +0100
-@@ -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);
-diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.cc kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc
---- kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.cc 2005-09-10
-10:20:23.000000000 +0200
-+++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc 2009-11-24 08:05:57.000000000 +0100
-@@ -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);
-diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.ll kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll
---- kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.ll 2005-09-10
-10:20:23.000000000 +0200
-+++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll 2009-11-24 08:05:33.000000000 +0100
-@@ -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);
-