summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-01-18 00:15:14 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-01-18 00:15:14 +0000
commit380796c32a0868d032e63504026529a75039aea0 (patch)
tree3abd925e575d4201efdf16a96da73eb721b4ba06 /kde-base/kdeedu
parentAdded KDE 4.0.0's kopete. (diff)
downloadhistorical-380796c32a0868d032e63504026529a75039aea0.tar.gz
historical-380796c32a0868d032e63504026529a75039aea0.tar.bz2
historical-380796c32a0868d032e63504026529a75039aea0.zip
Added patches.
Package-Manager: portage-2.1.4
Diffstat (limited to 'kde-base/kdeedu')
-rw-r--r--kde-base/kdeedu/ChangeLog6
-rw-r--r--kde-base/kdeedu/files/kstars-4.0.0-destdir.patch17
-rw-r--r--kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch12
3 files changed, 34 insertions, 1 deletions
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}\\"")