Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=749e1b889edb01c6a271867384ee5d7f7d0cd700
commit 749e1b889edb01c6a271867384ee5d7f7d0cd700
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Mon Jan 18 23:09:56 2010 +0100
kdegames-4.3.4-1-i686
- add boson to replaces()
diff --git a/source/games-extra/boson/050_all_gcc43.patch
b/source/games-extra/boson/050_all_gcc43.patch
deleted file mode 100644
index 24a3560..0000000
--- a/source/games-extra/boson/050_all_gcc43.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/boson/programs/mainnoguimain.cpp
boson-all-0.13/code/boson/programs/mainnoguimain.cpp
---- boson-all-0.13.orig/code/boson/programs/mainnoguimain.cpp 2006-03-09
18:30:29.000000000 +0100
-+++ boson-all-0.13/code/boson/programs/mainnoguimain.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -55,11 +55,11 @@
- { 0, 0, 0 }
- };
-
- static bool parseArgs(MainNoGUIStartOptions* options, KCmdLineArgs* args);
- static bool parseAddComputerArgs(MainNoGUIStartOptions* options,
KCmdLineArgs* args);
--static bool parsePlayFieldArgs(MainNoGUIStartOptions* args, KCmdLineArgs*
args);
-+static bool parsePlayFieldArgs(MainNoGUIStartOptions* options, KCmdLineArgs*
args);
-
- static void postBosonConfigInit();
-
- int main(int argc, char **argv)
- {
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/include/ufo/util/urectangle.hpp
boson-all-0.13/code/ufo/include/ufo/util/urectangle.hpp
---- boson-all-0.13.orig/code/ufo/include/ufo/util/urectangle.hpp
2005-12-01 00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/include/ufo/util/urectangle.hpp 2008-05-05
16:52:40.000000000 +0200
-@@ -32,10 +32,13 @@
-
- #include "upoint.hpp"
- #include "udimension.hpp"
- #include "uinsets.hpp"
-
-+#include <cstdlib>
-+#include <memory>
-+
- namespace ufo {
-
- /** @short An abstraction of a rectangle (x, y, width and height).
- * @ingroup appearance
- *
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/gl/ugl_driver.cpp
boson-all-0.13/code/ufo/src/gl/ugl_driver.cpp
---- boson-all-0.13.orig/code/ufo/src/gl/ugl_driver.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/gl/ugl_driver.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -27,10 +27,12 @@
-
- #include "ufo/gl/ugl_driver.hpp"
-
- #include "ufo/usharedlib.hpp"
-
-+#include <cstdlib>
-+
- #ifdef UFO_OS_WIN32
- #define UFO_GL_LIB "OPENGL32.DLL"
- #else
- #define UFO_GL_LIB "libGL.so.1"
- #endif
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/uabstractcontext.cpp
boson-all-0.13/code/ufo/src/uabstractcontext.cpp
---- boson-all-0.13.orig/code/ufo/src/uabstractcontext.cpp 2005-08-22
02:58:03.000000000 +0200
-+++ boson-all-0.13/code/ufo/src/uabstractcontext.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -48,10 +48,11 @@
- // for key bindings
- #include "ufo/uinputmap.hpp"
- #include "ufo/ukeystroke.hpp"
- #include "ufo/events/uactionevent.hpp"
-
-+#include <cstdlib>
-
- using namespace ufo;
-
- //#define DEBUG_SEND 1
- //#define DEBUG_FIRE_MOUSE_EVENT 1
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/uabstractdisplay.cpp
boson-all-0.13/code/ufo/src/uabstractdisplay.cpp
---- boson-all-0.13.orig/code/ufo/src/uabstractdisplay.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/uabstractdisplay.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -43,10 +43,11 @@
- #include "ufo/gl/ugl_image.hpp"
- #include "ufo/image/uimageio.hpp"
- #include "ufo/uvolatiledata.hpp"
-
- #include <bitset>
-+#include <algorithm>
-
- namespace ufo {
-
- // FIXME: this should be in a file udisplay.cpp
- UDisplay * UDisplay::m_default = NULL;
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/uabstracttoolkit.cpp
boson-all-0.13/code/ufo/src/uabstracttoolkit.cpp
---- boson-all-0.13.orig/code/ufo/src/uabstracttoolkit.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/uabstracttoolkit.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -60,10 +60,13 @@
- #include "ufo/ux/uxwgldriver.hpp"
- #endif
-
- #include "ufo/uvideodriver.hpp"
-
-+#include <climits>
-+#include <cstring>
-+
- namespace ufo {
- bool operator<(const UPluginInfo & p1, const UPluginInfo & p2) {
- return ((p1.category < p2.category) || (p1.feature < p2.feature));
- }
- }
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/ubuttongroup.cpp
boson-all-0.13/code/ufo/src/ubuttongroup.cpp
---- boson-all-0.13.orig/code/ufo/src/ubuttongroup.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/ubuttongroup.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -29,10 +29,12 @@
-
- #include "ufo/widgets/ubutton.hpp"
- // special case for radio buttons
- #include "ufo/widgets/uradiobutton.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- UFO_IMPLEMENT_DYNAMIC_CLASS(UButtonGroup, UObject)
-
- UButtonGroup::UButtonGroup()
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/ucontextgroup.cpp
boson-all-0.13/code/ufo/src/ucontextgroup.cpp
---- boson-all-0.13.orig/code/ufo/src/ucontextgroup.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/ucontextgroup.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -29,10 +29,12 @@
-
- #include "ufo/ucontext.hpp"
- #include "ufo/utoolkit.hpp"
- #include "ufo/uvolatiledata.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- UFO_IMPLEMENT_DYNAMIC_CLASS(UContextGroup, UObject)
-
-
-diff --exclude='*.orig' -NrU5 boson-all-0.13.orig/code/ufo/src/ufo_debug.cpp
boson-all-0.13/code/ufo/src/ufo_debug.cpp
---- boson-all-0.13.orig/code/ufo/src/ufo_debug.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/ufo_debug.cpp 2008-05-05 16:52:40.000000000
+0200
-@@ -25,10 +25,11 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
- ***************************************************************************/
-
- #include "ufo/ufo_global.hpp"
-
-+#include <cstdlib>
- #include <cstring>
- #include <cstdarg>
- #include <cstdio> // for vsnprintf
-
- ufo::UDebugStream &
-diff --exclude='*.orig' -NrU5 boson-all-0.13.orig/code/ufo/src/ukeystroke.cpp
boson-all-0.13/code/ufo/src/ukeystroke.cpp
---- boson-all-0.13.orig/code/ufo/src/ukeystroke.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/ukeystroke.cpp 2008-05-05 16:52:40.000000000
+0200
-@@ -28,10 +28,11 @@
- #include "ufo/ukeystroke.hpp"
-
- #include "ufo/events/ukeyevent.hpp"
- #include "ufo/util/ustring.hpp"
-
-+#include <algorithm>
-
- using namespace ufo;
-
- UFO_IMPLEMENT_ABSTRACT_CLASS(UKeyStroke, UObject)
-
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/umenumanager.cpp
boson-all-0.13/code/ufo/src/umenumanager.cpp
---- boson-all-0.13.orig/code/ufo/src/umenumanager.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/umenumanager.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -36,10 +36,12 @@
- #include "ufo/events/umouseevent.hpp"
- #include "ufo/events/ukeyevent.hpp"
- #include "ufo/widgets/upopupmenu.hpp"
- #include "ufo/widgets/urootpane.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- UFO_IMPLEMENT_DYNAMIC_CLASS(UMenuManager, UObject)
-
- UMenuManager * UMenuManager::sm_menuManager = new UMenuManager();
-diff --exclude='*.orig' -NrU5 boson-all-0.13.orig/code/ufo/src/uobject.cpp
boson-all-0.13/code/ufo/src/uobject.cpp
---- boson-all-0.13.orig/code/ufo/src/uobject.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/uobject.cpp 2008-05-05 16:52:40.000000000
+0200
-@@ -28,10 +28,12 @@
- #include "ufo/uobject.hpp"
-
- #include "ufo/signals/ufo_signals.hpp"
- #include "ufo/ufo_types.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- #ifdef UFO_RTTI
-
- //
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/ux/uxdisplay.cpp
boson-all-0.13/code/ufo/src/ux/uxdisplay.cpp
---- boson-all-0.13.orig/code/ufo/src/ux/uxdisplay.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/ux/uxdisplay.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -41,10 +41,12 @@
-
- #include "ufo/widgets/urootpane.hpp"
-
- #include "ufo/gl/ugl_driver.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- UFO_IMPLEMENT_DYNAMIC_CLASS(UXDisplay, UAbstractDisplay)
-
- class UXDummyDriver : public UVideoDriver {
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/code/ufo/src/widgets/uwidget.cpp
boson-all-0.13/code/ufo/src/widgets/uwidget.cpp
---- boson-all-0.13.orig/code/ufo/src/widgets/uwidget.cpp 2005-12-01
00:13:04.000000000 +0100
-+++ boson-all-0.13/code/ufo/src/widgets/uwidget.cpp 2008-05-05
16:52:40.000000000 +0200
-@@ -67,10 +67,12 @@
-
- #include "ufo/ugraphics.hpp"
-
- #include "ufo/umodel.hpp"
-
-+#include <algorithm>
-+
- using namespace ufo;
-
- class PaintNotifier
- {
- public:
diff --git a/source/games-extra/boson/090_all_KDE3Macros.cmake.patch
b/source/games-extra/boson/090_all_KDE3Macros.cmake.patch
deleted file mode 100644
index 6bd2099..0000000
--- a/source/games-extra/boson/090_all_KDE3Macros.cmake.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff --exclude='*.orig' -NrU5
boson-all-0.13.orig/cmake/modules/boson/KDE3Macros.cmake
boson-all-0.13/cmake/modules/boson/KDE3Macros.cmake
---- boson-all-0.13.orig/cmake/modules/boson/KDE3Macros.cmake 2006-06-24
14:35:16.000000000 +0200
-+++ boson-all-0.13/cmake/modules/boson/KDE3Macros.cmake 2008-05-05
17:09:28.000000000 +0200
-@@ -1,6 +1,6 @@
--
-+#
-
- # See FindKDE3.cmake for documentation.
- #
- # this file contains the following macros:
- # KDE3_ADD_DCOP_SKELS
-@@ -34,13 +34,14 @@
- IF (NOT HAVE_${_basename}_KIDL_RULE)
- SET(HAVE_${_basename}_KIDL_RULE ON)
-
- ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
- COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
-- ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} > ${_kidl}
-+ ARGS ${_tmp_FILE} > ${_kidl}
- DEPENDS ${_tmp_FILE}
- )
-+
- ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
-
- IF (NOT HAVE_${_basename}_SKEL_RULE)
- SET(HAVE_${_basename}_SKEL_RULE ON)
-
-@@ -73,12 +74,12 @@
- SET(HAVE_${_basename}_KIDL_RULE ON)
-
-
- ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
- COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
-- ARGS ${tmp_FILE} > ${_kidl}
-- DEPENDS ${tmp_FILE}
-+ ARGS ${_tmp_FILE} > ${_kidl}
-+ DEPENDS ${_tmp_FILE}
- )
-
- ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
-
-
-@@ -161,19 +162,19 @@
- SET(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
-
- ADD_CUSTOM_COMMAND(OUTPUT ${_header}
- COMMAND ${QT_UIC_EXECUTABLE}
-- ARGS -nounload -o ${_header}
${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
-+ ARGS -L ${KDE3_LIB_DIR}/kde3/plugins/designer -nounload -o
${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
- DEPENDS ${_tmp_FILE}
- )
-
- ADD_CUSTOM_COMMAND(OUTPUT ${_src}
- COMMAND ${CMAKE_COMMAND}
- ARGS
-+ -DKDE_UIC_PLUGIN_DIR:FILEPATH=${KDE3_LIB_DIR}/kde3/plugins/designer
- -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
-- -DKDE_UIC_PLUGIN_DIR:PATH=${KDE3_LIB_DIR}/kde3/plugins/designer
- -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
- -DKDE_UIC_CPP_FILE:FILEPATH=${_src}
- -DKDE_UIC_H_FILE:FILEPATH=${_header}
- -P ${KDE3_MODULE_DIR}/kde3uic.cmake
- DEPENDS ${_header}
-@@ -235,53 +236,68 @@
-
- ENDIF (EXISTS ${_abs_FILE} AND NOT _skip)
- ENDFOREACH (_current_FILE)
- ENDMACRO(KDE3_AUTOMOC)
-
-+# only used internally by KDE3_INSTALL_ICONS
-+MACRO (_KDE3_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group
_orig_NAME _install_NAME)
-
--MACRO(KDE3_INSTALL_ICONS _theme)
-- ADD_CUSTOM_TARGET(install_icons )
-- SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake )
-- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon
installations rules\n")
-- FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
"SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
--
-- FILE(GLOB _icons *.png)
-- FOREACH(_current_ICON ${_icons} )
-- STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\1" _size "${_current_ICON}")
-- STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\2" _group "${_current_ICON}")
-- STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\3" _name "${_current_ICON}")
--
-+ # if the string doesn't match the pattern, the result is the full string,
so all three have the same content
-+ IF (NOT ${_group} STREQUAL ${_install_NAME} )
- SET(_icon_GROUP "actions")
-
-- IF(${_group} STREQUAL "mime")
-+ IF (${_group} STREQUAL "mime")
- SET(_icon_GROUP "mimetypes")
-- ENDIF(${_group} STREQUAL "mime")
-+ ENDIF (${_group} STREQUAL "mime")
-
-- IF(${_group} STREQUAL "filesys")
-+ IF (${_group} STREQUAL "filesys")
- SET(_icon_GROUP "filesystems")
-- ENDIF(${_group} STREQUAL "filesys")
-+ ENDIF (${_group} STREQUAL "filesys")
-
-- IF(${_group} STREQUAL "device")
-+ IF (${_group} STREQUAL "device")
- SET(_icon_GROUP "devices")
-- ENDIF(${_group} STREQUAL "device")
-+ ENDIF (${_group} STREQUAL "device")
-
-- IF(${_group} STREQUAL "app")
-+ IF (${_group} STREQUAL "app")
- SET(_icon_GROUP "apps")
-- ENDIF(${_group} STREQUAL "app")
-+ ENDIF (${_group} STREQUAL "app")
-
-- IF(${_group} STREQUAL "action")
-+ IF (${_group} STREQUAL "action")
- SET(_icon_GROUP "actions")
-- ENDIF(${_group} STREQUAL "action")
-+ ENDIF (${_group} STREQUAL "action")
-
- # message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group}
name: ${_name}" )
-- SET(_ICON_INSTALL_NAME
${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
-- FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
"message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
-- FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
"CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
-+ INSTALL(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/
RENAME ${_install_NAME} )
-+ ENDIF (NOT ${_group} STREQUAL ${_install_NAME} )
-+
-+ENDMACRO (_KDE3_ADD_ICON_INSTALL_RULE)
-+
-+
-+MACRO (KDE3_INSTALL_ICONS _theme )
-+ SET(_defaultpath "${CMAKE_INSTALL_PREFIX}/share/icons")
-+ # first the png icons
-+ FILE(GLOB _icons *.png)
-+ FOREACH (_current_ICON ${_icons} )
-+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\1" _size "${_current_ICON}")
-+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\2" _group "${_current_ICON}")
-+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$"
"\\3" _name "${_current_ICON}")
-+
_KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
-+ ${_defaultpath}/${_theme}/${_size}x${_size}
-+ ${_group} ${_current_ICON} ${_name})
-+ ENDFOREACH (_current_ICON)
-
-+ # and now the svg icons
-+ FILE(GLOB _icons *.svgz)
-+ FOREACH (_current_ICON ${_icons} )
-+ STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _group
"${_current_ICON}")
-+ STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _name
"${_current_ICON}")
-+
_KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
-+ ${_defaultpath}/${_theme}/scalable
-+ ${_group} ${_current_ICON} ${_name})
- ENDFOREACH (_current_ICON)
--ENDMACRO(KDE3_INSTALL_ICONS)
-
-+ENDMACRO (KDE3_INSTALL_ICONS)
-
- MACRO(KDE3_INSTALL_LIBTOOL_FILE _target)
- GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
-
- GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
-@@ -303,11 +319,11 @@
- FILE(APPEND ${_laname} "# Should we warn about portability when linking
against -modules?\nshouldnotlink=yes\n")
- FILE(APPEND ${_laname} "# Files to
dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
- FILE(APPEND ${_laname} "# Directory that this library needs to be
installed in:\n")
- FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
-
-- INSTALL_FILES(/lib/kde3 FILES ${_laname})
-+ INSTALL_FILES(${KDE3_LIBTOOL_DIR} FILES ${_laname})
- ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)
-
-
- MACRO(KDE3_CREATE_FINAL_FILE _filename)
- FILE(WRITE ${_filename} "//autogenerated file\n")
-@@ -316,11 +332,11 @@
- ENDFOREACH (_current_FILE)
-
- ENDMACRO(KDE3_CREATE_FINAL_FILE)
-
-
--OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation")
-+# OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation")
- OPTION(KDE3_BUILD_TESTS "Build the tests")
-
-
- MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX)
- #is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix,
otherwise SET the prefix empty
-@@ -328,16 +344,11 @@
- SET(_first_SRC)
- ELSE (${_with_PREFIX} STREQUAL "WITH_PREFIX")
- SET(_first_SRC ${_with_PREFIX})
- ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-
-- IF (KDE3_ENABLE_FINAL)
-- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
-- ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp)
-- ELSE (KDE3_ENABLE_FINAL)
- ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
-- ENDIF (KDE3_ENABLE_FINAL)
-
- IF(_first_SRC)
- SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "")
- ENDIF(_first_SRC)
-
-@@ -346,16 +357,11 @@
- ENDMACRO(KDE3_ADD_KPART)
-
-
- MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
-
-- IF (KDE3_ENABLE_FINAL)
-- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
-- ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp)
-- ELSE (KDE3_ENABLE_FINAL)
- ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
-- ENDIF (KDE3_ENABLE_FINAL)
-
- CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in
${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
-
- ADD_EXECUTABLE( ${_target_NAME}
${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
- TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
-@@ -363,15 +369,10 @@
- ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE)
-
-
- MACRO(KDE3_ADD_EXECUTABLE _target_NAME )
-
-- IF (KDE3_ENABLE_FINAL)
-- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
-- ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp)
-- ELSE (KDE3_ENABLE_FINAL)
- ADD_EXECUTABLE(${_target_NAME} ${ARGN} )
-- ENDIF (KDE3_ENABLE_FINAL)
-
- ENDMACRO(KDE3_ADD_EXECUTABLE)
-
-
diff --git a/source/games-extra/boson/FrugalBuild
b/source/games-extra/boson/FrugalBuild
deleted file mode 100644
index 57768fc..0000000
--- a/source/games-extra/boson/FrugalBuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Compiling Time: 9.66 SBU
-# Maintainer: Miklos Vajna <vmik...@frugalware.org>
-
-pkgname=boson
-pkgver=0.13
-pkgrel=2
-pkgdesc="An OpenGL real-time strategy game."
-_F_sourceforge_ext=".tar.bz2"
-depends=('openal>=1.7.411' 'mesa' 'kdelibs' 'lib3ds')
-groups=('games-extra')
-archs=('i686')
-_F_gnome_iconcache="y"
-options=('scriptlet')
-Finclude sourceforge cmake gnome-scriptlet
-_F_archive_name="$pkgname-all"
-up2date="Flasttar http://boson.sourceforge.net/download.php";
-source=(${source/boson-/boson-all-} 050_all_gcc43.patch
boson-0.13-linux-headers.patch $pkgname-$pkgver-cmake.patch
090_all_KDE3Macros.cmake.patch)
-
-build()
-{
- unset MAKEFLAGS
- export QTDIR=/usr/lib/qt
- export KDEDIR=`kde-config --prefix`
- Fcd boson-all-$pkgver
- CMake_build
- Fbuild_gnome_scriptlet
-}
-sha1sums=('d6cf208722553fb9feec4fe4e853a51534953fda' \
- 'dec2f7081a5400a938c2eb56604a79d9f12759bf' \
- '4dee60c465fd9bfe191646727f08ebb0921e9128' \
- '34267b3573fd274e7fe9a621405228d8e3096378' \
- '3a11ed31062be4e26d2da6a4563b0c86a1f27cc0')
diff --git a/source/games-extra/boson/boson-0.13-cmake.patch
b/source/games-extra/boson/boson-0.13-cmake.patch
deleted file mode 100644
index 5ce0290..0000000
--- a/source/games-extra/boson/boson-0.13-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/modules/boson/FindBosonPythonLibs.cmake
-+++ cmake/modules/boson/FindBosonPythonLibs.cmake
-@@ -72,6 +72,6 @@
-
- # PYTHON_LIBRARY is used for the cache entry only
- # PYTHON_LIBRARIES is meant to be public
-- set(PYTHON_LIBRARIES "${PYTHON_LIBRARY} ${_python_dependency_libs}")
-+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${_python_dependency_libs})
- ENDIF (NOT PYTHON_LIBRARY)
-
diff --git a/source/games-extra/boson/boson-0.13-linux-headers.patch
b/source/games-extra/boson/boson-0.13-linux-headers.patch
deleted file mode 100644
index b16a3da..0000000
--- a/source/games-extra/boson/boson-0.13-linux-headers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- code/boson/info/boinfo_linux.cpp
-+++ code/boson/info/boinfo_linux.cpp
-@@ -27,7 +27,6 @@
- #include <qregexp.h>
- #include <qstringlist.h>
-
--#include <linux/version.h>
-
- QString readFile(const char* fileName)
- {
-@@ -72,7 +71,6 @@
- insert(OSVersionString, kernelVersion);
- }
-
-- kernelVersion = UTS_RELEASE;
- insert(BoInfo::OSVersionString + BoInfo::CompileOffset, kernelVersion);
-
- QString kernelModules = readFile("/proc/modules");
-
diff --git a/source/kde/kdegames/FrugalBuild b/source/kde/kdegames/FrugalBuild
index 3fbd8f1..9470102 100644
--- a/source/kde/kdegames/FrugalBuild
+++ b/source/kde/kdegames/FrugalBuild
@@ -9,7 +9,7 @@ archs=('i686' 'x86_64')
_F_cmakekde_final=OFF
provides=('ksudoku')
-replaces=('ksudoku')
+replaces=('ksudoku' 'boson')
conflicts=('ksudoku')
Finclude kde
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
