Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=718ca6d4324e3f77f16b1abe7721c4d7ee1875a2
commit 718ca6d4324e3f77f16b1abe7721c4d7ee1875a2
Author: crazy <cr...@frugalware.org>
Date: Wed Feb 10 17:13:29 2010 +0100
kdelibs-4.4.0-1-x86_64
* Version bump
* added patch from svn to fix nepomuk mem leak
* added patch to change how kde4 uses rpath on install
* added patch for konq so DEFAULT_UAGENT shows "Frugalware Linux" too
* added small patch to *cmake to print C/CXX{FLAGS} so makepkg still
* can get these even with quiet mode =)
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index e5f986b..15f579a 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -7,13 +7,21 @@ pkgdesc="KDE4 Core Libraries."
groups=('kde')
replaces=('kat')
archs=('i686' 'x86_64' 'ppc')
-_F_kde_unstable=1
_F_kde_subpkgs_custom_path=1
Finclude kde
depends=()
## for now
makedepends=("${makedepen...@]}" "krb5")
-sha1sums=('be9b8ec17326aaed21565a830133d9dbd6025dd8')
+source=($source \
+ kdelibs4-no-rpath.patch \
+ konq-is-frugalware.patch \
+ nepomuk-fix-mem-leak.patch \
+ cmake-print-c-cxx-flags.patch)
+sha1sums=('86d2f40e2b838fbe60e625dd2450b871c9bfe5c7' \
+ '841e89307434b6fc3371556a6d9cbb6d781d3811' \
+ '73d8770d3751b0bfc3e3a829a314a195efa991af' \
+ '0b87ffbec92b8c7d83671204d9bfb41c582f4a4e' \
+ 'bc22788b4dc93121c583dcefa1903ab63c3135b8')
## conflicts kdebase-workspace<=4.3.5
diff --git a/source/kde/kdelibs/cmake-print-c-cxx-flags.patch
b/source/kde/kdelibs/cmake-print-c-cxx-flags.patch
new file mode 100644
index 0000000..f3b95e0
--- /dev/null
+++ b/source/kde/kdelibs/cmake-print-c-cxx-flags.patch
@@ -0,0 +1,14 @@
+diff -Naur kdelibs-4.4.0/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.4.0-cmake-print-flags/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.4.0/cmake/modules/FindKDE4Internal.cmake 2010-01-20
00:15:16.000000000 +0100
++++ kdelibs-4.4.0-cmake-print-flags/cmake/modules/FindKDE4Internal.cmake
2010-02-10 15:50:35.000000000 +0100
+@@ -1084,8 +1084,10 @@
+
+ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long
-std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration
-Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security
-Wmissing-format-attribute -fno-common")
++ message(STATUS "CFLAGS: ${CMAKE_C_FLAGS}")
+ # As off Qt 4.6.x we need to override the new exception macros if we
want compile with -fno-exceptions
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor
-Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W
-Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS
-fno-check-new -fno-common")
++ message(STATUS " CXXFLAGS: ${CMAKE_CXX_FLAGS}")
+ add_definitions (-D_BSD_SOURCE)
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+
diff --git a/source/kde/kdelibs/kdelibs4-no-rpath.patch
b/source/kde/kdelibs/kdelibs4-no-rpath.patch
new file mode 100644
index 0000000..fb7db2e
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs4-no-rpath.patch
@@ -0,0 +1,25 @@
+diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath
kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath
2010-02-02 08:56:04.117624211 -0600
++++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake 2010-02-02
09:51:15.752373945 -0600
+@@ -947,10 +947,19 @@ if (UNIX)
+ set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+ else (APPLE)
+ # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by
cmake when compiling
+- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
++ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
++ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH:
${CMAKE_SYSTEM_LIBRARY_PATH}")
++ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
++ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR}
_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
++ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH:
${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
++ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
++ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
++ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+ endif (APPLE)
+ endif (UNIX)
+
diff --git a/source/kde/kdelibs/konq-is-frugalware.patch
b/source/kde/kdelibs/konq-is-frugalware.patch
new file mode 100644
index 0000000..50509d4
--- /dev/null
+++ b/source/kde/kdelibs/konq-is-frugalware.patch
@@ -0,0 +1,13 @@
+diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding
kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp
+--- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding 2008-01-04
18:00:15.000000000 -0600
++++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp 2008-03-07 14:49:46.000000000
-0600
+@@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag
+
+ // DEFAULT USERAGENT STRING
+ #define CFG_DEFAULT_UAGENT(X) \
+-QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko)") \
++QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko) Frugalware Linux") \
+
.arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
+
+ #define PRIVATE_DATA \
+
diff --git a/source/kde/kdelibs/nepomuk-fix-mem-leak.patch
b/source/kde/kdelibs/nepomuk-fix-mem-leak.patch
new file mode 100644
index 0000000..7e8c355
--- /dev/null
+++ b/source/kde/kdelibs/nepomuk-fix-mem-leak.patch
@@ -0,0 +1,12 @@
+Index: nepomuk/query/queryserviceclient.cpp
+===================================================================
+--- nepomuk/query/queryserviceclient.cpp (Revision 1087528)
++++ nepomuk/query/queryserviceclient.cpp (Revision 1087529)
+@@ -177,6 +177,7 @@
+ Nepomuk::Query::QueryServiceClient::~QueryServiceClient()
+ {
+ close();
++ delete d->queryServiceInterface;
+ delete d;
+ }
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
