Francois Andriot
12 years ago
parent
4a5605e233
commit
01d4b602ce
@ -0,0 +1,22 @@
|
||||
--- kio-locate/src/SConscript.ORI 2012-05-02 00:23:36.637608539 +0200
|
||||
+++ kio-locate/src/SConscript 2012-05-02 00:23:44.142459165 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
pattern.cpp
|
||||
"""
|
||||
obj.libs='tqt kio'
|
||||
-obj.linkflags='-module' # add more link flags
|
||||
+#obj.linkflags='-module' # add more link flags
|
||||
obj.execute()
|
||||
|
||||
# Install the protocol files
|
||||
--- kio-locate/admin/kde.py.ORI 2012-05-02 00:37:55.095993387 +0200
|
||||
+++ kio-locate/admin/kde.py 2012-05-02 00:38:34.615142101 +0200
|
||||
@@ -781,7 +781,7 @@
|
||||
lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
|
||||
|
||||
if env['_INSTALL']:
|
||||
- dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
|
||||
+ dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
|
||||
comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
|
||||
lenv.Execute(comp)
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
commit 5106117b5c1439d3fee08395c1a025f62d30a53e
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1335631986 -0500
|
||||
|
||||
GCC 4.7 fixes.
|
||||
|
||||
diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
|
||||
index ebf7b0d..c4bf580 100644
|
||||
--- a/src/gstplayer.cpp
|
||||
+++ b/src/gstplayer.cpp
|
||||
@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) {
|
||||
gstapp->exec ();
|
||||
|
||||
XLockDisplay(display);
|
||||
- XClientMessageEvent ev = {
|
||||
- ClientMessage, 0, true, display, wid,
|
||||
- XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"}
|
||||
- };
|
||||
- XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev);
|
||||
+ XEvent ev;
|
||||
+ ev.xclient.type = ClientMessage;
|
||||
+ ev.xclient.serial = 0;
|
||||
+ ev.xclient.send_event = true;
|
||||
+ ev.xclient.display = display;
|
||||
+ ev.xclient.window = wid;
|
||||
+ ev.xclient.message_type = XInternAtom (display, "XVIDEO", false);
|
||||
+ ev.xclient.format = 8;
|
||||
+ strcpy(ev.xclient.data.b, "quit_now");
|
||||
+ XSendEvent (display, wid, false, StructureNotifyMask, &ev);
|
||||
XFlush (display);
|
||||
XUnlockDisplay(display);
|
||||
eventThread->wait (500);
|
||||
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
|
||||
index 27b26cd..bdeac91 100644
|
||||
--- a/src/kmplayerapp.cpp
|
||||
+++ b/src/kmplayerapp.cpp
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
#undef Always
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
// include files for QT
|
||||
#include <tqdatastream.h>
|
||||
#include <tqregexp.h>
|
||||
@ -0,0 +1,39 @@
|
||||
--- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig 2012-05-02 04:58:04.051212974 -0400
|
||||
+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp 2012-05-02 05:07:11.093803088 -0400
|
||||
@@ -305,14 +305,15 @@
|
||||
if ( m_zone && ! m_host ) {
|
||||
if ( onOff ) {
|
||||
m_protocolUsage = 0;
|
||||
- if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
|
||||
+ KMFProtocolUsage* pro;
|
||||
+ if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
|
||||
m_protocolUsage = pro;
|
||||
} else {
|
||||
KMFUndoEngine::instance()->startTransaction(
|
||||
m_zone,
|
||||
i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
|
||||
);
|
||||
- KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
|
||||
+ pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
|
||||
|
||||
if ( pro ) {
|
||||
kdDebug() << "Added Protocol to zone: " << m_zone-> name() << endl;
|
||||
@@ -341,15 +342,16 @@
|
||||
} else if ( m_host ) {
|
||||
if ( onOff ) {
|
||||
m_protocolUsage = 0;
|
||||
+ KMFProtocolUsage* pro;
|
||||
|
||||
- if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
|
||||
+ if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
|
||||
m_protocolUsage = pro;
|
||||
} else {
|
||||
KMFUndoEngine::instance()->startTransaction(
|
||||
m_host,
|
||||
i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
|
||||
);
|
||||
- KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
|
||||
+ pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
|
||||
|
||||
if ( pro ) {
|
||||
kdDebug() << "Added Protocol to host: " << m_host-> name() << endl;
|
||||
@ -0,0 +1,11 @@
|
||||
--- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI 2012-05-02 05:22:43.788349181 -0400
|
||||
+++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp 2012-05-02 05:23:01.910909490 -0400
|
||||
@@ -20,6 +20,8 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
// ----------------------------------------------------------------------------
|
||||
// QT Includes
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1335632256 -0500
|
||||
|
||||
GCC 4.7 fixes.
|
||||
|
||||
diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
|
||||
index 94ece59..9356e5c 100644
|
||||
--- a/krusader/UserAction/tstring.h
|
||||
+++ b/krusader/UserAction/tstring.h
|
||||
@@ -14,6 +14,9 @@
|
||||
#include <tqvaluelist.h>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
+
|
||||
+using namespace std;
|
||||
+
|
||||
template <class T>
|
||||
class TagString_t
|
||||
{
|
||||
@ -0,0 +1,113 @@
|
||||
# Default version for this component
|
||||
%define kdecomp kvpnc
|
||||
%define version 0.9.6a
|
||||
%define release 1
|
||||
|
||||
# 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.13 specific building variables
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
%define tde_docdir %{_docdir}/kde
|
||||
%define tde_includedir %{_includedir}/kde
|
||||
%define tde_libdir %{_libdir}/trinity
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: vpn clients frontend for TDE
|
||||
Version: %{?version}
|
||||
Release: %{?release}%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-master.tar.gz
|
||||
Source1: admin-master.tar.gz
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-kdelibs-devel
|
||||
BuildRequires: trinity-kdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
%description
|
||||
KVpnc is a TDE frontend for various vpn clients.
|
||||
|
||||
It supports :
|
||||
* Cisco-compatible VPN client (vpnc)
|
||||
* IPSec (freeswan, openswan, racoon)
|
||||
* Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
|
||||
* Virtual Private Network daemon (openvpn)
|
||||
|
||||
|
||||
%prep
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
%setup -q -n %{kdecomp}-master
|
||||
|
||||
# 'admin' folder from GIT
|
||||
%setup -q -n %{kdecomp}-master -a 1
|
||||
%__rm -rf admin
|
||||
%__mv -f admin-master admin
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
|
||||
-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
|
||||
|
||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
|
||||
|
||||
%configure \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{_includedir}/tqt \
|
||||
--enable-closure
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING README TODO
|
||||
|
||||
|
||||
|
||||
%Changelog
|
||||
* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1
|
||||
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
Loading…
Reference in new issue