Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ef16e1f49f3cc62167393bd10128f1f2280e3f6
commit 8ef16e1f49f3cc62167393bd10128f1f2280e3f6 Author: crazy <cr...@frugalware.org> Date: Wed Mar 31 13:38:56 2010 +0200 kdelibs-4.4.2-1-x86_64 * Version bump ( full split ) * synced from kdetesting diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index c669bf5..258cf9f 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -7,21 +7,336 @@ pkgdesc="KDE4 Core Libraries." groups=('kde') replaces=('kat') archs=('i686' 'x86_64' 'ppc') +_F_kde_subpkgs_custom_path=1 Finclude kde -depends=("${depen...@]}" 'bzip2' 'fontconfig' 'gamin' 'jasper' 'libgif' 'libkrb5' 'libpng' \ - "libqtdbus>=$_F_kde_qtver" "libqtdesigner>=$_F_kde_qtver" "libqtnetwork>=$_F_kde_qtver" \ - "libqtopengl>=$_F_kde_qtver" "libqtsql>=$_F_kde_qtver" "libqtsvg>=$_F_kde_qtver" \ - "libqttest>=$_F_kde_qtver" "libqtuitools>=$_F_kde_qtver" \ - 'libqtwebkit' 'libsm' 'libxcursor' 'libxdamage' 'libxfixes' 'libxft' 'libxinerama' \ - 'libxrandr' 'libxpm' 'libxslt' 'libxtst' 'openexr' 'pcre' 'phonon>=4.3.80' 'shared-mime-info' \ - 'soprano>=2.4.1' 'strigi>=0.7.2-2' 'xfsprogs-acl' 'xfsprogs-attr' 'xz' 'attica' 'shared-desktop-ontologies' \ - 'polkit-qt-1' 'libxscrnsaver' 'qca') -makedepends=("${makedepen...@]}" 'alsa-lib' 'avahi-compat' 'aspell' 'enchant' 'hspell' 'krb5' \ - "libqt3support>=$_F_kde_qtver" "libqtgui>=$_F_kde_qtver" "libqtxml>=$_F_kde_qtver" \ - "libqtscript>=$_F_kde_qtver" 'libstrigiqtdbusclient' 'libxrender' 'libxi') -#source=("${sour...@]}" default-fonts.patch) -replaces=('$pkgname-experimental') -provides=('$pkgname-experimental') -sha1sums=('2430d0c19bc4d62d942de4918e3f73dd11ed6ae5') +depends=() +## for now +makedepends=("${makedepen...@]}" "krb5" "libqttest>=$_F_kde_qtver") +source=($source \ + kdelibs4-no-rpath.patch \ + konq-is-frugalware.patch \ + cmake-print-c-cxx-flags.patch) +sha1sums=('25df6bdd8839af234f6871ebce395ca890098d90' \ + '841e89307434b6fc3371556a6d9cbb6d781d3811' \ + '73d8770d3751b0bfc3e3a829a314a195efa991af' \ + 'bc22788b4dc93121c583dcefa1903ab63c3135b8') +## conflicts kdebase-workspace<=4.3.5 + +## Qt4 like :) + +DNSSDDEP="libdnssd>=$_F_kde_ver" +KATEDEP="libkdekate>=$_F_kde_ver" +KDE3SUPPORTDEP="libkde3support>=$_F_kde_ver" +KDECOREDEP="libkdecore>=$_F_kde_ver" +KDESUDEP="libkdesu>=$_F_kde_ver" +WEBKITDEP="libkdewebkit>=$_F_kde_ver" +KFILEDEP="libkfile>=$_F_kde_ver" +KHTMLDEP="libkhtml>=$_F_kdever" +KNEWDEP="libknewstuff>=$_F_kde_ver" +KNOTITYDEP="libknotify>=$_F_kde_ver" +KROSSDEP="libkross>=$_F_kde_ver" +KUTILSDEP="libkutils>=$_F_kde_ver" +NEPOMUKDEP="libnepomuk>=$_F_kde_ver" +PLASMADEP="libplasma>=$_F_kde_ver" +THREADWDEP="libthreadweaver>=$_F_kde_ver" + +Qt4="$_F_kde_qtver" + +################################## +## auto-split magic starts here ## +################################## + + +subpkgs=("${subpk...@]}" "libkde3support") +subdescs=("${subdes...@]}" "Libraries to support KDE3 code.") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 libqt3support>=$Qt4 libqtsvg>=$Qt4 + polkit-qt-1 gamin xfsprogs-attr libsm libxcursor libpng fontconfig libxi") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP $KDESUDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libplasma") +subdescs=("${subdes...@]}" "Framework for the KDE desktop shell and its widgets.") +subdepends=("${subdepen...@]}" "libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libqtopengl>=$Qt4 + qca gamin xfsprogs-attr libqtdbus libxcb libxdamage polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP $KNEWDEP $THREADWDEP $DNSSDDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libnepomuk") +subdescs=("${subdes...@]}" "Semantic information retrieval and tagging.") +subdepends=("${subdepen...@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 soprano>=2.4.1 bzip2 polkit-qt-1 libxext shared-desktop-ontologies") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libdnssd") +subdescs=("${subdes...@]}" "Interface to support the DNS-SD (Zeroconf) protocol.") +subdepends=("${subdepen...@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext polkit-qt-1 avahi") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libknotify") +subdescs=("${subdes...@]}" "User Notification Libraries.") +subdepends=("${subdepen...@]}" "phonon>=4.4.0 gamin xfsprogs-attr bzip2 libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkross") +subdescs=("${subdes...@]}" "Scripting Libraries.") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtsvg>=$Qt4 libqtdbus>=$Qt4 libqtdesigner>=$Qt4 + gamin xfsprogs-attr libpng fontconfig libxi polkit-qt-1 libsm libxcursor") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP $KFILEDEP libkjsembed>=$_F_kde_ver") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkdewebkit") +subdescs=("${subdes...@]}" "KDE WebKit Library") +subdepends=("${subdepen...@]}" "libqtwebkit>=$Qt4 libqtgui>=$Qt4 libqtdbus>=$Qt4 gamin xfsprogs-attr bzip2 libxext libxcb polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkhtml") +subdescs=("${subdes...@]}" "HTML rendering widget designed for Konqueror.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 libjpeg libgif pcre libxcb gamin xfsprogs-attr libxext bzip2 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP kdelibs-interfaces>=$_F_kde_ver") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkfile") +subdescs=("${subdes...@]}" "File management widgets and dialogs libraries.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 gamin xfsprogs-attr bzip2 libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libknewstuff") +subdescs=("${subdes...@]}" "Allows applications to easily download data from the Internet.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 gamin xfsprogs-attr bzip2 libxext polkit-qt-1 attica>=0.1.2") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkdewidgets") +subdescs=("${subdes...@]}" "KDE custom widgets for Qt Designer.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtnetwork>=$Qt4 libqtdbus>=$Qt4 libqtsql>=$Qt4 + libstdc++ zlib strigi>=0.7.2 xfsprogs-acl libxrender libice libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP $KDESUDEP $KDE3SUPPORTDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkjsembed") +subdescs=("${subdes...@]}" "ECMAScript bindings libraries.") +subdepends=("${subdepen...@]}" "libqtuitools>=$Qt4 libqtdbus>=$Qt4 bzip2 libx11 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkutils") +subdescs=("${subdes...@]}" "Utility library for printing, chatting and more.") +subdepends=("${subdepen...@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxscrnsaver gamin xfsprogs-attr bzip2 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libthreadweaver") +subdescs=("${subdes...@]}" "Job-based threading library.") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libgcc") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkimgio") +subdescs=("${subdes...@]}" "Gimgio class extension libraries.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 jasper libxext bzip2 polkit-qt-1 openexr") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "libkunitconversion") +subdescs=("${subdes...@]}" "KDE Unit conversation library.") +subdepends=("${subdepen...@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +_F_kde_subpkgs=("${subpk...@]}") + +################################# +## auto-split magic stops here ## +################################# + +## we have to rename it to libkdekate since there is already libkate in the repos +subpkgs=("${subpk...@]}" "libkdekate") +subdescs=("${subdes...@]}" "KPart for Kate (KDE Advanced Text Editor).") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 libqtscript>=$Qt4 gamin xfsprogs-attr bzip2 libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP $KUTILSDEP kdelibs-interfaces>=$_F_kde_ver") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "ksgmltools2") +subdescs=("${subdes...@]}" "KDE doc tools.") +subdepends=("${subdepen...@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 libxslt bzip2 gamin xfsprogs-attr libxext polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "sonnet-plugin-hspell") +subdescs=("${subdes...@]}" "Natural language processing for hspell") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 bzip2 polkit-qt-1 hspell") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "sonnet-plugin-aspell") +subdescs=("${subdes...@]}" "Natural language processing for aspell") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 aspell bzip2 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "sonnet-plugin-enchant") +subdescs=("${subdes...@]}" "Natural language processing for enchant") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 enchant bzip2 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +## maybe split more ? interfces/<foo> ? worth doing that ? +subpkgs=("${subpk...@]}" "$pkgname-interfaces") +subdescs=("${subdes...@]}" "Kparts interface for text editors, mediaplayer and scripting.") +subdepends=("${subdepen...@]}" "gamin xfsprogs-attr bzip2 libxext polkit-qt-1 phonon>=4.4.0") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +## this need kpty +subpkgs=("${subpk...@]}" "libkdesu") +subdescs=("${subdes...@]}" "Library for password entering and handling.") +subdepends=("${subdepen...@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 bzip2 polkit-qt-1") +subrodepends=("${subrodepen...@]}" "$KDECOREDEP") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +######## libkdecore / libkdecore-data ############### +## projects in here: ## +## kinit , kdecore , kded , cmake , includes ## +## kconf_update , kio , kioslave , interfaces/kio ## +## mimetypes , licenses , solid, kdeui, kjs, solid ## +##################################################### + + +## WARNING : DO NOT REMOVE *kparts , kdeui , kjs , solid* +## from here since these create weird circular depends() -- crazy -- ( KDE 4.4 ) +## FIXME!! + +subpkgs=("${subpk...@]}" "libkdecore") +subdescs=("${subdes...@]}" "KDE4 Core Library.") +subdepends=("${subdepen...@]}" "libqtnetwork>=$Qt4 pcre xz polkit-qt-1 libgcc strigi>=0.7.2-2 xfsprogs-acl libxrender libice \ + libxtst libxfixes libuuid libkrb5 shared-mime-info") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +##FIXME!!! what to do with these ? +subpkgs=("${subpk...@]}" "libkdecore-data") +subdescs=("${subdes...@]}" "Data files ( desktop files , protocol files , man , icons).") +subdepends=("${subdepen...@]}" "") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'kde kde-core') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +rodepends=("${rodepen...@]}" "${subpk...@]}") + +subpkgs=("${subpk...@]}" "$pkgname-docs") +subdescs=("${subdes...@]}" "Kelibs Documentation") +subdepends=("${subdepen...@]}" "") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'docs-extra kde-docs') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpk...@]}" "$pkgname-compiletime") +subdescs=("${subdes...@]}" "Kelibs extra headers, cmake and pkgconfig files") +subdepends=("${subdepen...@]}" "") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'devel-extra kde-build') +subarchs=("${subarc...@]}" 'i686 x86_64 ppc') + + +build() +{ + Fcd + ## First some magic -- FIXME: need patch-$arch .. + sed -i -e 's|KDE_VERSION_STRING.*|KDE_VERSION_STRING "(KDE ${KDE_VERSION}) Frugalware Linux")|g' CMakeLists.txt || Fdie + KDE_make_split + + ##### likdecore / libkdecore-data start ####### + KDE_project_install kdecore + KDE_project_install kinit + KDE_project_install kded + KDE_project_install kconf_update + KDE_project_install kio + KDE_project_install kioslave + KDE_project_install interfaces/kio + KDE_project_install licenses + KDE_project_install mimetypes + KDE_project_install kjs + KDE_project_install kdeui + KDE_project_install kparts + KDE_project_install solid + + ## KDEUI has 2 icon folders ? hmm ? what for ? + ## And why do we need desktop files for the libs ? .protocol files ? colors ??? + ## These are kdebase-runtime files ? no ?:) I'm lost :-D + + ## OK -data subpackage -> man pages + KDE_project_install doc + Frm usr/share/doc + Finstallrel 644 ./cmake/modules/*.1 /usr/share/man/man1/ + + Fsplit libkdecore-data usr/share/apps/kdeui/about + Fsplit libkdecore-data usr/share/apps/kdeui/pics + Fsplit libkdecore-data usr/share/kde4/services + Fsplit libkdecore-data usr/share/kde4/servicetypes + Fsplit libkdecore-data usr/share/apps/LICENSES + Fsplit libkdecore-data etc/kde/config/colors + Fsplit libkdecore-data etc/xdg/menus + Fsplit libkdecore-data usr/share/man + + ## now split the rest to libkdecore + Fsplit libkdecore /\* + + ## ksgmltools2 + KDE_project_split ksgmltools2 kdoctools + ## kate + KDE_project_install kate + Fsplit libkdekate /\* + + ## sonnet-plugins + KDE_project_split sonnet-plugin-hspell sonnet/plugins/hspell + KDE_project_split sonnet-plugin-aspell sonnet/plugins/aspell + KDE_project_split sonnet-plugin-enchant sonnet/plugins/enchant + + ## libkdesu + KDE_project_install kdesu + KDE_project_install kpty + Fsplit libkdesu /\* + + ## -interfaces + KDE_project_install interfaces/khexedit + KDE_project_install interfaces/kimproxy + KDE_project_install interfaces/kmediaplayer + KDE_project_install interfaces/kregexpeditor + KDE_project_install interfaces/kspeech + KDE_project_install interfaces/ktexteditor + KDE_project_install interfaces/terminal + + Fsplit $pkgname-interfaces /\* + + KDE_install +} # optimization OK 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 \ + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git