TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: cleanup tdenetwork

Browse Source
pull/3/head
François Andriot 10 years ago
parent 6de6c5661d
commit 25e81ae17c
31 changed files with 0 additions and 3836 deletions
Show Stats Download Patch File Download Diff File

26
redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch
Unescape Escape View File

@ -1,26 +0,0 @@
--- kdenetwork-3.2.3/kppp/connect.cpp.orig 2004-07-01 16:03:52.861908057 +0200
+++ kdenetwork-3.2.3/kppp/connect.cpp 2004-07-01 16:33:35.943692521 +0200
@@ -1399,9 +1399,13 @@
void addpeerdns() {
int fd, fd2;
+ TQString p = "/var/run/ppp/resolv.conf";
+
+ if (!TQFile::exists(p))
+ p = "/etc/ppp/resolv.conf";
if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) {
- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) {
+ if((fd2 = open(p.latin1(), O_RDONLY)) >= 0) {
char c;
int i = 0;
while(i++ < 100 && read(fd2, &c, 1) == 1) {
@@ -1412,7 +1416,7 @@
}
close(fd2);
} else
- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n");
+ fprintf(stderr, "failed to read from %s\n", p.latin1());
close(fd);
}
add_domain(gpppdata.domain());

502
redhat/tdenetwork/kdenetwork-3.5.12.spec
Unescape Escape View File

@ -1,502 +0,0 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.12
%endif
%define release 5
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/kde3
# Fedora review: http://bugzilla.redhat.com/195486
## Conditional build:
# disabled, for now, doesn't build -- Rex
#define _enable_jingle --enable-jingle
%define _enable_sametime_plugin --enable-sametime-plugin
#define _enable_slp --enable-slp
# RHEL6: xmms is outdated !
#define _with_xmms --with-xmms
%ifnarch s390 s390x
%define _with_wifi --with-wifi
%endif
%define console_helper 1
Name: trinity-kdenetwork
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
Summary: K Desktop Environment - Network Applications
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
License: GPLv2
Group: Applications/Internet
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: kdenetwork3 = %{version}-%{release}
Source0: kdenetwork-%{version}.tar.gz
Source1: kppp.pamd
Source2: ktalk
Source4: lisarc
Source5: lisa.redhat
# RedHat/Fedora legacy patches
Patch3: kdenetwork-3.5.8-kppp.patch
Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
# Trinity official patches, from SVN
# Use libv4l1-videodev.h when available in kdenetwork
Patch7: r1243951.diff
# Trinity unofficial patches
# Compiling Kopete for Fedora15 ...
Patch8: kdenetwork-kopete-gcc45.patch
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
BuildRequires: coreutils
BuildRequires: openssl-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel
%endif
%if "%{?_with_wifi:1}" == "1"
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
BuildRequires: wireless-tools-devel
%else
BuildRequires: wireless-tools
%endif
%endif
%{?_enable_slp:BuildRequires: openslp-devel}
## kopete:
BuildRequires: libxml2-devel libxslt-devel
%ifarch %{ix86}
# BR: %{_includedir}/valgrind/valgrind.h
BuildRequires: valgrind
%endif
#jabber
BuildRequires: libidn-devel
#jabber/jingle
%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel}
# jabber/ssl
#{?fedora:Requires(hint): qca-tls}
# sametime
%{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
Requires: jasper
## kppp
Requires: ppp
## krdc
Requires: rdesktop
## lisa
Requires(preun): chkconfig
Requires(post): chkconfig
#Requires(hint): samba-client
BuildRequires: avahi-qt3-devel
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libv4l-devel
%endif
%if 0%{?console_helper}
Requires: usermode-gtk
%endif
%description
Networking applications, including:
* kget: downloader manager
* kio_lan: lan browsing kio slave
* knewsticker: RDF newsticker applet
* kopete: chat client
* kppp: dialer and front end for pppd
* krdc: a client for Desktop Sharing and other VNC servers
* krfb: Desktop Sharing server, allow others to access your desktop via VNC
* lisa: lan information server
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Provides: kdenetwork3-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
%{summary}.
%package extras
Summary: Extras packages for %{name}
Group: Applications/Internet
Requires: %{name}-libs = %{version}-%{release}
%if "%{?_with_xmms:1}" == "1"
Obsoletes: %{name}-nowlistening < %{version}-%{release}
Provides: %{name}-nowlistening = %{version}-%{release}
%endif
%description extras
More Networking applications for the K Desktop Environment:
* ksirc
* kdict
* ktalkd
* kpf
* kwifimanager
%if "%{?_with_xmms:1}" == "1"
* nowlistening (xmms) plugin for Kopete.
%endif
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs >= %{version}
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%prep
%setup -q -n kdenetwork
%if %{console_helper}
%patch3 -p1 -b .kppp
%endif
%patch4 -p1 -b .resolv
%patch6 -p1 -b .krfb_httpd
%patch7 -p1
%patch8 -p1
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
--disable-debug \
--disable-warnings \
--enable-final \
--includedir=%{tde_includedir} \
%{?_enable_jingle} %{!?_enable_jingle:--disable-jingle} \
%{?_enable_sametime_plugin} %{!?_enable_sametime_plugin:--disable-sametime-plugin} \
%{?_enable_slp} %{!?_enable_slp:--disable-slp} \
%{?_with_wifi} %{!?_with_wifi:--without-wifi} \
%{?_with_xmms} %{!?_with_xmms:--without-xmms} \
--with-extra-includes=%{_includedir}/tqt
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# RHEL6: kppp seems to be not installed by previous command ???
%__make install DESTDIR=%{buildroot} -C kppp
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Show only in KDE, FIXME, need to re-evaluate these -- Rex
for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
kwifimanager kget knewsticker ksirc kdict ; do
if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
fi
done
%if %console_helper
# Run kppp through consolehelper
install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
mkdir -p %{buildroot}%{_sbindir}
mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
ln -s consolehelper %{buildroot}%{_bindir}/kppp
mkdir -p %{buildroot}/etc/security/console.apps
cat > %{buildroot}/etc/security/console.apps/kppp3 <<EOF
USER=root
PROGRAM=%{_sbindir}/kppp
SESSION=true
EOF
%endif
# ktalk
install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
# Add lisa startup script
install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
%post
/sbin/chkconfig --add lisa ||:
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ]; then
/sbin/chkconfig --del lisa ||:
/sbin/service lisa stop > /dev/null 2>&1 ||:
fi
%post libs
/sbin/ldconfig
%postun libs
/sbin/ldconfig
%post extras
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
%postun extras
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
%clean
%__rm -rf %{buildroot}
%files extras
%defattr(-,root,root,-)
# ksirc
%{_docdir}/HTML/??/ksirc/
%{_bindir}/ksirc
%{_libdir}/libkdeinit_ksirc.*
%{_libdir}/kde3/ksirc.*
%{_datadir}/applications/kde/ksirc.desktop
%{_datadir}/apps/ksirc/
%config(noreplace) %{_datadir}/config/ksircrc
%{_datadir}/icons/hicolor/*/apps/ksirc.*
# kdict
%{_docdir}/HTML/en/kdict
%{_bindir}/kdict
%{_libdir}/kde3/kdict*
%{_libdir}/libkdeinit_kdict.*
%{_datadir}/applications/kde/kdict.desktop
%{_datadir}/apps/kdict
%{_datadir}/apps/kicker/applets/kdictapplet.desktop
%{_datadir}/icons/hicolor/*/apps/kdict.*
# ktalk
%{_docdir}/HTML/en/ktalkd
%{_bindir}/ktalkd*
%{_libdir}/kde3/kcm_ktalkd.*
%{_datadir}/applications/kde/kcmktalkd.desktop
%config(noreplace) %{_datadir}/config/ktalkdrc
%{_datadir}/icons/crystalsvg/*/apps/ktalkd.*
%{_datadir}/sounds/ktalkd.wav
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
# kpf
%{_docdir}/HTML/en/kpf
%{_libdir}/kde3/kpf*
%{_datadir}/apps/kicker/applets/kpfapplet.desktop
%{_datadir}/icons/crystalsvg/*/apps/kpf.*
%{_datadir}/services/kpfpropertiesdialogplugin.desktop
%if "%{?_with_wifi:1}" == "1"
# kwifimanager
%doc %{_docdir}/HTML/en/kwifimanager
%{_bindir}/kwifimanager
%{_libdir}/kde3/kcm_wifi.*
%{_datadir}/applications/kde/kcmwifi.desktop
%{_datadir}/applications/kde/kwifimanager.desktop
%{_datadir}/apps/kwifimanager
%{_datadir}/icons/hicolor/*/apps/kwifimanager.png
%endif
%if "%{?_with_xmms:1}" == "1"
#files nowlistening
#defattr(-,root,root,-)
%{_datadir}/apps/kopete/*nowlisteningchatui*
%{_datadir}/apps/kopete/*nowlisteningui*
%{_datadir}/services/kconfiguredialog/*nowlistening*
%{_datadir}/services/*nowlistening*
%{_libdir}/kde3/*nowlistening*
%endif
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
# ksirc
%exclude %{_bindir}/ksirc
%exclude %{_libdir}/libkdeinit_ksirc.*
%exclude %{_libdir}/kde3/ksirc.*
%exclude %{_datadir}/applications/kde/ksirc.desktop
%exclude %{_datadir}/apps/ksirc/
%exclude %{_datadir}/config/ksircrc
%exclude %{_docdir}/HTML/??/ksirc/
%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png
# kdict
%exclude %{_docdir}/HTML/en/kdict
%exclude %{_bindir}/kdict
%exclude %{_libdir}/kde3/kdict*
%exclude %{_libdir}/libkdeinit_kdict.*
%exclude %{_datadir}/applications/kde/kdict.desktop
%exclude %{_datadir}/apps/kdict
%exclude %{_datadir}/apps/kicker/applets/kdictapplet.desktop
%exclude %{_datadir}/icons/hicolor/128x128/apps/kdict.png
%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png
%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
# ktalk
%exclude %{_docdir}/HTML/en/ktalkd
%exclude %{_sysconfdir}/xinetd.d/ktalk
%exclude %{_bindir}/ktalkd*
%exclude %{_libdir}/kde3/kcm_ktalkd.*
%exclude %{_datadir}/applications/kde/kcmktalkd.desktop
%exclude %{_datadir}/config/ktalkdrc
%exclude %{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
%exclude %{_datadir}/sounds/ktalkd.wav
# kpf
%exclude %{_libdir}/kde3/kpf*
%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop
%exclude %{_docdir}/HTML/en/kpf
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
%exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop
%ifnarch s390 s390x
# kwifimanager
%exclude %{_bindir}/kwifimanager
%exclude %{_libdir}/kde3/kcm_wifi.*
%exclude %{_datadir}/applications/kde/kcmwifi.desktop
%exclude %{_datadir}/applications/kde/kwifimanager.desktop
%exclude %{_datadir}/apps/kwifimanager
%exclude %{_docdir}/HTML/en/kwifimanager
%exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
%exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
%endif
# nowlistening
%if "%{?_with_xmms:1}" == "1"
%exclude %{_datadir}/apps/kopete/*nowlisteningchatui*
%exclude %{_datadir}/apps/kopete/*nowlisteningui*
%exclude %{_datadir}/services/kconfiguredialog/*nowlistening*
%exclude %{_datadir}/services/*nowlistening*
%exclude %{_libdir}/kde3/*nowlistening*
%endif
%{_docdir}/HTML/en/*
%if %console_helper
%config(noreplace) /etc/security/console.apps/kppp3
%config(noreplace) /etc/pam.d/kppp3
%{_sbindir}/kppp
%else
%attr(4755,root,root) %{_bindir}/kppp
%endif
%config(noreplace) %{_sysconfdir}/lisarc
%config(noreplace) %{_initrddir}/lisa
%{_libdir}/libkdeinit_*.so
%if "%{?_with_wifi:1}" == "1"
%{_libdir}/libkwireless.*
%endif
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin/*
%{_bindir}/*
%{_datadir}/apps/*
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
%{_datadir}/config/*
%{_datadir}/config.kcfg/*
%{_datadir}/icons/*/*/*/*
%{_datadir}/mimelnk/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/sounds/*
%files libs
%defattr(-,root,root,-)
%{_libdir}/libkopete*.so.*
%{_libdir}/libkopete*.la
%{_libdir}/librss.so.*
%{_libdir}/librss.la
%files devel
%defattr(-,root,root,-)
%{_includedir}/kde/*
%{_libdir}/libkopete*.so
%{_libdir}/librss.so
%changelog
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Import to GIT
* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Add correction for Fedora 15
- Add patch7 for V4L compilation
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Correct macro to install under "/opt", if desired
* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
- Initial version
- Spec file based on Fedora 8 "kdenetwork 7:3.5.10-1"

3
redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp
Unescape Escape View File

@ -1,3 +0,0 @@
#include "kdemacros.h"
extern "C" KDE_EXPORT void *init_libkopete_msn_shared();
extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }

20
redhat/tdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch
Unescape Escape View File

@ -1,20 +0,0 @@
commit 5c988de1bdaf2c4cf692e6c195375607a8c67ab0
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343320500 -0500
Fix a fatal error message
Thanks to 'Nix' for the patch!
diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt
index b6cc031..318b672 100644
--- a/kopete/plugins/netmeeting/CMakeLists.txt
+++ b/kopete/plugins/netmeeting/CMakeLists.txt
@@ -10,7 +10,7 @@
#################################################
if( NOT BUILD_KOPETE_PROTOCOL_MSN )
- tde_message_error( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
+ tde_message_fatal( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
endif( )
include_directories(

97
redhat/tdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch
Unescape Escape View File

@ -1,97 +0,0 @@
commit 3516f9bc3f3af5ae21cdbd2d3af835645cf72274
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1327531037 -0600
Fix linear alphabet string errors
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
index 63130db..e0ec1b9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
@@ -24,7 +24,7 @@ static const string::size_type np = string::npos;
const string Base64::Base64Table(
// 0000000000111111111122222222223333333333444444444455555555556666
// 0123456789012345678901234567890123456789012345678901234567890123
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
// Decode Table gives the index of any valid base64 character in the Base64 table]
// 65 == A, 97 == a, 48 == 0, 43 == +, 47 == /
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index fcdd3d4..06df3f7 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -44,7 +44,7 @@ TQByteArray Base64::encode(const TQByteArray &s)
{
int i;
int len = s.size();
- char tbl[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+ char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
int a, b, c;
TQByteArray p((len+2)/3*4);
diff --git a/kopete/protocols/oscar/liboscar/md5.c b/kopete/protocols/oscar/liboscar/md5.c
index 1ca18d1..e627358 100644
--- a/kopete/protocols/oscar/liboscar/md5.c
+++ b/kopete/protocols/oscar/liboscar/md5.c
@@ -55,7 +55,7 @@ main()
"abc", /*900150983cd24fb0d6963f7d28e17f72*/
"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
/*d174ab98d277d9f5a5611c2c9f419d9f*/
"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
};
diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c
index 76620bc..ee15c34 100644
--- a/kopete/protocols/yahoo/libkyahoo/crypt.c
+++ b/kopete/protocols/yahoo/libkyahoo/crypt.c
@@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$";
/* Table with characters for base64 transformation. */
static const char b64t[64] =
-"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
char *yahoo_crypt(const char *key, const char *salt);
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
index 32e6f2b..a97e7be 100644
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
@@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *);
void yahooBase64(unsigned char *out, const unsigned char *in, int inlen)
/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
{
- char base64digits[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789._";
diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c
index 5bc2c13..5a537e0 100644
--- a/kopete/protocols/yahoo/libkyahoo/md5.c
+++ b/kopete/protocols/yahoo/libkyahoo/md5.c
@@ -69,7 +69,7 @@ main()
"abc", /*900150983cd24fb0d6963f7d28e17f72*/
"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
/*d174ab98d277d9f5a5611c2c9f419d9f*/
"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
};
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index d7f6004..4129754 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -44,7 +44,7 @@
#include <ksimpleconfig.h>
-#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"
+#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"
TQWizard* ProviderDB::wiz = 0L;

46
redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch
Unescape Escape View File

@ -1,46 +0,0 @@
commit 0a2892edc380aa11fb5474004e02fd4d86abdec1
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1340214777 +0200
Fix html special chars in kopete nowlistening plugin
This partially resolves Bug 944
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a914818..1f1fed5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -20,6 +20,7 @@
#include <tqtimer.h>
#include <tqstringlist.h>
+#include <tqstylesheet.h>
#include <tqregexp.h>
#include <kdebug.h>
@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
if(!NowListeningConfig::self()->chatAdvertising())
return;
- TQString originalBody = msg.plainBody();
+ TQString originalBody = msg.escapedBody();
// If it is a /media message, don't process it
if(originalBody.startsWith(NowListeningConfig::self()->header()))
@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
{
TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
if( !advert.isEmpty() )
- newBody = originalBody + "<br>" + advert;
+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
// If we send because the information has changed since it was last sent, we must
// rebuild the list of contacts the latest information was sent to.
@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
pl,
message,
Kopete::Message::Outbound,
- Kopete::Message::RichText );
+ Kopete::Message::PlainText );
theChat->sendMessage( msg );
}

46
redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch
Unescape Escape View File

@ -1,46 +0,0 @@
commit 2d699f523902244113eeec627ca6b9b18b740da0
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1340214777 +0200
Fix html special chars in kopete nowlistening plugin
This partially resolves Bug 994
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a914818..1f1fed5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -20,6 +20,7 @@
#include <tqtimer.h>
#include <tqstringlist.h>
+#include <tqstylesheet.h>
#include <tqregexp.h>
#include <kdebug.h>
@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
if(!NowListeningConfig::self()->chatAdvertising())
return;
- TQString originalBody = msg.plainBody();
+ TQString originalBody = msg.escapedBody();
// If it is a /media message, don't process it
if(originalBody.startsWith(NowListeningConfig::self()->header()))
@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
{
TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
if( !advert.isEmpty() )
- newBody = originalBody + "<br>" + advert;
+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
// If we send because the information has changed since it was last sent, we must
// rebuild the list of contacts the latest information was sent to.
@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
pl,
message,
Kopete::Message::Outbound,
- Kopete::Message::RichText );
+ Kopete::Message::PlainText );
theChat->sendMessage( msg );
}

19
redhat/tdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch
Unescape Escape View File

@ -1,19 +0,0 @@
commit 35c41f35b08e981caa062f963ad2611ee6ef35a9
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343320733 -0500
Fix a parallel build bug
Thanks to 'Nix' for the patch!
diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
index f6477d1..26d94f5 100644
--- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt
+++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
@@ -32,6 +32,7 @@ install( FILES
tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC
SOURCES propertiespage.cpp propertiespagegui.ui
+ DEPENDENCIES filesharesamba
)

66
redhat/tdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch
Unescape Escape View File

@ -1,66 +0,0 @@
commit f670853164f8a23f3656fa9de72b12b962b9bcaa
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1339294006 +0200
Improve Kaffeine support in Kopete now listening plugin
diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp
index c2b70ba..77dd84c 100644
--- a/kopete/plugins/nowlistening/nlkaffeine.cpp
+++ b/kopete/plugins/nowlistening/nlkaffeine.cpp
@@ -40,7 +40,7 @@ void NLKaffeine::update()
m_newTrack = false;
TQString newTrack;
bool error = true; // Asume we have a error first.
- TQCString kaffeineIface("Kaffeine"), kaffeineGetTrack("getTitle()");
+ TQCString kaffeineIface("KaffeineIface"), kaffeineGetTrack("title()");
// see if kaffeine is registered with DCOP
if ( m_client->isApplicationRegistered( "kaffeine" ) )
@@ -52,10 +52,10 @@ void NLKaffeine::update()
if ( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data,
replyType, replyData ) )
{
- kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine >= 0.5" << endl;
- // Trying with the new Kaffeine DCOP interface (>=0.5)
- kaffeineIface = "KaffeineIface";
- kaffeineGetTrack = "title()";
+ kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine < 0.5" << endl;
+ // Trying with the old Kaffeine DCOP interface (<0.5)
+ kaffeineIface = "Kaffeine";
+ kaffeineGetTrack = "getTitle()";
if( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, replyType, replyData ) )
{
kdDebug( 14307 ) << k_funcinfo << " DCOP error on Kaffeine." << endl;
@@ -94,6 +94,31 @@ void NLKaffeine::update()
m_newTrack = true;
m_track = newTrack;
}
+ if ( kaffeineIface == "Kaffeine" )
+ {
+ // old Kaffeine DCOP interface (<0.5)
+ return;
+ }
+
+ if ( m_client->call( "kaffeine", kaffeineIface, "album()", data,
+ replyType, replyData ) )
+ {
+ TQDataStream reply( replyData, IO_ReadOnly );
+
+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+ reply >> m_album;
+ }
+ }
+
+ if ( m_client->call( "kaffeine", kaffeineIface, "artist()", data,
+ replyType, replyData ) )
+ {
+ TQDataStream reply( replyData, IO_ReadOnly );
+
+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
+ reply >> m_artist;
+ }
+ }
}
else
kdDebug ( 14307 ) << "Kaffeine is not running!\n" << endl;

30
redhat/tdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch
Unescape Escape View File

@ -1,30 +0,0 @@
--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h.ORI 2011-11-27 05:38:43.500726484 -0500
+++ kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h 2011-11-27 05:39:19.901925857 -0500
@@ -80,6 +80,7 @@
#include <set>
#include <list>
+#include <cstddef>
// On our copy of sigslot.h, we force single threading
#define SIGSLOT_PURE_ISO
--- kdenetwork/kopete/protocols/jabber/CMakeLists.txt.ORI 2011-11-27 05:55:08.369780670 -0500
+++ kdenetwork/kopete/protocols/jabber/CMakeLists.txt 2011-11-27 05:55:12.350662883 -0500
@@ -80,6 +80,6 @@
jabberclient-static kopetejabberui-static
iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static
qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
- kopete-shared
+ kopete-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR}
)
--- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt.ORI 2011-11-27 06:01:44.412062605 -0500
+++ kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-11-27 06:01:56.658700254 -0500
@@ -37,6 +37,6 @@
LINK
jabberclient-static
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
- qca-static cutestuff_network-static cutestuff_util-static kio-shared
+ qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR}
)

15
redhat/tdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch
Unescape Escape View File

@ -1,15 +0,0 @@
--- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2011-11-27 13:27:13.236739020 -0500
+++ kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp 2011-11-27 13:28:48.217257573 -0500
@@ -75,7 +75,12 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
#define _LINUX_TIME_H
#endif
+
+#ifdef HAVE_LIBV4L1_VIDEODEV_H
+#include <libv4l1-videodev.h>
+#else
#include <linux/videodev.h>
+#endif
#define DEF_WIDTH 352
#define DEF_HEIGHT 288

10
redhat/tdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch
Unescape Escape View File

@ -1,10 +0,0 @@
--- kdenetwork/kopete/protocols/msn/CMakeLists.txt.ORI 2011-11-27 05:05:56.814440165 -0500
+++ kdenetwork/kopete/protocols/msn/CMakeLists.txt 2011-11-27 05:10:21.605900492 -0500
@@ -28,6 +28,7 @@
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kopete/libkopete
${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
+ ${CMAKE_SOURCE_DIR}/kopete/libkopete/private
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

11
redhat/tdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- kdenetwork/kopete/protocols/sms/services/smsclient.cpp.ORI 2011-11-27 05:22:47.001212554 -0500
+++ kdenetwork/kopete/protocols/sms/services/smsclient.cpp 2011-11-27 05:22:58.253085350 -0500
@@ -67,7 +67,7 @@
return;
}
- TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
+ TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), TQString());
if (programName.isNull())
programName = "/usr/bin/sms_client";

10
redhat/tdenetwork/kdenetwork-3.5.13-missing_ldflags.patch
Unescape Escape View File

@ -1,10 +0,0 @@
--- kdenetwork/wifi/CMakeLists.txt.ldflags 2011-10-29 04:43:38.000000000 +0200
+++ kdenetwork/wifi/CMakeLists.txt 2012-08-08 15:14:31.956605213 +0200
@@ -21,6 +21,7 @@
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
+ ${ARTS_INCLUDE_DIRS}/..
)
link_directories(

108
redhat/tdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch
Unescape Escape View File

@ -1,108 +0,0 @@
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-06-21 20:37:08.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-11-28 18:20:03.852267846 -0600
@@ -31,7 +31,7 @@
#include "talk/p2p/client/sessionclient.h"
#include "talk/p2p/base/helpers.h"
#include "talk/base/logging.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/constants.h"
#include "talk/xmllite/xmlprinter.h"
#include <iostream>
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-08-12 15:11:23.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-11-28 18:20:03.813268480 -0600
@@ -30,7 +30,7 @@
#include "talk/base/logging.h"
#include "talk/session/receiver.h"
#include "talk/session/phone/phonesessionclient.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace {
const std::string NS_PHONE("http://www.google.com/session/phone");
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-06-21 20:37:11.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-11-28 18:20:04.262270904 -0600
@@ -28,7 +28,7 @@
#include <string>
#include "talk/base/common.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlconstants.h"
//#define new TRACK_NEW
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-06-21 20:37:11.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-11-28 18:20:04.268270508 -0600
@@ -32,7 +32,7 @@
#include "talk/base/common.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlparser.h"
#include "talk/xmllite/xmlbuilder.h"
#include "talk/xmllite/xmlprinter.h"
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-06-21 20:37:11.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-11-28 18:20:04.288018707 -0600
@@ -31,7 +31,7 @@
#include <iosfwd>
#include <string>
#include "talk/base/scoped_ptr.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace buzz {
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-06-21 20:37:11.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-11-28 18:20:04.245270846 -0600
@@ -31,7 +31,7 @@
#include <string>
#include "talk/base/scoped_ptr.h"
#include "talk/base/stl_decl.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace buzz {
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-06-21 20:37:09.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-11-28 18:20:03.076020148 -0600
@@ -29,7 +29,7 @@
#include "talk/base/basicdefs.h"
#include "talk/xmllite/xmlconstants.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/jid.h"
#include "talk/xmpp/constants.h"
namespace buzz {
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-06-21 20:37:09.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-11-28 18:20:03.139020370 -0600
@@ -29,7 +29,7 @@
#define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_
#include <string>
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/jid.h"
diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-06-21 20:37:09.000000000 -0500
+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-11-28 18:20:03.059020250 -0600
@@ -30,7 +30,7 @@
// also part of the API
#include "talk/xmpp/jid.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlelement.h"

39
redhat/tdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch
Unescape Escape View File

@ -1,39 +0,0 @@
commit f86a25380b4901bbd828dde8f35adb5b789d40c6
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331690526 -0500
Remove "More Applications" from TDE menu.
This partially resolves bug report 653.
diff --git a/kdict/kdict.desktop b/kdict/kdict.desktop
index d274d23..0b63798 100644
--- a/kdict/kdict.desktop
+++ b/kdict/kdict.desktop
@@ -150,4 +150,4 @@ GenericName[zu]=Isichaza magama esixhumekile
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Unique
DocPath=kdict/index.html
-Categories=Qt;KDE;Network;X-KDE-More;Office;Dictionary;
+Categories=Qt;KDE;Network;Office;Dictionary;
diff --git a/knewsticker/knewsticker-standalone.desktop b/knewsticker/knewsticker-standalone.desktop
index b164e52..08d0d1e 100644
--- a/knewsticker/knewsticker-standalone.desktop
+++ b/knewsticker/knewsticker-standalone.desktop
@@ -92,5 +92,5 @@ GenericName[zu]=Umlungiseleli Wezindaba
Terminal=false
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Network;X-KDE-More;News;
+Categories=Qt;KDE;Network;News;
NoDisplay=true
diff --git a/kppp/logview/kppplogview.desktop b/kppp/logview/kppplogview.desktop
index 39ba64f..401718f 100644
--- a/kppp/logview/kppplogview.desktop
+++ b/kppp/logview/kppplogview.desktop
@@ -74,5 +74,5 @@ Path=
Type=Application
Terminal=false
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Network;X-KDE-More;Dialup;
+Categories=Qt;KDE;Network;Dialup;
NoDisplay=true

24
redhat/tdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch
Unescape Escape View File

@ -1,24 +0,0 @@
From caedf8323c45b376c824de343f31de78664b2511 Mon Sep 17 00:00:00 2001
From: Serghei Amelian <serghei.amelian@gmail.com>
Date: Sun, 12 Feb 2012 21:08:53 +0000
Subject: [TDEMacros.cmake] added tde_save_and_set() macro
---
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 075b7eb..1091755 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -1283,6 +1283,11 @@ macro( tde_save )
endforeach()
endmacro()
+macro( tde_save_and_set _var )
+ set( __bak_${_var} ${${_var}} )
+ set( ${_var} ${ARGN} )
+endmacro( )
+
macro( tde_restore )
foreach( _var ${ARGN} )
set( ${_var} ${__bak_${_var}} )
--
cgit v0.9.0.2-39-g756e

9
redhat/tdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
Unescape Escape View File

@ -1,9 +0,0 @@
--- kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake.ORI 2012-10-09 20:58:42.674713186 +0200
+++ kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake 2012-10-09 20:59:17.585002712 +0200
@@ -11,5 +11,5 @@
pkg_search_module( XTST xtst )
if( NOT XTST_FOUND )
- tde_message_fatal( "xtst is required, but was not found on your system" )
+ set( XTST_LIBRARIES "-lXtst" )
endif( )

58
redhat/tdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch
Unescape Escape View File

@ -1,58 +0,0 @@
commit 6f17856dec29f6a84d5e38b6db12fdc632cd4394
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1339484900 -0500
Fix build errors
Thanks to Roman Savochenko for the patch!
diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt
index 6c691ae..9539457 100644
--- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
LINK
jabberclient-static idn
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
- qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
+ qca-static cutestuff_network-static cutestuff_util-static kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 9fb5a92..984e843 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg)
m_msg = msg;
KConfigGroup* c = m_account->configGroup();
- TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName");
+ TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
if (provider.isNull())
{
@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
return;
}
- TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
+ TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
if (programName.isNull())
programName = "/usr/bin/sms_client";
@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
prefWidget->configDir->setMode(KFile::Directory);
TQString configDir;
if (m_account)
- configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir");
+ configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"));
if (configDir.isNull())
configDir = "/etc/sms";
prefWidget->configDir->setURL(configDir);
TQString programName;
if (m_account)
- programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
+ programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
if (programName.isNull())
programName = "/usr/bin/sms_client";
prefWidget->program->setURL(programName);

14
redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff
Unescape Escape View File

@ -1,14 +0,0 @@
diff --git a/wifi/ConfigureChecks.cmake b/wifi/ConfigureChecks.cmake
index f3a7ddb..86ca98b 100644
--- a/wifi/ConfigureChecks.cmake
+++ b/wifi/ConfigureChecks.cmake
@@ -21,7 +21,9 @@ endif( )
# check for wireless tools
+tde_save_and_set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-lm" )
check_library_exists( iw iw_get_stats "" HAVE_IW )
+tde_restore( CMAKE_REQUIRED_FLAGS )
if( HAVE_IW )
check_include_file( iwlib.h HAVE_IWLIB_H )
# we need at least wireless tools >= 27

1188
redhat/tdenetwork/kdenetwork-3.5.13.1.spec
View File

File diff suppressed because it is too large Load Diff

1182
redhat/tdenetwork/kdenetwork-3.5.13.spec
View File

File diff suppressed because it is too large Load Diff

9
redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch
Unescape Escape View File

@ -1,9 +0,0 @@
diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop
--- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp 2007-10-08 04:49:13.000000000 -0500
+++ kdenetwork-3.5.8/kppp/Kppp.desktop 2007-10-13 16:03:03.000000000 -0500
@@ -66,5 +66,4 @@ Path=
Type=Application
Terminal=false
X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Network;Dialup;

33
redhat/tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch
Unescape Escape View File

@ -1,33 +0,0 @@
diff -ur kdenetwork-orig/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd
--- kdenetwork-orig/krfb/krfb_httpd/krfb_httpd 2007-05-14 09:40:05.000000000 +0200
+++ kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd 2008-02-26 12:43:21.000000000 +0100
@@ -6,17 +6,14 @@
fi
read request url httptype || exit 0
-url="${url/
-/}"
-httptype="${httptype/
-/}"
+url="${url/ /}"
+httptype="${httptype/ /}"
if [ "x$httptype" != "x" ]; then
line="x"
while [ -n "$line" ]; do
read line || exit 0
- line="${line/
-/}"
+ line="${line/ /}"
done
fi
# echo "url = $url, request = $request" >> /tmp/httpd.log
@@ -38,7 +35,7 @@
content="
<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
<BODY>
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
+<APPLET CODE=vncviewer/VNCViewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
<param name=PORT value=$port>
</APPLET>
</BODY></HTML>"

57
redhat/tdenetwork/kdenetwork-kopete-gcc45.patch
Unescape Escape View File

@ -1,57 +0,0 @@
*** kdenetwork/kopete/protocols/testbed/testbedaccount.h.ORI 2011-08-24 00:30:58.403965000 +0200
--- kdenetwork/kopete/protocols/testbed/testbedaccount.h 2011-08-24 00:31:29.706965000 +0200
***************
*** 59,65 ****
/**
* 'Connect' to the testbed server. Only sets myself() online.
*/
! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() );
/**
* Disconnect from the server. Only sets myself() offline.
*/
--- 59,65 ----
/**
* 'Connect' to the testbed server. Only sets myself() online.
*/
! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
/**
* Disconnect from the server. Only sets myself() offline.
*/
*** kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp.ORI 2011-08-24 00:28:22.080965001 +0200
--- kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp 2011-08-24 00:28:36.149965002 +0200
***************
*** 175,181 ****
// the sorting itself is rather slow. Therefore we call delayedSort, which tries
// to group multiple sort requests into one.
using namespace Kopete::UI::ListView;
! if ( ListView::ListView *lv = dynamic_cast<ListView::ListView *>( listView() ) )
lv->delayedSort();
else
listView()->sort();
--- 175,181 ----
// the sorting itself is rather slow. Therefore we call delayedSort, which tries
// to group multiple sort requests into one.
using namespace Kopete::UI::ListView;
! if ( ListView *lv = dynamic_cast<ListView *>( listView() ) )
lv->delayedSort();
else
listView()->sort();
*** kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp.ORI 2011-08-24 00:29:00.953965001 +0200
--- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp 2011-08-24 00:29:21.080965001 +0200
***************
*** 38,44 ****
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
{
! KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false );
}
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )
--- 38,44 ----
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
{
! KopeteRichTextEditPart( wparent, wname, false );
}
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )

91
redhat/tdenetwork/lisa.redhat
Unescape Escape View File

@ -1,91 +0,0 @@
#!/bin/bash
#
# Startup script for LISa
#
# chkconfig: - 92 36
# description: LISa is a small daemon which is intended to run on \
# end user systems. It provides something like a \
# "network neighbourhood", but only relying on the TCP/IP \
# protocol stack, no smb or whatever.\
# The information about the hosts in your "neighbourhood" \
# is provided via TCP port 7741.
# processname: lisa
# config: /etc/lisarc
# Source function library.
. /etc/rc.d/init.d/functions
# Source function library.
if [ -f /etc/init.d/functions ] ; then
. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
. /etc/rc.d/init.d/functions
else
exit 0
fi
# Some definitions.
lisa=/usr/bin/lisa
prog=LISa
OPTIONS="--quiet --config=/etc/lisarc"
RETVAL=0
#
start() {
echo -n $"Starting $prog: "
daemon $lisa $OPTIONS
RETVAL=$?
echo
if [ $RETVAL = 0 ] ; then
touch /var/lock/subsys/lisa
else
RETVAL=1
fi
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
killproc $lisa
RETVAL=$?
echo
if [ $RETVAL = 0 ] ; then
rm -f /var/lock/subsys/lisa
else
RETVAL=1
fi
return $RETVAL
}
reload() {
echo -n $"Reloading $prog: "
killproc $lisa -HUP
RETVAL=$?
echo
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status $lisa
RETVAL=$?
;;
restart)
stop
start
;;
condrestart)
[ -f /var/lock/subsys/lisa ] && restart
;;
*)
echo $"Usage: $prog {start|stop|restart|status|condrestart}"
exit 1
esac
exit $RETVAL

10
redhat/tdenetwork/lisarc
Unescape Escape View File

@ -1,10 +0,0 @@
PingAddresses = 127.0.0.1/255.255.255.0;
PingNames =
AllowedAddresses = 127.0.0.1/255.255.255.0;
BroadcastNetwork = 127.0.0.1/255.255.255.0;
SearchUsingNmblookup = 0
FirstWait = 30
SecondWait = -1
UpdatePeriod = 150
DeliverUnnamedHosts = 1
MaxPingsAtOnce = 256

42
redhat/tdenetwork/r1243951.diff
Unescape Escape View File

@ -1,42 +0,0 @@
Index: kdenetwork/kopete/libkopete/avdevice/configure.in.in
===================================================================
--- kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 0)
+++ kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 1243951)
@@ -0,0 +1,21 @@
+# -- Check for libv4l1-videodev.h presence --------------------
+
+AC_MSG_CHECKING([for libv4l1-videodev.h])
+
+AC_TRY_COMPILE([
+#include <libv4l1-videodev.h>
+],
+[
+],
+ ac_have_libv4l1_videodev_h=yes
+,
+ ac_have_libv4l1_videodev_h=no
+)
+
+if test $ac_have_libv4l1_videodev_h = yes; then
+ AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed])
+fi
+
+AC_MSG_RESULT($ac_have_libv4l1_videodev_h)
+
+# -- End libv4l1-videodev.h ----------------------------------------------
Index: kdenetwork/kopete/libkopete/avdevice/videodevice.h
===================================================================
--- kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243950)
+++ kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243951)
@@ -52,7 +52,11 @@
#include <linux/fs.h>
#include <linux/kernel.h>
+#if defined(HAVE_LIBV4L1_VIDEODEV_H)
+#include <libv4l1-videodev.h>
+#else
#include <linux/videodev.h>
+#endif
#define VIDEO_MODE_PAL_Nc 3
#define VIDEO_MODE_PAL_M 4
#define VIDEO_MODE_PAL_N 5

14
redhat/tdenetwork/tdenetwork-14.0.0.spec
Unescape Escape View File

@ -52,14 +52,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
# [kdenetwork] Missing LDFLAGS cause FTBFS
Patch1: kdenetwork-3.5.13-missing_ldflags.patch
# RHEL4 specific
Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
BuildRequires: cmake >= 2.8
BuildRequires: gettext
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -1116,12 +1108,6 @@ update-desktop-database 2> /dev/null || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ldflags
%if 0%{?rhel} == 4
%patch201 -p1 -b .rhel4
%patch202 -p1 -b .rhel4
%endif
%build
unset QTDIR QTINC QTLIB

35
redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
Unescape Escape View File

@ -1,35 +0,0 @@
--- trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2013-06-17 19:40:31.327502606 +0200
+++ trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp 2013-06-17 19:43:02.745097904 +0200
@@ -44,32 +44,6 @@
#include "kopeteaccountmanager.h"
#include "kopeteaway.h"
-/* The following is a hack:
- * e.g. Mandrake 9.x ships with a patched
- * kernel which doesn't define this 64 bit types (we need GNU C lib
- * because we use long long and warning - gcc extensions.)
- *
- * This is caused by the !defined(__STRICT_ANSI__) check in
- * /usr/include/asm/types.h
- */
-#if !defined(__u64) && defined(__GNUC__)
-#if SIZEOF_UNSIGNED_LONG >= 8
-typedef unsigned long __u64;
-#else
-typedef unsigned long long __u64;
-#endif
-#endif
-
-#if !defined(__s64) && defined(__GNUC__)
-#if SIZEOF_LONG >= 8
-typedef signed long __s64;
-#else
-typedef __signed__ long long __s64;
-#endif
-#endif
-/*
- * End hack
- */
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)

22
redhat/tdenetwork/tdenetwork-3.5.13.2.spec
Unescape Escape View File

@ -52,19 +52,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
# RedHat/Fedora legacy patches
Patch3: kdenetwork-3.5.8-kppp.patch
Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
# [kdenetwork] Missing LDFLAGS cause FTBFS
Patch1: kdenetwork-3.5.13-missing_ldflags.patch
# RHEL4 specific
Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
BuildRequires: cmake >= 2.8
BuildRequires: gettext
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -1075,15 +1062,6 @@ update-desktop-database 2> /dev/null || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ldflags
%patch3 -p1 -b .kppp
%patch4 -p1 -b .resolv
%patch6 -p1 -b .krfb_httpd
%if 0%{?rhel} == 4
%patch201 -p1 -b .rhel4
%patch202 -p1 -b .rhel4
%endif
%build
unset QTDIR QTINC QTLIB

Write Preview
Loading…
Cancel
Save