diff options
23 files changed, 432 insertions, 23 deletions
diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog index dda3483fdaaa..4a409857195b 100644 --- a/kde-base/dolphin/ChangeLog +++ b/kde-base/dolphin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/dolphin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.1 2008/01/17 23:29:54 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.2 2008/01/18 00:10:28 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/dolphin-4.0.0-linkage.patch, + +files/dolphin-4.0.0-make-semantic-desktop-optional.patch: + Added patches. *dolphin-4.0.0 (17 Jan 2008) diff --git a/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch b/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch new file mode 100644 index 000000000000..dabf3e76368d --- /dev/null +++ b/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch @@ -0,0 +1,21 @@ +diff -ur kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt +--- kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt 2007-11-20 23:01:04.000000000 +0100 ++++ kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt 2007-12-10 13:23:37.000000000 +0100 +@@ -59,7 +59,7 @@ + + kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) + +-target_link_libraries(dolphinpart dolphinprivate) ++target_link_libraries(dolphinpart dolphinprivate ${KDE4_KPARTS_LIBS}) + + install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} ) + +@@ -113,7 +113,7 @@ + dolphinmainwindow.h DolphinMainWindow) + kde4_add_executable(dolphin ${dolphin_SRCS}) + +-target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate) ++target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} konq dolphinprivate) + + if (Nepomuk_FOUND) + target_link_libraries(dolphin ${NEPOMUK_LIBRARIES}) diff --git a/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch b/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch new file mode 100644 index 000000000000..d9c1efb26978 --- /dev/null +++ b/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch @@ -0,0 +1,35 @@ +commit b5a2927b633d2ad357febe13efc717b02f04a5ba +Author: Ingmar Vanhassel <ingmar.vanhassel@gmail.com> +Date: Sat Jan 12 15:28:44 2008 +0100 + + Make Nepomuk & Soprano optional dependencies. + Move the macro_optional_find_package({nepomuk,soprano}) statements before checking the results.r +--- + kdebase/apps/dolphin/src/CMakeLists.txt | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/kdebase/apps/dolphin/src/CMakeLists.txt b/kdebase/apps/dolphin/src/CMakeLists.txt +index f9902dc..c379e95 100644 +--- a/kdebase/apps/dolphin/src/CMakeLists.txt ++++ b/kdebase/apps/dolphin/src/CMakeLists.txt +@@ -1,3 +1,8 @@ ++macro_optional_find_package(Nepomuk) ++macro_optional_find_package(Soprano) ++macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) ++ ++configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) + + add_subdirectory( pics ) + add_subdirectory( tests ) +@@ -40,11 +45,6 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS + + kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) + +-find_package(Nepomuk) +-find_package(Soprano) +-macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) +- +-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) + + target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES}) + if (Nepomuk_FOUND) diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog index 25e88ef4a43f..43221ed0f207 100644 --- a/kde-base/kcheckpass/ChangeLog +++ b/kde-base/kcheckpass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kcheckpass # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.72 2008/01/17 23:36:20 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.73 2008/01/18 00:10:55 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdebase-4.0.0-pam-optional.patch: + Added patches. *kcheckpass-4.0.0 (17 Jan 2008) diff --git a/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch new file mode 100644 index 000000000000..6fb54f05c547 --- /dev/null +++ b/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch @@ -0,0 +1,29 @@ +diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake +index 3499836..cd1c2bb 100644 +--- a/kdebase/workspace/cmake/modules/FindPAM.cmake ++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake +@@ -5,6 +5,8 @@ + # PAM_INCLUDE_DIR - the pam include directory + # PAM_LIBRARIES - libpam library + ++if (WITH_PAM) ++ + if (PAM_INCLUDE_DIR AND PAM_LIBRARY) + # Already in cache, be silent + set(PAM_FIND_QUIETLY TRUE) +@@ -72,3 +74,5 @@ else (PAM_FOUND) + endif (PAM_FOUND) + + mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) ++ ++endif (WITH_PAM) +diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake +index ed8ab9e..ce3bcc2 100644 +--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake ++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake +@@ -1,4 +1,4 @@ +-find_package(PAM) ++macro_optional_find_package(PAM) + + set(UNIXAUTH_LIBRARIES) + set(UNIXAUTH_INCLUDE_DIRS) diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog index bc070399d336..7f89d8ce8d2b 100644 --- a/kde-base/kdeadmin/ChangeLog +++ b/kde-base/kdeadmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeadmin # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.200 2008/01/17 23:39:55 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.201 2008/01/18 00:11:20 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/lilo-config-4.0.0.patch: + Added patches. *kdeadmin-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdeadmin/files/lilo-config-4.0.0.patch b/kde-base/kdeadmin/files/lilo-config-4.0.0.patch new file mode 100644 index 000000000000..7f17fc048cda --- /dev/null +++ b/kde-base/kdeadmin/files/lilo-config-4.0.0.patch @@ -0,0 +1,23 @@ +diff -ur kdeadmin-3.96.0/doc/CMakeLists.txt /kdeadmin-3.96.0/doc/CMakeLists.txt +--- kdeadmin-3.96.0/doc/CMakeLists.txt 2007-06-27 12:51:13.000000000 +0200 ++++ /kdeadmin-3.96.0/doc/CMakeLists.txt 2007-11-22 11:34:12.000000000 +0100 +@@ -2,7 +2,7 @@ + #add_subdirectory(kdat) + #add_subdirectory(ksysv) + +-FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo ) ++SET(LILO_EXECUTABLE ALWAYS_ON) + + if ( UNIX ) + add_subdirectory(kuser) +diff -ur kdeadmin-3.96.0/lilo-config/CMakeLists.txt /kdeadmin-3.96.0/lilo-config/CMakeLists.txt +--- kdeadmin-3.96.0/lilo-config/CMakeLists.txt 2006-10-26 04:22:38.000000000 +0200 ++++ /kdeadmin-3.96.0/lilo-config/CMakeLists.txt 2007-11-22 11:34:08.000000000 +0100 +@@ -1,6 +1,6 @@ + project(lilo-config) + +-FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo ) ++SET(LILO_EXECUTABLE ALWAYS_ON) + + if(LILO_EXECUTABLE) + ADD_DEFINITIONS(-DUSE_KDE ) # added manually diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 170a1245a7b4..750e942ff6ee 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.97 2008/01/17 23:46:08 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.98 2008/01/18 00:12:51 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/gentoo-startkde.patch: + Added patches. *kdebase-startkde-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde.patch b/kde-base/kdebase-startkde/files/gentoo-startkde.patch new file mode 100644 index 000000000000..e2f73172127e --- /dev/null +++ b/kde-base/kdebase-startkde/files/gentoo-startkde.patch @@ -0,0 +1,50 @@ +diff --git a/startkde.cmake b/startkde.cmake +index ea2f4f2..7be9831 100755 +--- a/startkde.cmake ++++ b/startkde.cmake +@@ -2,11 +2,45 @@ + # + # DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ ) + # ++# vim: set filetype=sh : + + # When the X server dies we get a HUP signal from xinit. We must ignore it + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + ++# Gentoo: setup environment, filter other slotted KDE installs from PATH ++export KDEDIR=@REPLACE_PREFIX@ ++export KDEDIRS=/usr:/usr/local:${KDEDIR} ++export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++export LDPATH=@REPLACE_LIBS@:${LDPATH} ++ ++# Gentoo: Handle the ~/.kde symlink to ~/.kde$(version) ++# This is needed to sanely mix multiple slotted KDE versions, ++# without hosing settings of an older KDE version. ++[ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)" ++if [ -z "$HOME" ]; then ++ xmessage "HOME is unset. Your user config seems to be broken. Aborting." ++ exit 1 ++elif [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then ++ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." ++ exit 1 ++elif [ -n "$KDEHOME" ]; then ++ xmessage "You've set $KDEHOME manually. This script currently does not support a non-standard location for $KDEHOME. Please unset it and use the standard." > /dev/null 2>/dev/null ++ exit 1 ++elif [ -L "$HOME/.kde" ]; then ++ rm "$HOME/.kde" ++ ln -sf ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ ! -e "$HOME/.kde" ]; then ++ ln -s ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ -d "$HOME/.kde" ]; then ++ xmessage "~/.kde is not a symlink. Please move ~/.kde to ~/.kde3.5 (if appropriate) and symlink ~/.kde to it." > /dev/null 2>/dev/null ++ exit 1 ++else ++ xmessage "~/.kde is not a symlink or a dir. Make it a symlink to .kde$(basename $KDEDIR) or remove it." > /dev/null 2>/dev/null ++ exit 1 ++fi ++ + # Check if a KDE session already is running + if kcheckrunning >/dev/null 2>&1; then + echo "KDE seems to be already running on this display." diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 925ef2d1033b..1bbaa2bebd4a 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.412 2008/01/17 23:44:32 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.413 2008/01/18 00:12:20 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdebase-4.0.0-pam-optional.patch, +files/gentoo-startkde.patch: + Added patches. *kdebase-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdebase/files/gentoo-startkde.patch b/kde-base/kdebase/files/gentoo-startkde.patch new file mode 100644 index 000000000000..2aa30b943fc7 --- /dev/null +++ b/kde-base/kdebase/files/gentoo-startkde.patch @@ -0,0 +1,55 @@ + Added a patch to KDE/kdebase/workspace/startkde.cmake to start kde the gentoo way. +--- + kdebase/workspace/startkde.cmake | 31 +++++++++++++++++++++++++++++++ + 1 files changed, 31 insertions(+), 0 deletions(-) + +diff --git a/kdebase/workspace/startkde.cmake b/kdebase/workspace/startkde.cmake +index ea2f4f2..438e4e8 100755 +--- a/kdebase/workspace/startkde.cmake ++++ b/kdebase/workspace/startkde.cmake +@@ -2,11 +2,45 @@ + # + # DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ ) + # ++# vim: set filetype=sh : + + # When the X server dies we get a HUP signal from xinit. We must ignore it + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + ++# Gentoo: setup environment, filter other slotted KDE installs from PATH ++export KDEDIR=@REPLACE_PREFIX@ ++export KDEDIRS=/usr:/usr/local:${KDEDIR} ++export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++export LDPATH=@REPLACE_LIBS@:${LDPATH} ++ ++# Gentoo: Handle the ~/.kde symlink to ~/.kde$(version) ++# This is needed to sanely mix multiple slotted KDE versions, ++# without hosing settings of an older KDE version. ++[ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)" ++if [ -z "$HOME" ]; then ++ xmessage "HOME is unset. Your user config seems to be broken. Aborting." ++ exit 1 ++elif [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then ++ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." ++ exit 1 ++elif [ -n "$KDEHOME" ]; then ++ xmessage "You've set $KDEHOME manually. This script currently does not support a non-standard location for $KDEHOME. Please unset it and use the standard." > /dev/null 2>/dev/null ++ exit 1 ++elif [ -L "$HOME/.kde" ]; then ++ rm "$HOME/.kde" ++ ln -sf ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ ! -e "$HOME/.kde" ]; then ++ ln -s ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ -d "$HOME/.kde" ]; then ++ xmessage "~/.kde is not a symlink. Please move ~/.kde to ~/.kde3.5 (if appropriate) and symlink ~/.kde to it." > /dev/null 2>/dev/null ++ exit 1 ++else ++ xmessage "~/.kde is not a symlink or a dir. Make it a symlink to .kde$(basename $KDEDIR) or remove it." > /dev/null 2>/dev/null ++ exit 1 ++fi ++ + # Check if a KDE session already is running + if kcheckrunning >/dev/null 2>&1; then + echo "KDE seems to be already running on this display." diff --git a/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch new file mode 100644 index 000000000000..6fb54f05c547 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch @@ -0,0 +1,29 @@ +diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake +index 3499836..cd1c2bb 100644 +--- a/kdebase/workspace/cmake/modules/FindPAM.cmake ++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake +@@ -5,6 +5,8 @@ + # PAM_INCLUDE_DIR - the pam include directory + # PAM_LIBRARIES - libpam library + ++if (WITH_PAM) ++ + if (PAM_INCLUDE_DIR AND PAM_LIBRARY) + # Already in cache, be silent + set(PAM_FIND_QUIETLY TRUE) +@@ -72,3 +74,5 @@ else (PAM_FOUND) + endif (PAM_FOUND) + + mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) ++ ++endif (WITH_PAM) +diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake +index ed8ab9e..ce3bcc2 100644 +--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake ++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake +@@ -1,4 +1,4 @@ +-find_package(PAM) ++macro_optional_find_package(PAM) + + set(UNIXAUTH_LIBRARIES) + set(UNIXAUTH_INCLUDE_DIRS) diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog index 87065f0d5c80..11de345ca137 100644 --- a/kde-base/kdeedu/ChangeLog +++ b/kde-base/kdeedu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeedu # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.222 2008/01/17 23:46:55 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.223 2008/01/18 00:13:20 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kstars-4.0.0-destdir.patch, +files/marble-4.0.0-fix-tests.patch: + Added patches. *kdeedu-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch b/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch new file mode 100644 index 000000000000..4cf63b5f89db --- /dev/null +++ b/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch @@ -0,0 +1,17 @@ +--- kstars/kstars/indi/CMakeLists.txt ++++ kstars/kstars/indi/CMakeLists.txt +@@ -213,10 +213,10 @@ + #TODO fix for windows. + if(UNIX) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake +-"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200classic)\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200autostar)\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200_16)\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200gps)\n ++"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200classic\")\n ++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200autostar\")\n ++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200_16\")\n ++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200gps\")\n + ") + set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake) + endif(UNIX) diff --git a/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch b/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch new file mode 100644 index 000000000000..50b3df636cad --- /dev/null +++ b/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch @@ -0,0 +1,12 @@ +--- marble/tests/CMakeLists.txt ++++ marble/tests/CMakeLists.txt +@@ -9,7 +9,9 @@ + # source dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib ++ ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/AbstractLayer ++ ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/data + # include dirs + ${QT_INCLUDE_DIR} + ) + ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"") diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog index 7557ac80bbbe..9973fe22080a 100644 --- a/kde-base/kdegames/ChangeLog +++ b/kde-base/kdegames/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdegames # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.193 2008/01/17 23:47:38 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.194 2008/01/18 00:13:49 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/lskat-4.0.0-link.patch: + Added patches. *kdegames-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdegames/files/lskat-4.0.0-link.patch b/kde-base/kdegames/files/lskat-4.0.0-link.patch new file mode 100644 index 000000000000..283dd68d87fe --- /dev/null +++ b/kde-base/kdegames/files/lskat-4.0.0-link.patch @@ -0,0 +1,11 @@ +--- a/kdegames/lskat/src/CMakeLists.txt ++++ b/kdegames/lskat/src/CMakeLists.txt +@@ -31,7 +31,8 @@ configure_file(config-src.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-src.h) + kde4_add_app_icon(lskat_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-lskat.png") + kde4_add_executable( lskat ${lskat_SRCS} ) + +-target_link_libraries( lskat kdegames ) ++target_link_libraries( lskat ${KDE4_KNEWSTUFF2_LIBS} ++ kdegames ) + + install(TARGETS lskat DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog index 0f31d9b52003..16832de828e1 100644 --- a/kde-base/kdepasswd/ChangeLog +++ b/kde-base/kdepasswd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdepasswd # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.78 2008/01/17 23:53:03 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.79 2008/01/18 00:14:44 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdepasswd-4.0.0-linkage.patch: + Added patches. *kdepasswd-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdepasswd/files/kdepasswd-4.0.0-linkage.patch b/kde-base/kdepasswd/files/kdepasswd-4.0.0-linkage.patch new file mode 100644 index 000000000000..1156e1aeac90 --- /dev/null +++ b/kde-base/kdepasswd/files/kdepasswd-4.0.0-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/kdebase/apps/kdepasswd/kcm/CMakeLists.txt b/kdebase/apps/kdepasswd/kcm/CMakeLists.txt +index e34b684..a1fdcd1 100644 +--- a/kdebase/apps/kdepasswd/kcm/CMakeLists.txt ++++ b/kdebase/apps/kdepasswd/kcm/CMakeLists.txt +@@ -13,7 +13,7 @@ kde4_add_kcfg_files(kcm_useraccount_PART_SRCS settings.kcfgc) + + kde4_add_plugin(kcm_useraccount ${kcm_useraccount_PART_SRCS}) + +-target_link_libraries(kcm_useraccount konq ${KDE4_KDESU_LIBS}) ++target_link_libraries(kcm_useraccount konq ${KDE4_KPARTS_LIBS} ${KDE4_KDESU_LIBS}) + + install(TARGETS kcm_useraccount DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES kcm_useraccount.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index bb0c104a6fe1..cb0e7ef27e43 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdm # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.115 2008/01/17 23:58:05 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.116 2008/01/18 00:15:13 philantrop Exp $ + + 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdm-4.0.0-genkdmconf.patch, + +files/kdebase-4.0.0-pam-optional.patch: + Added patches. *kdm-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch new file mode 100644 index 000000000000..6fb54f05c547 --- /dev/null +++ b/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch @@ -0,0 +1,29 @@ +diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake +index 3499836..cd1c2bb 100644 +--- a/kdebase/workspace/cmake/modules/FindPAM.cmake ++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake +@@ -5,6 +5,8 @@ + # PAM_INCLUDE_DIR - the pam include directory + # PAM_LIBRARIES - libpam library + ++if (WITH_PAM) ++ + if (PAM_INCLUDE_DIR AND PAM_LIBRARY) + # Already in cache, be silent + set(PAM_FIND_QUIETLY TRUE) +@@ -72,3 +74,5 @@ else (PAM_FOUND) + endif (PAM_FOUND) + + mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) ++ ++endif (WITH_PAM) +diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake +index ed8ab9e..ce3bcc2 100644 +--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake ++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake +@@ -1,4 +1,4 @@ +-find_package(PAM) ++macro_optional_find_package(PAM) + + set(UNIXAUTH_LIBRARIES) + set(UNIXAUTH_INCLUDE_DIRS) diff --git a/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch b/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch new file mode 100644 index 000000000000..95d787cdc239 --- /dev/null +++ b/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch @@ -0,0 +1,49 @@ +Disable creating dirs in the live file system, +and let the package manager handle it. +diff -ur kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c +--- kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c 2007-12-09 06:56:49.000000000 +0100 ++++ kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c 2007-12-09 10:28:05.000000000 +0100 +@@ -266,43 +266,12 @@ + static int + mkpdirs( const char *name, const char *what ) + { +- char *mfname = mstrdup( name ); +- int i; +- struct stat st; +- +- for (i = 1; mfname[i]; i++) +- if (mfname[i] == '/') { +- mfname[i] = 0; +- if (stat( mfname, &st )) { +- if (mkdir( mfname, 0755 )) { +- fprintf( stderr, "Cannot create parent %s of %s directory %s: %s\n", +- mfname, what, name, strerror( errno ) ); +- free( mfname ); +- return False; +- } +- chmod( mfname, 0755 ); +- } +- mfname[i] = '/'; +- } +- free( mfname ); + return True; + } + + static int + mkdirp( const char *name, int mode, const char *what, int existok ) + { +- struct stat st; +- +- if (stat( name, &st )) { +- mkpdirs( name, what ); +- if (mkdir( name, mode )) { +- fprintf( stderr, "Cannot create %s directory %s: %s\n", +- what, name, strerror( errno ) ); +- return False; +- } +- chmod( name, mode ); +- return True; +- } + return existok; + } + diff --git a/kde-base/kpercentage/Manifest b/kde-base/kpercentage/Manifest index 8844a711e791..89f736d8710e 100644 --- a/kde-base/kpercentage/Manifest +++ b/kde-base/kpercentage/Manifest @@ -1,10 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST kdeedu-3.5.5.tar.bz2 30016358 RMD160 f431bd83c17a483e9cacbbfdc19bee4bcc692e49 SHA1 38bc64e6e0683e3c0e0218c534d10dc3a4b6455a SHA256 f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891 DIST kdeedu-3.5.6.tar.bz2 30049452 RMD160 ca70c9c9d9637154736c9f8978cbde8bfd2460ee SHA1 c081f33f8333fdf25cfd602facd511252152109a SHA256 d3b8471f26c83c05cadfb0ff48b5d8170034c5e6e436d514529e640037350a61 DIST kdeedu-3.5.7.tar.bz2 30158516 RMD160 7fb9d10314d2617cb40b51cc4e8663838780633a SHA1 9a27207e63721da4869f4196b45ad1bbec2660d0 SHA256 59e8638f9fc3481159c8f841ab7493f978464e288ce43ea9e13ea1178ded059b DIST kdeedu-3.5.8.tar.bz2 30158456 RMD160 e15dc74c572da3035b3daceb66c75b14d6e14818 SHA1 7e225d8e9c6c0d69b780f96babbed569d31b0b70 SHA256 dddd4bef001ece864afe9502fe82c460dcf6329b9522ae0a4a2d0b94b5648b9b +DIST kdeedu-4.0.0.tar.bz2 41887194 RMD160 468d00e6eee05ec62ae1c42199067597de92b661 SHA1 2328dd356a8de7814ed2cf6f28bc9ae797a2fa8c SHA256 9fa5f6af13a4101f0c83a428624f22835d2f5696157ccd0e23944beacf86a0d1 EBUILD kpercentage-3.5.5.ebuild 477 RMD160 df7bf9770f78db9d0831b982e84e8162aa89fe50 SHA1 1901b740499210757f3003b2464270e574373060 SHA256 e9fc066477140633814c916ba6938d531274beb96157fddb60dd18e39cc2ac80 MD5 39817ae196e8b11a0c7466f845851d3a kpercentage-3.5.5.ebuild 477 RMD160 df7bf9770f78db9d0831b982e84e8162aa89fe50 kpercentage-3.5.5.ebuild 477 @@ -21,10 +19,14 @@ EBUILD kpercentage-3.5.8.ebuild 485 RMD160 bf89ef17299be1c728048fb607a77137f891a MD5 790cb50f5dabab916428b183258812ad kpercentage-3.5.8.ebuild 485 RMD160 bf89ef17299be1c728048fb607a77137f891a7dd kpercentage-3.5.8.ebuild 485 SHA256 4633fd031c2f4c37cf301ba18fb536556a1f37977c844d113cdf6806fc83e577 kpercentage-3.5.8.ebuild 485 -MISC ChangeLog 8521 RMD160 a39e9f33cf6aa15086935b7883e31bc4ee316edc SHA1 34fd2d6d28a0ff39606f6e40de9eafbe6d592b50 SHA256 274d6887e70a98b63fe355be2ce56ed1b69b32f2c15dfdea34203da9d28a9679 -MD5 e4263ed374aa60ada67e7cd7b49ca017 ChangeLog 8521 -RMD160 a39e9f33cf6aa15086935b7883e31bc4ee316edc ChangeLog 8521 -SHA256 274d6887e70a98b63fe355be2ce56ed1b69b32f2c15dfdea34203da9d28a9679 ChangeLog 8521 +EBUILD kpercentage-4.0.0.ebuild 416 RMD160 09cf4b17ced5ce4a0318d89ccc87c29af7338ea2 SHA1 81dcfbfd38e12ec1a0af3f95672c358cf917cca4 SHA256 6f4f8b8b6922c5fc345ba061b2ac9a9a69087849e2b7676e50eef8a15a2ee5b9 +MD5 f34b797ddfb25b3b16d85951bbac5bca kpercentage-4.0.0.ebuild 416 +RMD160 09cf4b17ced5ce4a0318d89ccc87c29af7338ea2 kpercentage-4.0.0.ebuild 416 +SHA256 6f4f8b8b6922c5fc345ba061b2ac9a9a69087849e2b7676e50eef8a15a2ee5b9 kpercentage-4.0.0.ebuild 416 +MISC ChangeLog 8666 RMD160 d4477bff1b20808de86dc3d0610f12152b4581ad SHA1 c6beb021cc3558c0f0a60ee5402e998e2939870b SHA256 02daf3a2c0d4b1fcea12e918aeea4acfde9dc6c65aa24f49c42a959f735e8caf +MD5 9e4f4ce29126d49301bc0bcfb6bf64bf ChangeLog 8666 +RMD160 d4477bff1b20808de86dc3d0610f12152b4581ad ChangeLog 8666 +SHA256 02daf3a2c0d4b1fcea12e918aeea4acfde9dc6c65aa24f49c42a959f735e8caf ChangeLog 8666 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -41,10 +43,6 @@ SHA256 3b5556c639688cef33f35757e5dc39d97f9a16862b063b9e9b950dfd58b28e63 files/di MD5 5484ccc30043075426937f14d11f88fd files/digest-kpercentage-3.5.8 247 RMD160 791421a5ab7fd2d85121e253e20bd0a7ff1497dc files/digest-kpercentage-3.5.8 247 SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/digest-kpercentage-3.5.8 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHGTxpCkvF58q80IkRApw8AKCo6hnhw5uk73CQG+P/E8TqA04ajACffDa4 -X0Q6o+Hd4WusaC/vDxj3Q44= -=6d9B ------END PGP SIGNATURE----- +MD5 70d65b92c383d3d585d00b989dcf489d files/digest-kpercentage-4.0.0 247 +RMD160 4aff9ab69ac965d94a6d8bbc383dc1813129e349 files/digest-kpercentage-4.0.0 247 +SHA256 5fe3f0264323a1c9ff8e52228a5bab53675725391f9c1818d425ab5fc868d204 files/digest-kpercentage-4.0.0 247 |