parent
a9080cea1f
commit
f95872aa73
@ -1,48 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index c122548..ad4f028 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -226,6 +226,34 @@ configure_file( config.h.cmake config.h @ONLY )
|
|
||||||
|
|
||||||
##### write pkgconfig file ######################
|
|
||||||
|
|
||||||
+set( PC_LIB_REQUIRE "" )
|
|
||||||
+if( WITH_ALSA )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "alsa" )
|
|
||||||
+endif( WITH_ALSA )
|
|
||||||
+if( WITH_AUDIOFILE )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "audiofile" )
|
|
||||||
+endif( WITH_AUDIOFILE )
|
|
||||||
+if( WITH_VORBIS )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "vorbis" )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "vorbisfile" )
|
|
||||||
+endif( WITH_VORBIS )
|
|
||||||
+if( WITH_MAD )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "mad" )
|
|
||||||
+endif( WITH_MAD )
|
|
||||||
+if( WITH_ESOUND )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "esound" )
|
|
||||||
+endif( WITH_ESOUND )
|
|
||||||
+if( WITH_JACK )
|
|
||||||
+ list( APPEND PC_LIB_REQUIRE "jack" )
|
|
||||||
+endif( WITH_JACK )
|
|
||||||
+
|
|
||||||
+list( LENGTH PC_LIB_REQUIRE PC_LIB_REQUIRES_FOUND )
|
|
||||||
+if( PC_LIB_REQUIRES_FOUND GREATER 0 )
|
|
||||||
+ string( REPLACE ";" " " PC_LIB_REQUIRES "Requires: ${PC_LIB_REQUIRE}" )
|
|
||||||
+else( )
|
|
||||||
+ set( PC_LIB_REQUIRES "" )
|
|
||||||
+endif( )
|
|
||||||
+
|
|
||||||
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
|
|
||||||
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
|
|
||||||
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
|
|
||||||
diff --git a/arts.pc.cmake b/arts.pc.cmake
|
|
||||||
index 2c26a41..77332d2 100644
|
|
||||||
--- a/arts.pc.cmake
|
|
||||||
+++ b/arts.pc.cmake
|
|
||||||
@@ -8,3 +8,4 @@ Description: Soundserver for the Trinity Desktop Environment (TDE)
|
|
||||||
Version: @ARTS_VERSION@
|
|
||||||
Libs: -L${libdir}
|
|
||||||
Cflags: -I${includedir}
|
|
||||||
+@PC_LIB_REQUIRES@
|
|
@ -1,245 +0,0 @@
|
|||||||
# Default version for this component
|
|
||||||
%if "%{?version}" == ""
|
|
||||||
%define version 3.5.12
|
|
||||||
%endif
|
|
||||||
%define release 3
|
|
||||||
|
|
||||||
# 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_libdir %{_libdir}/kde3
|
|
||||||
|
|
||||||
|
|
||||||
%define _with_subversion --with-subversion
|
|
||||||
%if 0%{?fedora} > 6 || 0%{?rhel} > 4
|
|
||||||
%define _with_apr_config --with-apr-config=apr-1-config
|
|
||||||
%define _with_apu_config --with-apu-config=apu-1-config
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
Name: trinity-kdesdk
|
|
||||||
Summary: The KDE Software Development Kit (SDK)
|
|
||||||
Version: %{?version}
|
|
||||||
Release: %{?release}%{?dist}%{?_variant}
|
|
||||||
|
|
||||||
License: GPLv2
|
|
||||||
Group: User Interface/Desktops
|
|
||||||
URL: http://www.trinitydesktop.org/
|
|
||||||
Vendor: Trinity Project
|
|
||||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
|
||||||
|
|
||||||
Prefix: %{_prefix}
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
|
|
||||||
Source: kdesdk-%{version}.tar.gz
|
|
||||||
|
|
||||||
# RedHat Legacy patches
|
|
||||||
Patch1: kdesdk-3.5.7-subversion.patch
|
|
||||||
|
|
||||||
# Official patches from SVN
|
|
||||||
# Import of revision 66 from svn.trinitydesktop.org
|
|
||||||
Patch2: r1225998.diff
|
|
||||||
|
|
||||||
Provides: kdesdk3 = %{version}-%{release}
|
|
||||||
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
|
||||||
|
|
||||||
BuildRequires: libtool
|
|
||||||
BuildRequires: tqtinterface-devel
|
|
||||||
BuildRequires: pcre-devel
|
|
||||||
BuildRequires: trinity-kdelibs-devel
|
|
||||||
# for kbugbuster/libkcal
|
|
||||||
BuildRequires: trinity-kdepim-devel
|
|
||||||
BuildRequires: db4-devel
|
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
# kbabel, F-7+: flex >= 2.5.33-9
|
|
||||||
BuildRequires: flex
|
|
||||||
# umbrello
|
|
||||||
BuildRequires: libxslt-devel libxml2-devel
|
|
||||||
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
|
|
||||||
BuildRequires: binutils-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: perl
|
|
||||||
BuildRequires: subversion-devel neon-devel
|
|
||||||
|
|
||||||
# Obsoletes/Provides
|
|
||||||
%define cervisia_ver 2.4.7
|
|
||||||
Provides: cervisia = %{cervisia_ver}-%{release}
|
|
||||||
|
|
||||||
%define umbrello_ver 1.5.7
|
|
||||||
Obsoletes: umbrello < %{umbrello_ver}-%{release}
|
|
||||||
Provides: umbrello = %{umbrello_ver}-%{release}
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
|
||||||
A collection of applications and tools used by developers, including:
|
|
||||||
* cervisia: a CVS frontend
|
|
||||||
* kbabel: PO file management
|
|
||||||
* kbugbuster: a tool to manage the KDE bug report system
|
|
||||||
* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
|
|
||||||
* kompare: diff tool
|
|
||||||
* kuiviewer: displays designer's UI files
|
|
||||||
* umbrello: UML modeller and UML diagram tool
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Development files for %{name}
|
|
||||||
Group: Development/Libraries
|
|
||||||
Provides: trinity-kdesdk-devel = %{version}-%{release}
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
|
||||||
Requires: trinity-kdelibs-devel
|
|
||||||
%description devel
|
|
||||||
%{summary}.
|
|
||||||
|
|
||||||
%package libs
|
|
||||||
Summary: %{name} runtime libraries
|
|
||||||
Group: System Environment/Libraries
|
|
||||||
Requires: trinity-kdelibs
|
|
||||||
# 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 kdesdk
|
|
||||||
%patch1 -p1 -b .subversion
|
|
||||||
%patch2 -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 \
|
|
||||||
--includedir=%{_includedir}/kde \
|
|
||||||
--disable-rpath \
|
|
||||||
--enable-new-ldflags \
|
|
||||||
--disable-debug --disable-warnings \
|
|
||||||
--disable-dependancy-tracking --enable-final \
|
|
||||||
%{?_with_subversion} %{?_with_apr_config} %{?_with_apu_config} \
|
|
||||||
--with-extra-includes=%{_includedir}/tqt \
|
|
||||||
--without-svn \
|
|
||||||
--enable-closure
|
|
||||||
|
|
||||||
# Do not use %{?_smp_mflags} !
|
|
||||||
%__make
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
export PATH="%{_bindir}:${PATH}"
|
|
||||||
%__rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%__make install DESTDIR=%{?buildroot}
|
|
||||||
|
|
||||||
desktop-file-install --vendor "" \
|
|
||||||
--dir %{buildroot}%{_datadir}/applications/kde \
|
|
||||||
%{buildroot}%{_datadir}/applications/kde/*.desktop \
|
|
||||||
|
|
||||||
# make symlinks relative
|
|
||||||
if [ -d %{buildroot}%{tde_docdir}/HTML/en ]; then
|
|
||||||
pushd %{buildroot}%{tde_docdir}/HTML/en
|
|
||||||
for i in *; do
|
|
||||||
if [ -d $i -a -L $i/common ]; then
|
|
||||||
rm -f $i/common
|
|
||||||
ln -nfs ../common $i
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
fi
|
|
||||||
|
|
||||||
%__rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
|
|
||||||
%{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%__rm -rf %{buildroot}
|
|
||||||
|
|
||||||
|
|
||||||
# trick to replace a dir by a symlink -- Rex
|
|
||||||
%pre
|
|
||||||
if [ $1 -gt 0 -a ! -L %{_docdir}/HTML/en/cervisia/common ]; then
|
|
||||||
rm -rf %{tde_docdir}/HTML/en/cervisia/common ||:
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post
|
|
||||||
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 || :
|
|
||||||
|
|
||||||
%post libs
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun libs
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/*
|
|
||||||
%{tde_docdir}/HTML/en/*
|
|
||||||
%{_datadir}/apps/*
|
|
||||||
%{_datadir}/mimelnk/application/*
|
|
||||||
%{_datadir}/services/*
|
|
||||||
%{_datadir}/servicetypes/*
|
|
||||||
%{_datadir}/icons/crystalsvg/*/*/*
|
|
||||||
%{_datadir}/icons/hicolor/*/*/*
|
|
||||||
%{_datadir}/icons/locolor/*/*/*
|
|
||||||
%{_datadir}/applications/kde/*
|
|
||||||
%{_datadir}/config.kcfg/*
|
|
||||||
%{tde_libdir}/*
|
|
||||||
%{_libdir}/libkdeinit_*.so
|
|
||||||
%{_mandir}/man1/*
|
|
||||||
|
|
||||||
# Removes conflict with package 'rpmdevtool' on RHEL 6
|
|
||||||
%if "%{_prefix}" == "/usr"
|
|
||||||
%exclude %{_bindir}/licensecheck
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files libs
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/lib*.so.*
|
|
||||||
%{_libdir}/lib*.la
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_includedir}/kde/*
|
|
||||||
%{_libdir}/lib*.so
|
|
||||||
%exclude %{_libdir}/libkdeinit_*.so
|
|
||||||
%{_libdir}/kmtrace/*
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
|
|
||||||
- Add support for RHEL5
|
|
||||||
|
|
||||||
* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
|
|
||||||
- Import to GIT
|
|
||||||
|
|
||||||
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
|
||||||
- Correct macro to install under "/opt", if desired
|
|
||||||
|
|
||||||
* Tue Jun 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
|
|
||||||
- Initial version for RHEL 6
|
|
||||||
- Specfile based on Fedora 8 'kdesdk 3.5.10-1'
|
|
File diff suppressed because it is too large
Load Diff
@ -1,100 +0,0 @@
|
|||||||
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;
|
|
@ -1,32 +0,0 @@
|
|||||||
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( )
|
|
||||||
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
--- 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}
|
|
||||||
)
|
|
||||||
|
|
@ -1,309 +0,0 @@
|
|||||||
diff -Nuar kdesdk-3.5.13.1/CMakeLists.txt kdesdk-3.5.13.1.patched/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/CMakeLists.txt 2012-09-08 12:06:50.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/CMakeLists.txt 2012-10-01 19:24:39.244352538 +0200
|
|
||||||
@@ -109,7 +109,7 @@
|
|
||||||
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_KDECACHEGRIND kdecachegrind )
|
|
||||||
+tde_conditional_add_subdirectory( BUILD_KDECACHEGRIND kcachegrind )
|
|
||||||
tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello )
|
|
||||||
|
|
||||||
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/CMakeLists.txt 2012-10-01 19:35:12.689266467 +0200
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+include( ConfigureChecks.cmake )
|
|
||||||
+
|
|
||||||
+set( KCACHEGRIND_VERSION "0.4.6kde" )
|
|
||||||
+configure_file( version.h.in version.h @ONLY )
|
|
||||||
+configure_file( kcachegrind.spec.in kcachegrind.spec @ONLY )
|
|
||||||
+configure_file( kcachegrind.lsm.in kcachegrind.lsm @ONLY )
|
|
||||||
+
|
|
||||||
+add_subdirectory( kcachegrind )
|
|
||||||
+add_subdirectory( pics )
|
|
||||||
+add_subdirectory( converters )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/ConfigureChecks.cmake kdesdk-3.5.13.1.patched/kcachegrind/ConfigureChecks.cmake
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/ConfigureChecks.cmake 2012-10-01 19:35:15.546204776 +0200
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+check_function_exists( mmap HAVE_MMAP )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/converters/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/converters/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/converters/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/converters/CMakeLists.txt 2012-10-01 19:33:48.381089049 +0200
|
|
||||||
@@ -0,0 +1,15 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+install( PROGRAMS
|
|
||||||
+ hotshot2calltree op2calltree pprof2calltree
|
|
||||||
+ dprof2calltree memprof2calltree
|
|
||||||
+ DESTINATION ${BIN_INSTALL_DIR} )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/kcachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/kcachegrind/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/kcachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/kcachegrind/CMakeLists.txt 2012-10-01 19:35:46.872528600 +0200
|
|
||||||
@@ -0,0 +1,50 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+include_directories(
|
|
||||||
+ ${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
+ ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
+ ${CMAKE_BINARY_DIR}
|
|
||||||
+ ${TDE_INCLUDE_DIR}
|
|
||||||
+ ${TQT_INCLUDE_DIRS}
|
|
||||||
+)
|
|
||||||
+
|
|
||||||
+link_directories(
|
|
||||||
+ ${TQT_LIBRARY_DIRS}
|
|
||||||
+)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+##### other data ################################
|
|
||||||
+
|
|
||||||
+tde_install_icons( )
|
|
||||||
+install( FILES kcachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
|
||||||
+install( FILES kcachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
|
|
||||||
+install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+##### kcachegrind (executable) ##################
|
|
||||||
+
|
|
||||||
+tde_add_executable( kcachegrind AUTOMOC
|
|
||||||
+ SOURCES
|
|
||||||
+ functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
|
|
||||||
+ configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
|
|
||||||
+ main.cpp configuration.cpp functionselection.cpp coverage.cpp
|
|
||||||
+ partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
|
|
||||||
+ subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
|
|
||||||
+ utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
|
|
||||||
+ sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
|
|
||||||
+ costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp
|
|
||||||
+ multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
|
|
||||||
+ costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
|
|
||||||
+ stackitem.cpp callgraphview.cpp
|
|
||||||
+ LINK kio-shared
|
|
||||||
+ DESTINATION ${BIN_INSTALL_DIR}
|
|
||||||
+)
|
|
||||||
\ Pas de fin de ligne à la fin du fichier
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/pics/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/pics/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/pics/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/pics/CMakeLists.txt 2012-10-01 19:35:59.697251930 +0200
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+add_subdirectory( hicolor )
|
|
||||||
+
|
|
||||||
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kcachegrind/pics/hicolor/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/pics/hicolor/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kcachegrind/pics/hicolor/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kcachegrind/pics/hicolor/CMakeLists.txt 2012-10-01 19:36:11.193004007 +0200
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+#################################################
|
|
||||||
+#
|
|
||||||
+# (C) 2012 Serghei Amelian
|
|
||||||
+# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
+#
|
|
||||||
+# Improvements and feedback are welcome
|
|
||||||
+#
|
|
||||||
+# This file is released under GPL >= 2
|
|
||||||
+#
|
|
||||||
+#################################################
|
|
||||||
+
|
|
||||||
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,21 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-include( ConfigureChecks.cmake )
|
|
||||||
-
|
|
||||||
-set( KCACHEGRIND_VERSION "0.4.6kde" )
|
|
||||||
-configure_file( version.h.in version.h @ONLY )
|
|
||||||
-configure_file( kdecachegrind.spec.in kcachegrind.spec @ONLY )
|
|
||||||
-configure_file( kdecachegrind.lsm.in kcachegrind.lsm @ONLY )
|
|
||||||
-
|
|
||||||
-add_subdirectory( kdecachegrind )
|
|
||||||
-add_subdirectory( pics )
|
|
||||||
-add_subdirectory( converters )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/ConfigureChecks.cmake kdesdk-3.5.13.1.patched/kdecachegrind/ConfigureChecks.cmake
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/ConfigureChecks.cmake 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,12 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-check_function_exists( mmap HAVE_MMAP )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/converters/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/converters/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/converters/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/converters/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,15 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-install( PROGRAMS
|
|
||||||
- hotshot2calltree op2calltree pprof2calltree
|
|
||||||
- dprof2calltree memprof2calltree
|
|
||||||
- DESTINATION ${BIN_INSTALL_DIR} )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/kdecachegrind/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/kdecachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,50 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-include_directories(
|
|
||||||
- ${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
- ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
- ${CMAKE_BINARY_DIR}
|
|
||||||
- ${TDE_INCLUDE_DIR}
|
|
||||||
- ${TQT_INCLUDE_DIRS}
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
-link_directories(
|
|
||||||
- ${TQT_LIBRARY_DIRS}
|
|
||||||
-)
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-##### other data ################################
|
|
||||||
-
|
|
||||||
-tde_install_icons( )
|
|
||||||
-install( FILES kdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
|
||||||
-install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
|
|
||||||
-install( FILES x-kdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-##### kdecachegrind (executable) ##################
|
|
||||||
-
|
|
||||||
-tde_add_executable( kdecachegrind AUTOMOC
|
|
||||||
- SOURCES
|
|
||||||
- functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
|
|
||||||
- configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
|
|
||||||
- main.cpp configuration.cpp functionselection.cpp coverage.cpp
|
|
||||||
- partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
|
|
||||||
- subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
|
|
||||||
- utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
|
|
||||||
- sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
|
|
||||||
- costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp
|
|
||||||
- multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
|
|
||||||
- costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
|
|
||||||
- stackitem.cpp callgraphview.cpp
|
|
||||||
- LINK kio-shared
|
|
||||||
- DESTINATION ${BIN_INSTALL_DIR}
|
|
||||||
-)
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/pics/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/pics/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/pics/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/pics/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,14 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-add_subdirectory( hicolor )
|
|
||||||
-
|
|
||||||
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons )
|
|
||||||
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/pics/hicolor/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/pics/hicolor/CMakeLists.txt
|
|
||||||
--- kdesdk-3.5.13.1/kdecachegrind/pics/hicolor/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1.patched/kdecachegrind/pics/hicolor/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
@@ -1,12 +0,0 @@
|
|
||||||
-#################################################
|
|
||||||
-#
|
|
||||||
-# (C) 2012 Serghei Amelian
|
|
||||||
-# serghei (DOT) amelian (AT) gmail.com
|
|
||||||
-#
|
|
||||||
-# Improvements and feedback are welcome
|
|
||||||
-#
|
|
||||||
-# This file is released under GPL >= 2
|
|
||||||
-#
|
|
||||||
-#################################################
|
|
||||||
-
|
|
||||||
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons )
|
|
@ -1,17 +0,0 @@
|
|||||||
--- kdesdk-3.5.13.1/kioslave/svn/ConfigureChecks.cmake 2012-09-30 20:05:52.627163660 +0200
|
|
||||||
+++ kdesdk/kioslave/svn/ConfigureChecks.cmake 2012-09-30 20:02:29.267164082 +0200
|
|
||||||
@@ -34,11 +34,11 @@
|
|
||||||
|
|
||||||
# check for subversion headers
|
|
||||||
|
|
||||||
-tde_save_and_set( CMAKE_REQUIRED_FLAGS "-I${APR_INCLUDE_DIRS}" )
|
|
||||||
-tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "${APR_CFLAGS}" )
|
|
||||||
+set( CMAKE_REQUIRED_FLAGS "-I${APR_INCLUDE_DIRS}" )
|
|
||||||
+set( CMAKE_REQUIRED_DEFINITIONS "${APR_CFLAGS}" )
|
|
||||||
|
|
||||||
if( SVN_INCLUDE_DIR )
|
|
||||||
- set_and_save( CMAKE_REQUIRED_INCLUDES "${SVN_INCLUDE_DIR}" )
|
|
||||||
+ set( CMAKE_REQUIRED_INCLUDES "${SVN_INCLUDE_DIR}" )
|
|
||||||
check_include_file( "svn_types.h" HAVE_SVN_TYPES_H )
|
|
||||||
tde_restore( CMAKE_REQUIRED_INCLUDES )
|
|
||||||
else( )
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,159 +0,0 @@
|
|||||||
Index: b/cervisia/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/cervisia/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/cervisia/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -58,6 +58,24 @@
|
|
||||||
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
|
||||||
|
|
||||||
|
|
||||||
+macro( _pod2man )
|
|
||||||
+ foreach( _pod ${ARGN} )
|
|
||||||
+ add_custom_command(
|
|
||||||
+ OUTPUT ${_pod}.1
|
|
||||||
+ COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod}.pod > ${_pod}.1.in
|
|
||||||
+ COMMAND
|
|
||||||
+ sed -e 's%_KDEHTMLDIR_%'${HTML_INSTALL_DIR}'%g;'
|
|
||||||
+ -e 's%_KDECONFDIR_%'${CONFIG_INSTALL_DIR}'%g;'
|
|
||||||
+ < ${_pod}.1.in > ${_pod}.1
|
|
||||||
+ DEPENDS ${_pod} )
|
|
||||||
+ add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
|
|
||||||
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
|
|
||||||
+ endforeach( )
|
|
||||||
+endmacro()
|
|
||||||
+
|
|
||||||
+_pod2man( cervisia )
|
|
||||||
+
|
|
||||||
+
|
|
||||||
##### cervisia (static) #########################
|
|
||||||
|
|
||||||
tde_add_library( cervisia STATIC_PIC AUTOMOC
|
|
||||||
Index: b/cervisia/cvsservice/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/cervisia/cvsservice/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/cervisia/cvsservice/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -41,7 +41,7 @@
|
|
||||||
tde_add_library( cvsservice SHARED AUTOMOC
|
|
||||||
SOURCES
|
|
||||||
cvsservice.stub cvsjob.stub repository.stub
|
|
||||||
- VERSION 0.1.0
|
|
||||||
+ VERSION 0.0.1
|
|
||||||
LINK kdecore-shared
|
|
||||||
DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
Index: b/kapptemplate/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/kapptemplate/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/kapptemplate/CMakeLists.txt 2012-11-05 23:56:28.000000000 +0100
|
|
||||||
@@ -23,7 +23,11 @@
|
|
||||||
|
|
||||||
install( PROGRAMS
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
|
|
||||||
+ DESTINATION ${BIN_INSTALL_DIR} )
|
|
||||||
+
|
|
||||||
+install( PROGRAMS
|
|
||||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/mkinstalldirs
|
|
||||||
DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
|
|
||||||
|
|
||||||
install( FILES
|
|
||||||
kapptemplate.common kapptemplate.module
|
|
||||||
|
|
||||||
Index: b/kapptemplate/admin/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/kapptemplate/admin/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/kapptemplate/admin/CMakeLists.txt 2012-11-06 00:13:16.000000000 +0100
|
|
||||||
@@ -9,4 +9,9 @@
|
|
||||||
#
|
|
||||||
#################################################
|
|
||||||
|
|
||||||
-tde_install_empty_directory( ${DATA_INSTALL_DIR}/kapptemplate/admin )
|
|
||||||
+install(
|
|
||||||
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
|
|
||||||
+ DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
|
|
||||||
+ USE_SOURCE_PERMISSIONS
|
|
||||||
+ REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE
|
|
||||||
+)
|
|
||||||
Index: b/kmtrace/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/kmtrace/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/kmtrace/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -31,12 +31,16 @@
|
|
||||||
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector
|
|
||||||
DESTINATION ${BIN_INSTALL_DIR} )
|
|
||||||
|
|
||||||
+install( FILES ktrace.h
|
|
||||||
+ DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
||||||
+)
|
|
||||||
+
|
|
||||||
|
|
||||||
##### ktrace_s (static) #########################
|
|
||||||
|
|
||||||
tde_add_library( ktrace_s STATIC
|
|
||||||
SOURCES ktrace.c
|
|
||||||
- DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
+ DESTINATION ${LIB_INSTALL_DIR}/kmtrace
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
Index: b/kompare/interfaces/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/kompare/interfaces/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/kompare/interfaces/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -23,6 +23,7 @@
|
|
||||||
|
|
||||||
tde_add_library( kompareinterface SHARED
|
|
||||||
SOURCES kompareinterface.cpp
|
|
||||||
+ VERSION 0.0.0
|
|
||||||
LINK ${TQT_LIBRARIES}
|
|
||||||
DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
Index: b/kunittest/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/kunittest/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/kunittest/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
|
|
||||||
tde_add_library( kunittestgui SHARED AUTOMOC
|
|
||||||
SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
|
|
||||||
+ VERSION 0.0.0
|
|
||||||
LINK kunittest-shared
|
|
||||||
DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
Index: b/scheck/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/scheck/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/scheck/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -30,5 +30,5 @@
|
|
||||||
tde_add_kpart( scheck AUTOMOC
|
|
||||||
SOURCES scheck.cpp
|
|
||||||
LINK kdeui-shared
|
|
||||||
- DESTINATION ${PLUGIN_INSTALL_DIR}
|
|
||||||
+ DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
|
|
||||||
)
|
|
||||||
Index: b/scripts/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- a/scripts/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
|
||||||
+++ b/scripts/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
|
||||||
@@ -36,7 +36,7 @@
|
|
||||||
COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_pod}.1
|
|
||||||
DEPENDS ${_pod} )
|
|
||||||
add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
|
|
||||||
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR} )
|
|
||||||
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
|
|
||||||
endforeach( )
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
Index: b/kapptemplate/admin/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- a/kapptemplate/admin/Makefile.am 2012-11-06 00:36:24.000000000 +0100
|
|
||||||
+++ b/kapptemplate/admin/Makefile.am 2012-11-06 00:48:24.000000000 +0100
|
|
||||||
@@ -1,8 +1,8 @@
|
|
||||||
install-data-local:
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
|
|
||||||
for file in $(srcdir)/*; do \
|
|
||||||
- if [ -f $$file -a $$file != 'Makefile' -a $$file != 'Makefile.in' -a $$file != 'Makefile.am' ]; then \
|
|
||||||
- destfile=`basename $$file` \
|
|
||||||
+ destfile=`basename $$file`; \
|
|
||||||
+ if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' ]; then \
|
|
||||||
$(INSTALL_DATA) $$file \
|
|
||||||
$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
|
|
||||||
fi \
|
|
@ -1,13 +0,0 @@
|
|||||||
--- kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt.kcachegrind 2012-09-08 12:06:51.000000000 +0200
|
|
||||||
+++ kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt 2012-09-30 21:43:25.863163587 +0200
|
|
||||||
@@ -26,8 +26,8 @@
|
|
||||||
|
|
||||||
tde_install_icons( )
|
|
||||||
install( FILES kdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
|
||||||
-install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
|
|
||||||
-install( FILES x-kdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
|
|
||||||
+install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind )
|
|
||||||
+install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
|
|
||||||
|
|
||||||
|
|
||||||
##### kdecachegrind (executable) ##################
|
|
@ -1,11 +0,0 @@
|
|||||||
--- kdesdk-3.5.13.1/kbabel/ConfigureChecks.cmake.ORI 2012-09-30 21:50:19.573288788 +0200
|
|
||||||
+++ kdesdk-3.5.13.1/kbabel/ConfigureChecks.cmake 2012-09-30 21:50:26.499538745 +0200
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
#
|
|
||||||
#################################################
|
|
||||||
|
|
||||||
-find_program( LEX_EXECUTABLE "lex" )
|
|
||||||
+find_program( LEX_EXECUTABLE "flex" )
|
|
||||||
if( NOT LEX_EXECUTABLE )
|
|
||||||
tde_message_fatal( "lex is required, but was not found on your system" )
|
|
||||||
endif( )
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
|||||||
diff -up kdesdk-3.5.7/kioslave/svn/configure.in.in.svn kdesdk-3.5.7/kioslave/svn/configure.in.in
|
|
||||||
--- kdesdk-3.5.7/kioslave/svn/configure.in.in.svn 2005-10-10 09:58:25.000000000 -0500
|
|
||||||
+++ kdesdk-3.5.7/kioslave/svn/configure.in.in 2007-09-12 09:39:42.000000000 -0500
|
|
||||||
@@ -86,7 +86,7 @@ fi
|
|
||||||
AC_SUBST(SVNCONFIG)
|
|
||||||
if test -x "$SVNCONFIG"; then
|
|
||||||
SVNLD="`$SVNCONFIG --ldflags`"
|
|
||||||
- SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
|
|
||||||
+ SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1 -lsvn_subr-1"
|
|
||||||
SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
|
|
||||||
dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
|
|
||||||
SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
|
|
||||||
@@ -141,7 +141,7 @@ dnl AC_MSG_ERROR([Subversion headers ar
|
|
||||||
SVN_SUBDIR=
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
|
|
||||||
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
|
|
||||||
SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
|
|
||||||
SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
|
|
||||||
|
|
Loading…
Reference in new issue