Francois Andriot
12 years ago
parent
14b5a10d92
commit
2b16f5c5f9
@ -0,0 +1,124 @@
|
||||
# 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
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{_prefix}/bin
|
||||
%define tde_includedir %{_prefix}/include
|
||||
%define tde_datadir %{_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_tdedocdir %{tde_docdir}/kde
|
||||
%define tde_libdir %{_prefix}/%{_lib}
|
||||
|
||||
|
||||
Name: avahi-tqt
|
||||
Version: 3.5.13
|
||||
Release: 1%{?dist}%{?_variant}
|
||||
License: GPL
|
||||
Summary: Avahi TQT Interface
|
||||
Group: System Environment/Libraries
|
||||
|
||||
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: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: qt3-devel >= 3.3.8.d
|
||||
BuildRequires: tqtinterface-devel >= 3.5.13
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: dbus-devel
|
||||
|
||||
%if 0%{?mgaversion}
|
||||
BuildRequires: %{_lib}avahi-client-devel
|
||||
BuildRequires: %{_lib}expat1-devel
|
||||
Provides: %{_lib}avahi-qt3
|
||||
%else
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: expat-devel
|
||||
%endif
|
||||
|
||||
Requires: qt3 >= 3.3.8.d
|
||||
Requires: tqtinterface >= 3.5.13
|
||||
|
||||
Provides: avahi-qt3
|
||||
|
||||
%description
|
||||
Avahi TQT Interface
|
||||
|
||||
|
||||
%package devel
|
||||
Requires: %{name}
|
||||
Summary: %{name} - Development files
|
||||
Group: Development/Libraries
|
||||
|
||||
%if 0%{?mgaversion}
|
||||
Provides: %{_lib}avahi-qt3-devel
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
Development files for %{name}
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n dependencies/%{name}
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i "acinclude.m4" \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
|
||||
|
||||
# Removes stale libtool stuff
|
||||
%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
|
||||
|
||||
%build
|
||||
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
|
||||
export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
|
||||
|
||||
./autogen.sh
|
||||
|
||||
%configure \
|
||||
--exec-prefix=%{_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--docdir=%{tde_docdir} \
|
||||
--includedir=%{tde_includedir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--enable-compat-libdns_sd \
|
||||
--with-systemdsystemunitdir=/lib/systemd/system \
|
||||
MOC_QT3=%{tde_bindir}/moc-tqt
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%__rm -rf %{?buildroot}
|
||||
%__make install DESTDIR=%{?buildroot}
|
||||
|
||||
%clean
|
||||
%__rm -rf %{?buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%{tde_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{tde_includedir}/%{name}
|
||||
%{tde_libdir}/*.so
|
||||
%{tde_libdir}/*.la
|
||||
%{tde_libdir}/pkgconfig/*.pc
|
||||
%exclude %{tde_libdir}/libavahi-tqt.a
|
||||
|
||||
%changelog
|
||||
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
|
||||
- Initial build for TDE 3.5.13
|
||||
@ -0,0 +1,22 @@
|
||||
--- kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am.ORI 2012-07-31 13:37:10.811009510 +0200
|
||||
+++ kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am 2012-07-31 13:37:33.505555438 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
METASOURCES = AUTO
|
||||
libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
|
||||
lib_LTLIBRARIES = libKTTSD_Lib.la
|
||||
-libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
|
||||
+libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt -lDCOP
|
||||
noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
|
||||
|
||||
kspeech_DIR = $(KTTS_KSPEECH_DIR)
|
||||
--- kdeaccessibility/kttsd/libkttsd/Makefile.am.ORI 2012-07-31 17:09:08.905460827 +0200
|
||||
+++ kdeaccessibility/kttsd/libkttsd/Makefile.am 2012-07-31 17:09:20.272109013 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
notify.cpp
|
||||
|
||||
libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
|
||||
-libkttsd_la_LIBADD = $(LIB_KIO)
|
||||
+libkttsd_la_LIBADD = $(LIB_KIO) -lqt-mt -lkdeui -lkdecore
|
||||
|
||||
# Header files that should not be installed.
|
||||
noinst_HEADERS = \
|
||||
@ -0,0 +1,17 @@
|
||||
commit d3d702117d757d6c16d0dd41969bc44229123330
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1331690654 -0500
|
||||
|
||||
Remove "More Applications" from TDE menu.
|
||||
This partially resolves bug report 653.
|
||||
|
||||
diff --git a/kdat/kdat.desktop b/kdat/kdat.desktop
|
||||
index 3aeb7ac..7016d05 100644
|
||||
--- a/kdat/kdat.desktop
|
||||
+++ b/kdat/kdat.desktop
|
||||
@@ -89,4 +89,4 @@ X-KDE-StartupNotify=true
|
||||
DocPath=kdat/index.html
|
||||
Terminal=false
|
||||
X-DCOP-ServiceType=Multi
|
||||
-Categories=Qt;KDE;System;X-KDE-More;
|
||||
+Categories=Qt;KDE;System;
|
||||
@ -0,0 +1,76 @@
|
||||
commit 80deb52955cbd917e10f015f37699d830cb681ce
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: 1339336699 +0200
|
||||
|
||||
Add xscreensaver support to CMake
|
||||
This closes Bug 859
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 31fb46c..3da5b2f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -67,6 +67,7 @@
|
||||
option( WITH_XDAMAGE "Enable xdamage support" OFF )
|
||||
option( WITH_XEXT "Enable xext support" OFF )
|
||||
option( WITH_XTEST "Enable xext support" OFF )
|
||||
+option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
|
||||
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
|
||||
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
|
||||
option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
|
||||
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
|
||||
index ded1d00..1d9c83d 100644
|
||||
--- a/ConfigureChecks.cmake
|
||||
+++ b/ConfigureChecks.cmake
|
||||
@@ -144,6 +144,26 @@ if( WITH_XTEST )
|
||||
endif( )
|
||||
|
||||
|
||||
+# xscreensaver ()
|
||||
+if( WITH_XSCREENSAVER )
|
||||
+ check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
|
||||
+ if( HAVE_XSSLIB )
|
||||
+ pkg_search_module( XSS xscrnsaver )
|
||||
+ else( )
|
||||
+ check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
|
||||
+ if( HAVE_XSSLIB )
|
||||
+ pkg_search_module( XSS xext )
|
||||
+ endif( )
|
||||
+ endif( )
|
||||
+ check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
|
||||
+ if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
|
||||
+ set( HAVE_XSCREENSAVER 1 )
|
||||
+ else( )
|
||||
+ tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
|
||||
+ endif( )
|
||||
+endif( )
|
||||
+
|
||||
+
|
||||
# GL
|
||||
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
|
||||
check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
|
||||
diff --git a/config.h.cmake b/config.h.cmake
|
||||
index 39d6d85..772ca88 100644
|
||||
--- a/config.h.cmake
|
||||
+++ b/config.h.cmake
|
||||
@@ -21,6 +21,9 @@
|
||||
// kxkb
|
||||
#cmakedefine HAVE_XTEST 1
|
||||
|
||||
+// xscreensaver
|
||||
+#cmakedefine HAVE_XSCREENSAVER 1
|
||||
+
|
||||
// kdm, kioslave
|
||||
#cmakedefine HAVE_TERMIOS_H 1
|
||||
|
||||
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
|
||||
index 99d86d1..b2e4628 100644
|
||||
--- a/kdesktop/CMakeLists.txt
|
||||
+++ b/kdesktop/CMakeLists.txt
|
||||
@@ -94,6 +94,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
|
||||
kdesktopsettings-static bgnd-static dmctl-static
|
||||
konq-shared kutils-shared
|
||||
${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
|
||||
+ ${XSS_LIBRARIES}
|
||||
)
|
||||
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
@ -0,0 +1,10 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_permit.so
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include system-auth
|
||||
session required pam_loginuid.so
|
||||
session optional pam_console.so
|
||||
@ -0,0 +1,13 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_succeed_if.so
|
||||
auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
|
||||
auth substack system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_loginuid.so
|
||||
session include system-auth
|
||||
session optional pam_console.so
|
||||
session required pam_namespace.so
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,32 @@
|
||||
--- kdebindings/smoke/kde/Makefile.am.ORI 2012-07-30 14:03:33.850946697 +0200
|
||||
+++ kdebindings/smoke/kde/Makefile.am 2012-07-30 14:04:22.961921086 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
|
||||
|
||||
# the libraries to link against.
|
||||
-libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB)
|
||||
+libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -lqt-mt -lkdeui -lkdecore -lDCOP -lkio -lkparts -lkdefx
|
||||
|
||||
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
|
||||
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
|
||||
--- kdebindings/kdejava/koala/kdejava/Makefile.am.ORI 2012-07-30 14:18:07.024345627 +0200
|
||||
+++ kdebindings/kdejava/koala/kdejava/Makefile.am 2012-07-30 14:18:19.055092255 +0200
|
||||
@@ -33,6 +33,6 @@
|
||||
|
||||
libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
|
||||
|
||||
-libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
|
||||
+libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -lkdecore -lkparts -lkdeui -lkutils -lDCOP -lkdefx -lkdeprint
|
||||
|
||||
KDE_OPTIONS = qtonly nofinal
|
||||
--- kdebindings/xparts/src/kde/Makefile.am.ORI 2012-07-30 14:27:24.347613550 +0200
|
||||
+++ kdebindings/xparts/src/kde/Makefile.am 2010-08-12 05:12:49.000000000 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
|
||||
kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
|
||||
-libkdexparts_la_LIBADD = $(LIB_KPARTS)
|
||||
+libkdexparts_la_LIBADD = $(LIB_KPARTS) -lDCOP -lqt-mt -lkdecore -lkdeui
|
||||
libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
|
||||
|
||||
xpart_DIR=$(srcdir)/../interfaces
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,18 @@
|
||||
commit 9d1871a43cd11869f9a1eac7f6e1c6ae23b84072
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1330147966 -0600
|
||||
|
||||
Fix kbruch/Makefile.am to eliminate build error.
|
||||
This resolves bug report 786.
|
||||
|
||||
diff --git a/kbruch/Makefile.am b/kbruch/Makefile.am
|
||||
index b2c27d1..7b159ff 100644
|
||||
--- a/kbruch/Makefile.am
|
||||
+++ b/kbruch/Makefile.am
|
||||
@@ -2,5 +2,5 @@ SUBDIRS = src testcases
|
||||
|
||||
EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION
|
||||
|
||||
-VERSION:=`cat ${PWD}/VERSION`
|
||||
+VERSION=`cat ${PWD}/VERSION`
|
||||
include ../admin/Doxyfile.am
|
||||
@ -0,0 +1,51 @@
|
||||
commit 0cd3b7cec9eed70d39e1ae884d76db585790c9a3
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1327530864 -0600
|
||||
|
||||
Fix linear alphabet string errors
|
||||
|
||||
diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c
|
||||
index e83db54..2842451 100644
|
||||
--- a/kstars/kstars/indi/base64.c
|
||||
+++ b/kstars/kstars/indi/base64.c
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "base64.h"
|
||||
|
||||
static const char base64digits[] =
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
#define BAD (-1)
|
||||
static const char base64val[] = {
|
||||
diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config
|
||||
index 46d7edd..409a07c 100644
|
||||
--- a/ktouch/extras/training-gen/perl/dk.config
|
||||
+++ b/ktouch/extras/training-gen/perl/dk.config
|
||||
@@ -16,4 +16,4 @@ wn
|
||||
cæ
|
||||
x
|
||||
,.
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ
|
||||
\ No newline at end of file
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ
|
||||
\ No newline at end of file
|
||||
diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config
|
||||
index cca1346..bb5df1a 100644
|
||||
--- a/ktouch/extras/training-gen/perl/en.config
|
||||
+++ b/ktouch/extras/training-gen/perl/en.config
|
||||
@@ -12,4 +12,4 @@ qu
|
||||
wn
|
||||
cx
|
||||
yz
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config
|
||||
index 1efd7b7..49b8b32 100644
|
||||
--- a/ktouch/extras/training-gen/perl/es.config
|
||||
+++ b/ktouch/extras/training-gen/perl/es.config
|
||||
@@ -14,4 +14,4 @@ qu
|
||||
wnñ
|
||||
cx
|
||||
yz
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
@ -0,0 +1,17 @@
|
||||
commit b83d045598947bb355ed6a2996b24225da6a9ffa
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1326310679 -0600
|
||||
|
||||
Fix kdeedu makefile glitch
|
||||
This closes Bug 785
|
||||
|
||||
diff --git a/kalzium/src/solver/Makefile b/kalzium/src/solver/Makefile
|
||||
index 4b96fdb..6012982 100644
|
||||
--- a/kalzium/src/solver/Makefile
|
||||
+++ b/kalzium/src/solver/Makefile
|
||||
@@ -89,4 +89,4 @@ install :
|
||||
.depend: parser.ml lexer.ml
|
||||
$(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
|
||||
|
||||
-include .depend
|
||||
+-include .depend
|
||||
@ -0,0 +1,55 @@
|
||||
--- kdeedu/libkdeedu/kdeeducore/Makefile.am.ORI 2012-08-01 16:03:57.158018060 +0200
|
||||
+++ kdeedu/libkdeedu/kdeeducore/Makefile.am 2012-08-01 16:04:06.206657197 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
libkdeeducode_includedir = $(includedir)/libkdeedu
|
||||
libkdeeducode_include_HEADERS = keduvocdata.h
|
||||
|
||||
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
|
||||
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdeedu/libkdeedu/kdeeduui/Makefile.am.ORI 2012-08-01 16:08:47.875060426 +0200
|
||||
+++ kdeedu/libkdeedu/kdeeduui/Makefile.am 2012-08-01 16:08:53.275867176 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
libkdeeduuiinclude_HEADERS = kdeeduglossary.h
|
||||
|
||||
libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
|
||||
-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
|
||||
+libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdeedu/libkdeedu/extdate/Makefile.am.ORI 2012-08-01 16:10:28.272515295 +0200
|
||||
+++ kdeedu/libkdeedu/extdate/Makefile.am 2012-08-01 16:10:37.999176797 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
|
||||
|
||||
libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
|
||||
-libextdate_la_LIBADD = $(LIB_KDEUI)
|
||||
+libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
test_extdate_SOURCES = test_extdate.cc
|
||||
test_extdate_LDADD = libextdate.la
|
||||
--- kdeedu/kiten/Makefile.am.ORI 2012-08-01 16:15:45.679552203 +0200
|
||||
+++ kdeedu/kiten/Makefile.am 2012-08-01 16:15:53.606341454 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
lib_LTLIBRARIES = libkiten.la
|
||||
|
||||
libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
|
||||
-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
|
||||
+libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
|
||||
deinf.cpp kitenconfig.kcfgc
|
||||
--- kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am.ORI 2012-08-01 16:24:48.865399440 +0200
|
||||
+++ kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am 2012-08-01 16:24:54.832227336 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
SUBDIRS = kvt-xml
|
||||
|
||||
-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
|
||||
+libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
|
||||
+libkvoctraincore_la_LDFLAGS = $(QT_LDFLAGS)
|
||||
|
||||
noinst_HEADERS = grammarmanager.h
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,44 @@
|
||||
--- kdegames/libkdegames/Makefile.am.ORI 2012-07-31 20:25:24.961859509 +0200
|
||||
+++ kdegames/libkdegames/Makefile.am 2012-07-31 20:25:32.306619391 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
lib_LTLIBRARIES = libkdegames.la
|
||||
libkdegames_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
|
||||
libkdegames_la_LIBADD = highscore/libkhighscore.la kgame/libkgame.la kgame/dialogs/libkgamedialogs.la \
|
||||
- $(LIB_KSYCOCA) $(LIB_KDNSSD)
|
||||
+ $(LIB_KSYCOCA) $(LIB_KDNSSD) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
|
||||
|
||||
libkdegames_la_SOURCES = kcarddialog.cpp kstdgameaction.cpp \
|
||||
kgamemisc.cpp kchatbase.cpp kchat.cpp \
|
||||
--- kdegames/atlantik/libatlantikclient/Makefile.am.ORI 2012-07-31 20:26:55.089913155 +0200
|
||||
+++ kdegames/atlantik/libatlantikclient/Makefile.am 2012-07-31 20:27:00.414739083 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
|
||||
lib_LTLIBRARIES = libatlantikclient.la
|
||||
libatlantikclient_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
|
||||
-libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
|
||||
+libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE)
|
||||
|
||||
libatlantikclient_la_SOURCES = atlantik_network.cpp monopdprotocol.cpp
|
||||
|
||||
--- kdegames/atlantik/libatlantikui/Makefile.am.ORI 2012-07-31 20:29:44.177385572 +0200
|
||||
+++ kdegames/atlantik/libatlantikui/Makefile.am 2012-07-31 20:30:27.821958801 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
|
||||
lib_LTLIBRARIES = libatlantikui.la
|
||||
libatlantikui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
|
||||
-libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
|
||||
+libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
|
||||
|
||||
libatlantikui_la_SOURCES = auction_widget.cpp board.cpp estatedetails.cpp \
|
||||
estateview.cpp kwrappedlistviewitem.cpp portfolioestate.cpp \
|
||||
--- kdegames/kolf/Makefile.am.ORI 2012-07-31 20:38:20.125518870 +0200
|
||||
+++ kdegames/kolf/Makefile.am 2012-07-31 20:38:30.672174091 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
floater.cpp slope.cpp
|
||||
|
||||
libkolf_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
|
||||
-libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde
|
||||
+libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -lkdefx -lsoundserver_idl -lartsmodules
|
||||
libkolf_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,41 @@
|
||||
commit b2d01d000c11d7c0dd183e1af059f81ac5249c25
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1339541595 -0500
|
||||
|
||||
Add poppler-tqt.pc file
|
||||
|
||||
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
index d07e813..42d50a8 100644
|
||||
--- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
+++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
@@ -28,6 +28,12 @@ link_directories(
|
||||
${TQT_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
+##### pc files ##################################
|
||||
+
|
||||
+configure_file( poppler-tqt.pc.cmake poppler-tqt.pc @ONLY )
|
||||
+
|
||||
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
|
||||
+
|
||||
##### headers ###################################
|
||||
|
||||
install( FILES
|
||||
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
|
||||
new file mode 100644
|
||||
index 0000000..ce2b40d
|
||||
--- /dev/null
|
||||
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
|
||||
@@ -0,0 +1,12 @@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+exec_prefix=${prefix}
|
||||
+libdir=${exec_prefix}/lib
|
||||
+includedir=${prefix}/include
|
||||
+
|
||||
+Name: poppler-tqt
|
||||
+Description: TQt bindings for poppler
|
||||
+Version: @POPPLER_VERSION@
|
||||
+Requires: poppler = @POPPLER_VERSION@
|
||||
+
|
||||
+Libs: -L${libdir} -lpoppler-tqt
|
||||
+Cflags: -I${includedir}
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2012-08-01 19:42:18.057554419 +0200
|
||||
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2012-08-01 19:42:28.320371892 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
install( FILES
|
||||
poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
|
||||
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
|
||||
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
|
||||
|
||||
##### poppler-tqt (shared) ############################
|
||||
|
||||
@ -0,0 +1,100 @@
|
||||
commit 513ffc6edff67b5f7f121c3064b059ce82cbb842
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1341187933 -0500
|
||||
|
||||
Add ability to set KLed off color
|
||||
|
||||
diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp
|
||||
index 3a3aa2a..dc245cd 100644
|
||||
--- a/kdeui/kled.cpp
|
||||
+++ b/kdeui/kled.cpp
|
||||
@@ -536,6 +536,12 @@ KLed::color() const
|
||||
return led_color;
|
||||
}
|
||||
|
||||
+TQColor
|
||||
+KLed::offColor() const
|
||||
+{
|
||||
+ return led_off_color;
|
||||
+}
|
||||
+
|
||||
KLed::Look
|
||||
KLed::look() const
|
||||
{
|
||||
@@ -581,6 +587,17 @@ KLed::setColor(const TQColor& col)
|
||||
}
|
||||
|
||||
void
|
||||
+KLed::setOffColor(const TQColor& col)
|
||||
+{
|
||||
+ if(led_off_color!=col) {
|
||||
+ if(d->on_map) { delete d->on_map; d->on_map = 0; }
|
||||
+ if(d->off_map) { delete d->off_map; d->off_map = 0; }
|
||||
+ d->offcolor = col;
|
||||
+ update();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
KLed::setDarkFactor(int darkfactor)
|
||||
{
|
||||
if (d->dark_factor != darkfactor) {
|
||||
diff --git a/kdeui/kled.h b/kdeui/kled.h
|
||||
index 7b9f327..b4f828e 100644
|
||||
--- a/kdeui/kled.h
|
||||
+++ b/kdeui/kled.h
|
||||
@@ -50,6 +50,7 @@ class TDEUI_EXPORT KLed : public TQWidget
|
||||
Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
|
||||
Q_PROPERTY( Look look READ look WRITE setLook )
|
||||
Q_PROPERTY( TQColor color READ color WRITE setColor )
|
||||
+ Q_PROPERTY( TQColor offColor READ color WRITE setOffColor )
|
||||
Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
|
||||
|
||||
public:
|
||||
@@ -148,6 +149,14 @@ public:
|
||||
TQColor color() const;
|
||||
|
||||
/**
|
||||
+ * Returns the off color of the widget
|
||||
+ *
|
||||
+ * @see OffColor
|
||||
+ * @short Returns LED off color.
|
||||
+ */
|
||||
+ TQColor offColor() const;
|
||||
+
|
||||
+ /**
|
||||
* Returns the look of the widget.
|
||||
*
|
||||
* @see Look
|
||||
@@ -204,6 +213,23 @@ public:
|
||||
void setColor(const TQColor& color);
|
||||
|
||||
/**
|
||||
+ * Set the off color of the widget.
|
||||
+ * The Color is shown with the KLed::On state.
|
||||
+ * The KLed::Off state is shown with this color if set
|
||||
+ *
|
||||
+ * The widget calls the update() method, so it will
|
||||
+ * be updated when entering the main event loop.
|
||||
+ *
|
||||
+ * Note that calling setColor will override this value
|
||||
+ *
|
||||
+ * @see Color
|
||||
+ *
|
||||
+ * @param color New off color of the LED.
|
||||
+ * @short Sets the LED off color.
|
||||
+ */
|
||||
+ void setOffColor(const TQColor& color);
|
||||
+
|
||||
+ /**
|
||||
* Sets the factor to darken the LED in OFF state.
|
||||
* Same as TQColor::dark().
|
||||
* "darkfactor should be greater than 100, else the LED gets lighter
|
||||
@@ -316,6 +342,7 @@ protected:
|
||||
private:
|
||||
State led_state;
|
||||
TQColor led_color;
|
||||
+ TQColor led_off_color;
|
||||
Look led_look;
|
||||
Shape led_tqshape;
|
||||
|
||||
@ -0,0 +1,178 @@
|
||||
commit d3a9d56143cf668c7d29b26a324a424d02036371
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1337109016 -0500
|
||||
|
||||
Add the ability to force read-only configuration file access in a TDE application
|
||||
Force kde-config to use read-only access
|
||||
This closes Bug 293
|
||||
|
||||
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
|
||||
index 9ee9dd6..4ad0e5f 100644
|
||||
--- a/kdecore/kconfigbackend.cpp
|
||||
+++ b/kdecore/kconfigbackend.cpp
|
||||
@@ -247,17 +247,22 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
|
||||
mfileName = _fileName;
|
||||
resType = _resType;
|
||||
useKDEGlobals = _useKDEGlobals;
|
||||
- if (mfileName.isEmpty())
|
||||
+ if (mfileName.isEmpty()) {
|
||||
mLocalFileName = TQString::null;
|
||||
- else if (!TQDir::isRelativePath(mfileName))
|
||||
+ }
|
||||
+ else if (!TQDir::isRelativePath(mfileName)) {
|
||||
mLocalFileName = mfileName;
|
||||
- else
|
||||
- mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName;
|
||||
+ }
|
||||
+ else {
|
||||
+ mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
|
||||
+ }
|
||||
|
||||
- if (useKDEGlobals)
|
||||
+ if (useKDEGlobals) {
|
||||
mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
|
||||
- else
|
||||
+ }
|
||||
+ else {
|
||||
mGlobalFileName = TQString::null;
|
||||
+ }
|
||||
|
||||
d->localLastModified = TQDateTime();
|
||||
d->localLastSize = 0;
|
||||
diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
|
||||
index 9ad6600..c5c0a4e 100644
|
||||
--- a/kdecore/kconfigbase.cpp
|
||||
+++ b/kdecore/kconfigbase.cpp
|
||||
@@ -1139,16 +1139,18 @@ static TQString translatePath( TQString path )
|
||||
|
||||
// return original path, if it refers to another type of URL (e.g. http:/), or
|
||||
// if the path is already relative to another directory
|
||||
- if (!startsWithFile && path[0] != '/' ||
|
||||
- startsWithFile && path[5] != '/')
|
||||
+ if (((!startsWithFile) && (path[0] != '/')) || (startsWithFile && (path[5] != '/'))) {
|
||||
return path;
|
||||
+ }
|
||||
|
||||
- if (startsWithFile)
|
||||
+ if (startsWithFile) {
|
||||
path.remove(0,5); // strip leading "file:/" off the string
|
||||
+ }
|
||||
|
||||
// keep only one single '/' at the beginning - needed for cleanHomeDirPath()
|
||||
- while (path[0] == '/' && path[1] == '/')
|
||||
+ while (path[0] == '/' && path[1] == '/') {
|
||||
path.remove(0,1);
|
||||
+ }
|
||||
|
||||
// we can not use KGlobal::dirs()->relativeLocation("home", path) here,
|
||||
// since it would not recognize paths without a trailing '/'.
|
||||
diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
|
||||
index fe0a515..5b3aa86 100644
|
||||
--- ./kdecore/kinstance.cpp.orig 2011-08-11 04:30:15.000000000 +0200
|
||||
+++ ./kdecore/kinstance.cpp 2012-06-18 23:34:55.942376042 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
: _dirs (0L),
|
||||
_config (0L),
|
||||
_iconLoader (0L),
|
||||
- _name( name ), _aboutData( new KAboutData( name, "", 0 ) )
|
||||
+ _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
|
||||
{
|
||||
DEBUG_ADD
|
||||
Q_ASSERT(!name.isEmpty());
|
||||
@@ -88,7 +88,7 @@
|
||||
: _dirs (0L),
|
||||
_config (0L),
|
||||
_iconLoader (0L),
|
||||
- _name( aboutData->appName() ), _aboutData( aboutData )
|
||||
+ _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
|
||||
{
|
||||
DEBUG_ADD
|
||||
Q_ASSERT(!_name.isEmpty());
|
||||
@@ -107,7 +107,7 @@
|
||||
: _dirs ( src->_dirs ),
|
||||
_config ( src->_config ),
|
||||
_iconLoader ( src->_iconLoader ),
|
||||
- _name( src->_name ), _aboutData( src->_aboutData )
|
||||
+ _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
|
||||
{
|
||||
DEBUG_ADD
|
||||
Q_ASSERT(!_name.isEmpty());
|
||||
@@ -174,6 +174,11 @@
|
||||
extern bool kde_kiosk_exception;
|
||||
extern bool kde_kiosk_admin;
|
||||
|
||||
+void KInstance::setConfigReadOnly(bool ro)
|
||||
+{
|
||||
+ m_configReadOnly = ro;
|
||||
+}
|
||||
+
|
||||
KConfig *KInstance::config() const
|
||||
{
|
||||
DEBUG_CHECK_ALIVE
|
||||
@@ -199,7 +204,7 @@
|
||||
if ( d->sharedConfig == 0 )
|
||||
{
|
||||
if ( !_name.isEmpty() )
|
||||
- d->sharedConfig = KSharedConfig::openConfig( _name + "rc");
|
||||
+ d->sharedConfig = KSharedConfig::openConfig( _name + "rc"), m_configReadOnly;
|
||||
else
|
||||
d->sharedConfig = KSharedConfig::openConfig( TQString::null );
|
||||
}
|
||||
diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h
|
||||
index 75cc4b4..444a2d8 100644
|
||||
--- a/kdecore/kinstance.h
|
||||
+++ b/kdecore/kinstance.h
|
||||
@@ -96,6 +96,14 @@ class kdecore_EXPORT KInstance
|
||||
KSharedConfig *sharedConfig() const;
|
||||
|
||||
/**
|
||||
+ * Set a read-only flag on the configuration files
|
||||
+ * This must be called before config() or dirs() to have any effect
|
||||
+ * Defaults to FALSE
|
||||
+ * @param ro read only if TRUE
|
||||
+ */
|
||||
+ void setConfigReadOnly(bool ro);
|
||||
+
|
||||
+ /**
|
||||
* Returns an iconloader object.
|
||||
* @return the iconloader object.
|
||||
*/
|
||||
@@ -162,6 +170,7 @@ protected:
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
private:
|
||||
KInstancePrivate *d;
|
||||
+ bool m_configReadOnly;
|
||||
};
|
||||
|
||||
#endif
|
||||
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
|
||||
index bce4bf4..bb8ae97 100644
|
||||
--- ./kdecore/kstandarddirs.cpp.orig 2011-08-21 06:15:32.000000000 +0200
|
||||
+++ ./kdecore/kstandarddirs.cpp 2012-06-18 23:46:56.765409982 +0200
|
||||
@@ -767,8 +766,12 @@
|
||||
srv = findExe(TQString::tqfromLatin1("lnusertemp"));
|
||||
if (!srv.isEmpty())
|
||||
{
|
||||
- system(TQFile::encodeName(srv)+" "+type);
|
||||
- result = readlink(TQFile::encodeName(dir).data(), link, 1023);
|
||||
+ if (system(TQFile::encodeName(srv)+" "+type) < 0 ) {
|
||||
+ result = readlink(TQFile::encodeName(dir).data(), link, 1023);
|
||||
+ }
|
||||
+ else {
|
||||
+ result = -1;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if (result > 0)
|
||||
diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
|
||||
index 90c5dae..c988b00 100644
|
||||
--- a/kdecore/kde-config.cpp.in
|
||||
+++ b/kdecore/kde-config.cpp.in
|
||||
@@ -120,6 +120,7 @@ int main(int argc, char **argv)
|
||||
KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
|
||||
|
||||
KInstance a("kde-config");
|
||||
+ a.setConfigReadOnly(TRUE);
|
||||
(void)KGlobal::dirs(); // trigger the creation
|
||||
(void)KGlobal::config();
|
||||
|
||||
@ -0,0 +1,171 @@
|
||||
commit b4bba7b553995a6b13214dbbabe18ff311007eea
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1341113466 -0500
|
||||
|
||||
Fix iso kioslave not parsing large images properly
|
||||
|
||||
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
|
||||
index c6faa65..6403f62 100644
|
||||
--- a/kioslave/iso/kiso.cpp
|
||||
+++ b/kioslave/iso/kiso.cpp
|
||||
@@ -188,7 +188,7 @@ KIso::~KIso()
|
||||
}
|
||||
|
||||
/* callback function for libisofs */
|
||||
-static int readf(char *buf, int start, int len,void *udata) {
|
||||
+static int readf(char *buf, long start, long len,void *udata) {
|
||||
|
||||
TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
|
||||
|
||||
@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
|
||||
bool special=false;
|
||||
KArchiveEntry *entry=NULL,*oldentry=NULL;
|
||||
char z_algo[2],z_params[2];
|
||||
- int z_size=0;
|
||||
+ long long z_size=0;
|
||||
|
||||
if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
|
||||
if (iso->level) {
|
||||
@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
|
||||
|
||||
void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
|
||||
|
||||
- int i,size;
|
||||
+ int i;
|
||||
+ long long size;
|
||||
boot_head boot;
|
||||
boot_entry *be;
|
||||
TQString path;
|
||||
diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp
|
||||
index afac16b..ffae0d3 100644
|
||||
--- a/kioslave/iso/kisofile.cpp
|
||||
+++ b/kioslave/iso/kisofile.cpp
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
|
||||
int date, int adate,int cdate, const TQString& user, const TQString& group,
|
||||
- const TQString& symlink,int pos, int size) :
|
||||
+ const TQString& symlink,long long pos, long long size) :
|
||||
KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
|
||||
KIsoFile::~KIsoFile(){
|
||||
}
|
||||
|
||||
-void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {
|
||||
+void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) {
|
||||
m_algo[0]=algo[0];m_algo[1]=algo[1];
|
||||
m_parms[0]=parms[0];m_parms[1]=parms[1];
|
||||
m_realsize=realsize;
|
||||
diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h
|
||||
index 193509c..696a8c1 100644
|
||||
--- a/kioslave/iso/kisofile.h
|
||||
+++ b/kioslave/iso/kisofile.h
|
||||
@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile {
|
||||
public:
|
||||
KIsoFile( KArchive* archive, const TQString& name, int access, int date,
|
||||
int adate,int cdate, const TQString& user, const TQString& group,
|
||||
- const TQString& symlink, int pos, int size);
|
||||
+ const TQString& symlink, long long pos, long long size);
|
||||
~KIsoFile();
|
||||
- void setZF(char algo[2],char parms[2],int realsize);
|
||||
+ void setZF(char algo[2],char parms[2],long long realsize);
|
||||
int adate() const { return m_adate; }
|
||||
int cdate() const { return m_cdate; }
|
||||
long long realsize() const { return m_realsize; }
|
||||
diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
|
||||
index ab13d9e..e599450 100644
|
||||
--- a/kioslave/iso/libisofs/isofs.c
|
||||
+++ b/kioslave/iso/libisofs/isofs.c
|
||||
@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) {
|
||||
boot->defentry=NULL;
|
||||
}
|
||||
|
||||
-int BootImageSize(int media,int len) {
|
||||
- int ret;
|
||||
+int BootImageSize(int media,long len) {
|
||||
+ long long ret;
|
||||
|
||||
switch(media & 0xf) {
|
||||
case 0:
|
||||
@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
|
||||
return entry;
|
||||
}
|
||||
|
||||
-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) {
|
||||
+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
|
||||
|
||||
char buf[2048], *c, *be;
|
||||
int i,end=0;
|
||||
@@ -221,7 +221,7 @@ err:
|
||||
/**
|
||||
* Creates the linked list of the volume descriptors
|
||||
*/
|
||||
-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) {
|
||||
+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
|
||||
|
||||
int i;
|
||||
struct iso_volume_descriptor buf;
|
||||
@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files;
|
||||
iconv_t iconv_d;
|
||||
int fd;
|
||||
|
||||
-int readf(char *buf, int start, int len,void *udata) {
|
||||
+int readf(char *buf, long start, long len,void *udata) {
|
||||
int ret;
|
||||
|
||||
- if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;
|
||||
+ if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
|
||||
ret=read(fd, buf, len << 11);
|
||||
if (ret<0) return ret;
|
||||
return (ret >> 11);
|
||||
diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
|
||||
index 52190e6..b8971a4 100644
|
||||
--- a/kioslave/iso/libisofs/isofs.h
|
||||
+++ b/kioslave/iso/libisofs/isofs.h
|
||||
@@ -50,7 +50,7 @@ typedef struct _rr_entry {
|
||||
int re; /* relocated */
|
||||
char z_algo[2]; /* zizofs algorithm */
|
||||
char z_params[2]; /* zizofs parameters */
|
||||
- int z_size; /* zizofs real_size */
|
||||
+ long z_size; /* zizofs real_size */
|
||||
} rr_entry;
|
||||
|
||||
typedef struct _iso_vol_desc {
|
||||
@@ -78,7 +78,7 @@ typedef struct _boot_head {
|
||||
/**
|
||||
* this callback function needs to read 'len' sectors from 'start' into 'buf'
|
||||
*/
|
||||
-typedef int readfunc(char *buf,int start, int len,void *);
|
||||
+typedef int readfunc(char *buf,long start, long len,void *);
|
||||
|
||||
/**
|
||||
* ProcessDir uses this callback
|
||||
@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
|
||||
* If the function fails, returns NULL
|
||||
* Don't forget to call FreeISO9660 after using the volume descriptor list!
|
||||
*/
|
||||
-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata);
|
||||
+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
|
||||
|
||||
/**
|
||||
* Frees the linked list of volume descriptors
|
||||
@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
|
||||
/**
|
||||
* Returns the size of the boot image (in 512 byte sectors)
|
||||
*/
|
||||
-int BootImageSize(int media,int len);
|
||||
+int BootImageSize(int media,long len);
|
||||
|
||||
/**
|
||||
* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
|
||||
@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
|
||||
/**
|
||||
* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
|
||||
*/
|
||||
-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata);
|
||||
+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} //extern "C"
|
||||
@ -0,0 +1,35 @@
|
||||
commit d1c71f692f5329dbfe817bbed41c5137be608efa
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1341199632 -0500
|
||||
|
||||
Fix spinbox text entry when base is not 10
|
||||
|
||||
diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp
|
||||
index 27b86f9..118af6c 100644
|
||||
--- a/kdeui/knuminput.cpp
|
||||
+++ b/kdeui/knuminput.cpp
|
||||
@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name)
|
||||
{
|
||||
editor()->tqsetAlignment(AlignRight);
|
||||
val_base = 10;
|
||||
+ setValidator(new KIntValidator(this, val_base));
|
||||
setValue(0);
|
||||
}
|
||||
|
||||
@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
|
||||
{
|
||||
editor()->tqsetAlignment(AlignRight);
|
||||
val_base = base;
|
||||
+ setValidator(new KIntValidator(this, val_base));
|
||||
setValue(value);
|
||||
}
|
||||
|
||||
void KIntSpinBox::setBase(int base)
|
||||
{
|
||||
+ const KIntValidator* kvalidator = dynamic_cast<const KIntValidator*>(validator());
|
||||
+ if (kvalidator) {
|
||||
+ const_cast<KIntValidator*>(kvalidator)->setBase(base);
|
||||
+ }
|
||||
val_base = base;
|
||||
}
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
commit 87363770ea3fe6167445b6d445ca563f2a3f05fc
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1339430277 -0500
|
||||
|
||||
Restore tdesu dialog "Keep password" check box default to disabled/unchecked.
|
||||
|
||||
diff --git a/tdesu/defaults.h b/tdesu/defaults.h
|
||||
index 4649b2b..7fd724e 100644
|
||||
--- a/kdesu/defaults.h
|
||||
+++ b/kdesu/defaults.h
|
||||
@@ -13,9 +13,8 @@
|
||||
#ifndef __Defaults_h_included__
|
||||
#define __Defaults_h_included__
|
||||
|
||||
-/*const int defTimeout = 120*60;*/
|
||||
const int defTimeout = 120*60;
|
||||
const int defEchoMode = 0;
|
||||
-const int defKeep = true;
|
||||
+const int defKeep = false;
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,115 @@
|
||||
commit dca4c677237b01768f5d6d798a2d918547d2ee8e
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1341289561 -0500
|
||||
|
||||
Update iso kioslave to better handle large images
|
||||
|
||||
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
|
||||
index c9e2d43..9ec1f1c 100644
|
||||
--- a/kioslave/iso/kiso.cpp
|
||||
+++ b/kioslave/iso/kiso.cpp
|
||||
@@ -188,7 +188,7 @@ KIso::~KIso()
|
||||
}
|
||||
|
||||
/* callback function for libisofs */
|
||||
-static int readf(char *buf, long start, long len,void *udata) {
|
||||
+static int readf(char *buf, long long start, long long len,void *udata) {
|
||||
|
||||
TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
|
||||
|
||||
diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
|
||||
index e599450..f1db442 100644
|
||||
--- a/kioslave/iso/libisofs/isofs.c
|
||||
+++ b/kioslave/iso/libisofs/isofs.c
|
||||
@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) {
|
||||
boot->defentry=NULL;
|
||||
}
|
||||
|
||||
-int BootImageSize(int media,long len) {
|
||||
+int BootImageSize(int media,long long len) {
|
||||
long long ret;
|
||||
|
||||
switch(media & 0xf) {
|
||||
@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
|
||||
return entry;
|
||||
}
|
||||
|
||||
-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
|
||||
+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) {
|
||||
|
||||
char buf[2048], *c, *be;
|
||||
int i,end=0;
|
||||
@@ -221,7 +221,7 @@ err:
|
||||
/**
|
||||
* Creates the linked list of the volume descriptors
|
||||
*/
|
||||
-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
|
||||
+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) {
|
||||
|
||||
int i;
|
||||
struct iso_volume_descriptor buf;
|
||||
@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files;
|
||||
iconv_t iconv_d;
|
||||
int fd;
|
||||
|
||||
-int readf(char *buf, long start, long len,void *udata) {
|
||||
+int readf(char *buf, long long start, long long len,void *udata) {
|
||||
int ret;
|
||||
|
||||
if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
|
||||
diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
|
||||
index b8971a4..1d17de4 100644
|
||||
--- a/kioslave/iso/libisofs/isofs.h
|
||||
+++ b/kioslave/iso/libisofs/isofs.h
|
||||
@@ -50,13 +50,13 @@ typedef struct _rr_entry {
|
||||
int re; /* relocated */
|
||||
char z_algo[2]; /* zizofs algorithm */
|
||||
char z_params[2]; /* zizofs parameters */
|
||||
- long z_size; /* zizofs real_size */
|
||||
+ long long z_size; /* zizofs real_size */
|
||||
} rr_entry;
|
||||
|
||||
typedef struct _iso_vol_desc {
|
||||
struct _iso_vol_desc *next;
|
||||
struct _iso_vol_desc *prev;
|
||||
- struct iso_volume_descriptor data;
|
||||
+ struct iso_volume_descriptor data;
|
||||
} iso_vol_desc;
|
||||
|
||||
typedef struct _boot_entry {
|
||||
@@ -78,7 +78,7 @@ typedef struct _boot_head {
|
||||
/**
|
||||
* this callback function needs to read 'len' sectors from 'start' into 'buf'
|
||||
*/
|
||||
-typedef int readfunc(char *buf,long start, long len,void *);
|
||||
+typedef int readfunc(char *buf,long long start, long long len,void *);
|
||||
|
||||
/**
|
||||
* ProcessDir uses this callback
|
||||
@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
|
||||
* If the function fails, returns NULL
|
||||
* Don't forget to call FreeISO9660 after using the volume descriptor list!
|
||||
*/
|
||||
-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
|
||||
+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata);
|
||||
|
||||
/**
|
||||
* Frees the linked list of volume descriptors
|
||||
@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
|
||||
/**
|
||||
* Returns the size of the boot image (in 512 byte sectors)
|
||||
*/
|
||||
-int BootImageSize(int media,long len);
|
||||
+int BootImageSize(int media,long long len);
|
||||
|
||||
/**
|
||||
* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
|
||||
@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
|
||||
/**
|
||||
* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
|
||||
*/
|
||||
-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
|
||||
+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} //extern "C"
|
||||
@ -0,0 +1,31 @@
|
||||
commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1337622268 -0500
|
||||
|
||||
Reverse patch from GIT hash 2cc2e3a2.
|
||||
|
||||
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
|
||||
index 237c95d..a8a419f 100644
|
||||
--- a/kmix/CMakeLists.txt
|
||||
+++ b/kmix/CMakeLists.txt
|
||||
@@ -26,7 +26,6 @@ link_directories(
|
||||
##### other data ################################
|
||||
|
||||
install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
|
||||
install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
|
||||
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
|
||||
install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
|
||||
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
|
||||
index d2da702..5051363 100644
|
||||
--- a/kmix/Makefile.am
|
||||
+++ b/kmix/Makefile.am
|
||||
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
|
||||
rcdir = $(kde_datadir)/kmix
|
||||
rc_DATA = kmixui.rc
|
||||
|
||||
-autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
|
||||
+autostart_DATA = restore_kmix_volumes.desktop
|
||||
autostartdir = $(datadir)/autostart
|
||||
|
||||
lnkdir = $(kde_datadir)/kicker/applets
|
||||
@ -0,0 +1,133 @@
|
||||
--- kdemultimedia/arts/runtime/Makefile.am.ORI 2012-07-31 13:56:06.508165053 +0200
|
||||
+++ kdemultimedia/arts/runtime/Makefile.am 2012-07-31 13:57:03.018059604 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
|
||||
compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
|
||||
|
||||
-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
|
||||
+libartsbuilder_la_LIBADD = -lmcop -lartsflow -lartsflow_idl $(LIBDL)
|
||||
libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
|
||||
libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
|
||||
-no-undefined
|
||||
--- kdemultimedia/arts/gui/kde/Makefile.am.ORI 2012-07-31 14:06:50.128691312 +0200
|
||||
+++ kdemultimedia/arts/gui/kde/Makefile.am 2012-07-31 14:07:00.431493289 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
|
||||
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
|
||||
|
||||
-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
|
||||
+libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui -lkdefx -lqt-mt \
|
||||
$(top_builddir)/arts/gui/common/libartsgui_idl.la
|
||||
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
|
||||
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
|
||||
--- kdemultimedia/arts/modules/synth/Makefile.am.ORI 2012-07-31 12:30:46.465821368 +0000
|
||||
+++ kdemultimedia/arts/modules/synth/Makefile.am 2012-07-31 12:32:09.287170210 +0000
|
||||
@@ -31,7 +31,7 @@
|
||||
libartsmodulessynth_la_LIBADD = \
|
||||
$(top_builddir)/arts/runtime/libartsbuilder.la \
|
||||
$(top_builddir)/arts/midi/libartsmidi_idl.la \
|
||||
- -lartsflow -lartsgsl -lartsflow_idl -lmcop
|
||||
+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
|
||||
|
||||
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
|
||||
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
|
||||
--- kdemultimedia/arts/modules/common/Makefile.am.ORI 2012-07-31 12:36:08.682126035 +0000
|
||||
+++ kdemultimedia/arts/modules/common/Makefile.am 2012-07-31 12:36:17.362939295 +0000
|
||||
@@ -25,7 +25,7 @@
|
||||
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
|
||||
$(top_builddir)/arts/midi/libartsmidi_idl.la \
|
||||
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
|
||||
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
|
||||
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile
|
||||
|
||||
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
|
||||
|
||||
--- kdemultimedia/juk/Makefile.am.ORI 2012-07-31 14:39:39.222531330 +0200
|
||||
+++ kdemultimedia/juk/Makefile.am 2012-07-31 14:40:03.805986466 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
##################################################
|
||||
|
||||
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
|
||||
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
|
||||
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -lakode
|
||||
|
||||
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
|
||||
|
||||
--- kdemultimedia/kmid/Makefile.am.ORI 2012-07-31 14:42:26.666868929 +0200
|
||||
+++ kdemultimedia/kmid/Makefile.am 2012-07-31 14:43:01.345123193 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
lib_LTLIBRARIES = libkmidlib.la
|
||||
|
||||
libkmidlib_la_LDFLAGS = $(all_libraries)
|
||||
-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
|
||||
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid -lqt-mt -lkdeui -lDCOP -lkdecore
|
||||
|
||||
libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
libkmidpart_la_LIBADD = libkmidlib.la
|
||||
--- kdemultimedia/kmix/Makefile.am.ORI 2012-07-31 14:45:49.958546243 +0200
|
||||
+++ kdemultimedia/kmix/Makefile.am 2012-07-31 14:47:51.780002978 +0200
|
||||
@@ -25,13 +25,13 @@
|
||||
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
|
||||
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
|
||||
|
||||
-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
|
||||
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lkdecore -lDCOP
|
||||
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
|
||||
|
||||
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
|
||||
mixertoolbox.cpp mixer_backend.cpp
|
||||
|
||||
-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
|
||||
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lDCOP
|
||||
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||
|
||||
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
|
||||
--- kdemultimedia/libkcddb/Makefile.am.ORI 2012-07-31 14:54:00.740438712 +0200
|
||||
+++ kdemultimedia/libkcddb/Makefile.am 2012-07-31 14:54:14.899151410 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
|
||||
|
||||
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
|
||||
-libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
|
||||
+libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) -lqt-mt -lkdeui
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdemultimedia/noatun/library/noatunarts/Makefile.am.ORI 2012-07-31 15:07:07.507909928 +0200
|
||||
+++ kdemultimedia/noatun/library/noatunarts/Makefile.am 2012-07-31 15:07:17.378685278 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
StereoVolumeControl_impl.cpp Session_impl.cpp
|
||||
libnoatunarts_la_COMPILE_FIRST = noatunarts.h
|
||||
libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
|
||||
-libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
|
||||
+libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
|
||||
libnoatunarts_la_METASOURCES = AUTO
|
||||
|
||||
noatunarts.mcoptype: noatunarts.h
|
||||
--- kdemultimedia/noatun/library/Makefile.am.ftbfs 2011-10-28 21:13:18.000000000 +0200
|
||||
+++ kdemultimedia/noatun/library/Makefile.am 2012-07-31 15:20:52.961371759 +0200
|
||||
@@ -30,11 +30,11 @@
|
||||
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
|
||||
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
|
||||
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
|
||||
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL)
|
||||
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) -lqt-mt -lDCOP
|
||||
|
||||
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
|
||||
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
|
||||
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI)
|
||||
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) -lqt-mt -lkdecore
|
||||
|
||||
METASOURCES = AUTO
|
||||
META_INCLUDES = $(srcdir)/noatun
|
||||
--- kdemultimedia/noatun/modules/winskin/vis/Makefile.am.ORI 2012-07-31 15:26:20.619544165 +0200
|
||||
+++ kdemultimedia/noatun/modules/winskin/vis/Makefile.am 2012-07-31 15:26:33.802272534 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
libwinskinvis_la_LDFLAGS= $(all_libraries) -avoid-version \
|
||||
-no-undefined
|
||||
|
||||
-libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
|
||||
+libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
|
||||
libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
|
||||
libwinskinvis_la_METASOURCES = AUTO
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,20 @@
|
||||
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(
|
||||
@ -0,0 +1,46 @@
|
||||
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 );
|
||||
}
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
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 );
|
||||
}
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
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
|
||||
)
|
||||
|
||||
|
||||
@ -0,0 +1,114 @@
|
||||
commit d8cbbab802a063679a4db5cebc73122cdb1da100
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1343324022 -0500
|
||||
|
||||
Use libv4l if available, otherwise check for v4l1 headers
|
||||
|
||||
diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake
|
||||
index aece436..70e97f5 100644
|
||||
--- a/kopete/ConfigureChecks.cmake
|
||||
+++ b/kopete/ConfigureChecks.cmake
|
||||
@@ -26,3 +26,10 @@ if ( HAVE_LIBV4L1_VIDEODEV_H )
|
||||
endif ( )
|
||||
# -- End libv4l1-videodev.h ----------------------------------------------
|
||||
|
||||
+# -- Check for linux/videodev.h presence --------------------
|
||||
+CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )
|
||||
+if ( HAVE_LINUX_VIDEODEV_H )
|
||||
+ add_definitions( -DHAVE_LINUX_VIDEODEV_H )
|
||||
+endif ( )
|
||||
+# -- End linux-videodev.h ----------------------------------------------
|
||||
+
|
||||
diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h
|
||||
index c4db3b9..dbef6b5 100644
|
||||
--- a/kopete/libkopete/avdevice/videocontrol.h
|
||||
+++ b/kopete/libkopete/avdevice/videocontrol.h
|
||||
@@ -15,8 +15,6 @@
|
||||
*************************************************************************
|
||||
*/
|
||||
|
||||
-#define ENABLE_AV
|
||||
-
|
||||
#ifndef KOPETE_AVVIDEOCONTROL_H
|
||||
#define KOPETE_AVVIDEOCONTROL_H
|
||||
|
||||
diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp
|
||||
index ea23544..e12fb02 100644
|
||||
--- a/kopete/libkopete/avdevice/videodevice.cpp
|
||||
+++ b/kopete/libkopete/avdevice/videodevice.cpp
|
||||
@@ -15,8 +15,6 @@
|
||||
*************************************************************************
|
||||
*/
|
||||
|
||||
-#define ENABLE_AV
|
||||
-
|
||||
#include <cstdlib>
|
||||
#include <cerrno>
|
||||
#include <cstring>
|
||||
diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h
|
||||
index 7bba507..7e57513 100644
|
||||
--- a/kopete/libkopete/avdevice/videodevice.h
|
||||
+++ b/kopete/libkopete/avdevice/videodevice.h
|
||||
@@ -15,11 +15,11 @@
|
||||
*************************************************************************
|
||||
*/
|
||||
|
||||
-#define ENABLE_AV
|
||||
-
|
||||
#ifndef KOPETE_AVVIDEODEVICELISTITEM_H
|
||||
#define KOPETE_AVVIDEODEVICELISTITEM_H
|
||||
|
||||
+#define ENABLE_AV
|
||||
+
|
||||
#if defined HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
@@ -54,8 +54,10 @@
|
||||
#include <linux/kernel.h>
|
||||
#if defined(HAVE_LIBV4L1_VIDEODEV_H)
|
||||
#include <libv4l1-videodev.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_LINUX_VIDEODEV_H)
|
||||
#include <linux/videodev.h>
|
||||
+#else
|
||||
+#undef ENABLE_AV
|
||||
#endif
|
||||
#define VIDEO_MODE_PAL_Nc 3
|
||||
#define VIDEO_MODE_PAL_M 4
|
||||
@@ -293,8 +295,10 @@ public:
|
||||
void enumerateMenu (void);
|
||||
|
||||
#endif
|
||||
+#ifndef ENABLE_AV
|
||||
struct video_capability V4L_capabilities;
|
||||
struct video_buffer V4L_videobuffer;
|
||||
+#endif
|
||||
#endif
|
||||
TQValueVector<Kopete::AV::VideoInput> m_input;
|
||||
TQValueVector<Kopete::AV::VideoControl> m_control;
|
||||
diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
|
||||
index b725d5d..cbfe7cb 100644
|
||||
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
|
||||
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
|
||||
@@ -15,8 +15,6 @@
|
||||
*************************************************************************
|
||||
*/
|
||||
|
||||
-#define ENABLE_AV
|
||||
-
|
||||
#include <assert.h>
|
||||
#include <cstdlib>
|
||||
#include <cerrno>
|
||||
diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h
|
||||
index 9fc109a..dd7504f 100644
|
||||
--- a/kopete/libkopete/avdevice/videoinput.h
|
||||
+++ b/kopete/libkopete/avdevice/videoinput.h
|
||||
@@ -15,8 +15,6 @@
|
||||
*************************************************************************
|
||||
*/
|
||||
|
||||
-#define ENABLE_AV
|
||||
-
|
||||
#ifndef KOPETE_AVVIDEOINPUT_H
|
||||
#define KOPETE_AVVIDEOINPUT_H
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,100 @@
|
||||
commit bfb0bc00e959ed3cac6cf4e517a24de50446be50
|
||||
Author: Serghei Amelian <serghei.amelian@gmail.com>
|
||||
Date: 1329176749 +0200
|
||||
|
||||
[tdesdk] cmake port
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 806890a..c6f7d3d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -26,6 +26,7 @@ include( CheckIncludeFile )
|
||||
include( CheckTypeSize )
|
||||
include( CheckCSourceCompiles )
|
||||
include( CheckCXXSourceCompiles )
|
||||
+include( CheckFunctionExists )
|
||||
include( CheckLibraryExists )
|
||||
|
||||
|
||||
@@ -55,6 +56,21 @@ option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
|
||||
option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
|
||||
option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
|
||||
option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
|
||||
+option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
|
||||
+option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
|
||||
+option( BUILD_KIOSLAVE "Build kioslave" ${BUILD_ALL} )
|
||||
+option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
|
||||
+option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
|
||||
+option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} )
|
||||
+option( BUILD_KSPY "Build kspy" ${BUILD_ALL} )
|
||||
+option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} )
|
||||
+option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} )
|
||||
+option( BUILD_KUNITTEST "Build kunittest" ${BUILD_ALL} )
|
||||
+option( BUILD_POXML "Build poxml" ${BUILD_ALL} )
|
||||
+option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} )
|
||||
+option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} )
|
||||
+option( BUILD_TDECACHEGRIND "Build tdecachegrind" ${BUILD_ALL} )
|
||||
+option( BUILD_UMBRELLO "Build umbrello" ${BUILD_ALL} )
|
||||
|
||||
|
||||
##### configure checks ##########################
|
||||
@@ -83,6 +96,21 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
|
||||
tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
|
||||
tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
|
||||
tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
|
||||
+tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
|
||||
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
|
||||
+tde_conditional_add_subdirectory( BUILD_KIOSLAVE kioslave )
|
||||
+tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
|
||||
+tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )
|
||||
+tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod )
|
||||
+tde_conditional_add_subdirectory( BUILD_KSPY kspy )
|
||||
+tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf )
|
||||
+tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer )
|
||||
+tde_conditional_add_subdirectory( BUILD_KUNITTEST kunittest )
|
||||
+tde_conditional_add_subdirectory( BUILD_POXML poxml )
|
||||
+tde_conditional_add_subdirectory( BUILD_SCHECK scheck )
|
||||
+tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts )
|
||||
+tde_conditional_add_subdirectory( BUILD_TDECACHEGRIND kcachegrind )
|
||||
+tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello )
|
||||
|
||||
|
||||
##### write configure files #####################
|
||||
diff --git a/config.h.cmake b/config.h.cmake
|
||||
index 139f3c7..7ab8b07 100644
|
||||
--- a/config.h.cmake
|
||||
+++ b/config.h.cmake
|
||||
@@ -1 +1,4 @@
|
||||
#cmakedefine VERSION "@version@"
|
||||
+
|
||||
+// kcachegrind
|
||||
+#cmakedefine HAVE_MMAP 1
|
||||
diff --git a/kbabel/kbabel/CMakeLists.txt b/kbabel/kbabel/CMakeLists.txt
|
||||
index b5164b4..6b263b5 100644
|
||||
--- a/kbabel/kbabel/CMakeLists.txt
|
||||
+++ b/kbabel/kbabel/CMakeLists.txt
|
||||
@@ -62,4 +62,5 @@ tde_add_library( kbabel STATIC AUTOMOC
|
||||
fontpreferences.ui editordiffpreferences.ui editorpreferences.ui
|
||||
searchpreferences.ui colorpreferences.ui kbcataloglistview.cpp
|
||||
kbcataloglistviewitem.cpp errorlistview.cpp
|
||||
+ DEPENDENCIES kbabelcommon-shared
|
||||
)
|
||||
diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c
|
||||
index 21fca37..8b9eb2f 100644
|
||||
--- a/kmtrace/ktrace.c
|
||||
+++ b/kmtrace/ktrace.c
|
||||
@@ -778,12 +778,12 @@ kuntrace()
|
||||
"Mallocs: %8ld Frees: %8ld Leaks: %8ld\n"
|
||||
"Logged Mallocs: %8ld Logged Frees: %8ld Logged Leaks: %8ld\n"
|
||||
"Avg. Free lookups: %ld Malloc collisions: %ld Max offset: %ld\n",
|
||||
- tr_max_mallocs, TR_CACHE_SIZE, tr_flashes,
|
||||
+ tr_max_mallocs, (long int)TR_CACHE_SIZE, tr_flashes,
|
||||
tr_mallocs, tr_frees, tr_current_mallocs,
|
||||
tr_logged_mallocs, tr_logged_frees,
|
||||
tr_logged_mallocs - tr_logged_frees,
|
||||
tr_frees > 0 ? ( tr_failed_free_lookups / tr_frees ) : 0,
|
||||
- tr_malloc_collisions, tr_max_offset);
|
||||
+ tr_malloc_collisions, (long int)tr_max_offset);
|
||||
#endif
|
||||
fclose (mallstream);
|
||||
mallstream = NULL;
|
||||
@ -0,0 +1,32 @@
|
||||
commit 572169a2e18705e526990c52924a268b218ff52b
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1340737965 -0500
|
||||
|
||||
Fix FTBFS on newer subversion libraries
|
||||
This closes Bug 872
|
||||
|
||||
diff --git a/kioslave/svn/ConfigureChecks.cmake b/kioslave/svn/ConfigureChecks.cmake
|
||||
index 81358c6..3d46c74 100644
|
||||
--- a/kioslave/svn/ConfigureChecks.cmake
|
||||
+++ b/kioslave/svn/ConfigureChecks.cmake
|
||||
@@ -19,12 +19,16 @@ endif( )
|
||||
|
||||
# check for subversion library
|
||||
|
||||
-check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX )
|
||||
-
|
||||
-if( HAVE_SVN_POOL_CREATE_EX )
|
||||
+check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
|
||||
+if( HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
|
||||
set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
|
||||
else( )
|
||||
- tde_message_fatal( "svn_client-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
|
||||
+ check_library_exists( "svn_subr-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SUBR )
|
||||
+ if( HAVE_SVN_POOL_CREATE_EX_SUBR )
|
||||
+ set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
|
||||
+ else( )
|
||||
+ tde_message_fatal( "svn_client-1 or svn_subr-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
|
||||
+ endif( )
|
||||
endif( )
|
||||
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
--- kdesdk/kapptemplate/CMakeLists.txt.ORI 2012-07-30 17:58:45.681535290 +0200
|
||||
+++ kdesdk/kapptemplate/CMakeLists.txt 2012-07-30 17:58:55.232338294 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
install( PROGRAMS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
|
||||
- DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
|
||||
+ DESTINATION ${BIN_INSTALL_DIR}/kapptemplate/bin )
|
||||
|
||||
install( FILES
|
||||
kapptemplate.common kapptemplate.module
|
||||
--- kdesdk/kbugbuster/kresources/CMakeLists.txt.ORI 2012-07-30 18:00:21.039575551 +0200
|
||||
+++ kdesdk/kbugbuster/kresources/CMakeLists.txt 2012-07-30 18:00:25.414486000 +0200
|
||||
@@ -17,6 +17,7 @@
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../backend
|
||||
${TDE_INCLUDE_DIR}
|
||||
+ ${TDE_INCLUDE_DIR}/kde
|
||||
${TQT_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,21 @@
|
||||
--- kdetoys/kweather/Makefile.am.ORI 2012-08-01 10:42:11.015544034 +0200
|
||||
+++ kdetoys/kweather/Makefile.am 2012-08-01 10:44:37.144904650 +0200
|
||||
@@ -26,7 +26,8 @@
|
||||
weatherIface.skel weatherservice.stub \
|
||||
weatherbutton.cpp
|
||||
weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
|
||||
-weather_panelapplet_la_LIBADD = $(LIB_KHTML)
|
||||
+weather_panelapplet_la_LIBADD = $(LIB_KHTML) -lqt-mt -lDCOP
|
||||
+
|
||||
|
||||
appletdir = $(kde_datadir)/kicker/applets
|
||||
applet_DATA = kweather.desktop
|
||||
@@ -67,7 +68,7 @@
|
||||
kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
|
||||
|
||||
kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
|
||||
-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
|
||||
+kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo -lqt-mt -lDCOP -lkdecore -lkdeui
|
||||
kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
|
||||
|
||||
KDE_ICON = kweather
|
||||
@ -0,0 +1,63 @@
|
||||
--- kdeutils/ark/arch.cpp~ 2011-08-13 09:25:08.000000000 +0300
|
||||
+++ kdeutils/ark/arch.cpp 2012-06-14 16:58:52.417875615 +0300
|
||||
@@ -33,6 +33,7 @@
|
||||
// QT includes
|
||||
#include <tqapplication.h>
|
||||
#include <tqfile.h>
|
||||
+#include <tqtextcodec.h>
|
||||
|
||||
// KDE includes
|
||||
#include <kdebug.h>
|
||||
@@ -288,7 +290,7 @@
|
||||
|
||||
data[ lfChar ] = '\0';
|
||||
|
||||
- m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
|
||||
+ m_buffer.append( data + startChar );
|
||||
|
||||
data[ lfChar ] = '\n';
|
||||
startChar = lfChar + 1;
|
||||
@@ -333,12 +335,15 @@
|
||||
unsigned int pos = 0;
|
||||
int strpos, len;
|
||||
|
||||
+ TQTextCodec *codec = TQTextCodec::codecForLocale();
|
||||
+ TQString tqunicode_line = codec->toUnicode( line );
|
||||
+
|
||||
// Go through our columns, try to pick out data, return silently on failure
|
||||
for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
|
||||
{
|
||||
ArchColumns *curCol = *col;
|
||||
|
||||
- strpos = curCol->pattern.search( line, pos );
|
||||
+ strpos = curCol->pattern.search( tqunicode_line, pos );
|
||||
len = curCol->pattern.matchedLength();
|
||||
|
||||
if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
|
||||
@@ -354,7 +359,7 @@
|
||||
|
||||
pos = strpos + len;
|
||||
|
||||
- columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
|
||||
+ columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
|
||||
}
|
||||
|
||||
|
||||
--- kdeutils-3.5.1/ark/arkapp.cpp~ 2006-01-19 19:49:29 +0300
|
||||
+++ kdeutils-3.5.1/ark/arkapp.cpp 2006-02-20 19:28:23 +0300
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <unistd.h>
|
||||
#include <tqfile.h>
|
||||
#include <errno.h>
|
||||
+#include <qtextcodec.h>
|
||||
|
||||
|
||||
#include "arkapp.h"
|
||||
@@ -110,6 +111,7 @@ ArkApplication::ArkApplication()
|
||||
{
|
||||
m_mainwidget = new TQWidget;
|
||||
setMainWidget(m_mainwidget);
|
||||
+ QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
|
||||
}
|
||||
|
||||
int
|
||||
@ -0,0 +1,61 @@
|
||||
--- kdeutils/kcalc/Makefile.am.ORI 2012-08-01 22:22:16.274750161 +0200
|
||||
+++ kdeutils/kcalc/Makefile.am 2012-08-01 22:23:10.181783997 +0200
|
||||
@@ -19,7 +19,7 @@
|
||||
kcalctype.h dlabel.h stats.h
|
||||
|
||||
kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||
-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
|
||||
+kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
KDE_ICON = kcalc
|
||||
|
||||
--- kdeutils/kedit/Makefile.am.ORI 2012-08-01 22:26:20.127379647 +0200
|
||||
+++ kdeutils/kedit/Makefile.am 2012-08-01 22:26:38.144056739 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
kdeinit_LTLIBRARIES = kedit.la
|
||||
|
||||
kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
|
||||
-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
|
||||
+kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
|
||||
kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
|
||||
|
||||
noinst_HEADERS = kedit.h ktextfiledlg.h\
|
||||
--- kdeutils/khexedit/lib/Makefile.am.ORI 2012-08-01 22:28:26.956106523 +0200
|
||||
+++ kdeutils/khexedit/lib/Makefile.am 2012-08-01 22:28:33.941981315 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
# this library is used by the kbytesedit part and the khepart part
|
||||
lib_LTLIBRARIES = libkhexeditcommon.la
|
||||
libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
|
||||
-libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
|
||||
+libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
|
||||
libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
|
||||
kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
|
||||
kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
|
||||
--- kdeutils/kregexpeditor/Makefile.am.ORI 2012-08-01 22:31:33.556720026 +0200
|
||||
+++ kdeutils/kregexpeditor/Makefile.am 2012-08-01 22:31:48.203381087 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
|
||||
libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
|
||||
- KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
|
||||
+ KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdeutils/ksim/library/Makefile.am.ORI 2012-08-01 22:35:30.852281916 +0200
|
||||
+++ kdeutils/ksim/library/Makefile.am 2012-08-01 22:35:39.599384576 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-lib_LTLIBRARIES = libksimcore.la
|
||||
+lib_LTLIBRARIES = libksimcore.la
|
||||
|
||||
libksimcore_la_SOURCES = common.cpp themeloader.cpp \
|
||||
chart.cpp label.cpp \
|
||||
@@ -7,7 +7,7 @@
|
||||
pluginmodule.cpp ksimconfig.cpp
|
||||
|
||||
libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
|
||||
-libksimcore_la_LIBADD = $(LIB_KDEUI)
|
||||
+libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx
|
||||
|
||||
ksiminclude_HEADERS = common.h themeloader.h \
|
||||
chart.h label.h \
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,22 @@
|
||||
--- kdewebdev/kommander/plugin/Makefile.am.ORI 2012-07-30 20:43:40.366904851 +0200
|
||||
+++ kdewebdev/kommander/plugin/Makefile.am 2012-07-30 20:43:52.205813593 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
|
||||
|
||||
# the libraries to link against.
|
||||
-libkommanderplugin_la_LIBADD = $(LIB_KDEUI) $(LIB_QT)
|
||||
+libkommanderplugin_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
|
||||
|
||||
libkommanderplugin_la_SOURCES = kommanderplugin.cpp specialinformation.cpp
|
||||
|
||||
--- kdewebdev/kommander/widget/Makefile.am.ORI 2012-07-30 20:49:46.120865640 +0200
|
||||
+++ kdewebdev/kommander/widget/Makefile.am 2012-07-30 20:50:25.875198532 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
|
||||
|
||||
# the libraries to link against.
|
||||
-libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
|
||||
+libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP
|
||||
|
||||
libkommanderwidget_la_SOURCES = expression.cpp function.cpp functionlib.cpp \
|
||||
invokeclass.cpp kmdrmainwindow.cpp kommanderfunctions.cpp kommanderwidget.cpp \
|
||||
Loading…
Reference in new issue