Attachment 109318 Details for Bug 150319 – file.diff

[patch] file.diff

file.diff (text/plain), 9.90 KB, created by Timothy Beyer on 2010-09-06 10:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Beyer

Created: 2010-09-06 10:10:07 UTC

Size: 9.90 KB

patch

obsolete

>diff -urN files.orig/extra-patch-noportdocs-CMakeLists.txt files/extra-patch-noportdocs-CMakeLists.txt
>--- files.orig/extra-patch-noportdocs-CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
>+++ files/extra-patch-noportdocs-CMakeLists.txt	2010-09-06 01:23:41.000000000 -0700
>@@ -0,0 +1,42 @@
>+--- CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
>++++ CMakeLists.txt	2010-09-06 01:23:35.000000000 -0700
>+@@ -57,7 +57,6 @@
>+ 	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX} )
>+ 	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX} )
>+ 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX} )
>+-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/doc )
>+ 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX} )
>+ 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX} )
>+ elseif (${LAYOUT} MATCHES "fhs")
>+@@ -73,7 +72,6 @@
>+ 			SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
>+ 		endif ()
>+ 	ENDIF( NOT SYSCONF_DIR )
>+-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
>+ 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
>+ 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
>+ else (${LAYOUT} MATCHES "opt")
>+@@ -83,7 +81,6 @@
>+ 	SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
>+ 	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
>+ 	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc )
>+-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
>+ 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
>+ 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
>+ endif (${LAYOUT} MATCHES "home")
>+@@ -267,7 +264,6 @@
>+ INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
>+ INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} )
>+ INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
>+-INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
>+ 
>+ CONFIGURE_FILE(
>+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
>+@@ -303,7 +299,6 @@
>+ message(STATUS "  DATA_DIR: ${DATA_DIR}")
>+ message(STATUS "  MAN_DIR: ${MAN_DIR}")
>+ message(STATUS "  SYSCONF_DIR: ${SYSCONF_DIR}")
>+-message(STATUS "  DOC_DIR: ${DOC_DIR}")
>+ message(STATUS "  ICON_DIR: ${ICON_DIR}")
>+ message(STATUS "  MENU_DIR: ${MENU_DIR}")
>+ message(STATUS "")
>diff -urN files.orig/extra-patch-noportdocs-Makefile.am files/extra-patch-noportdocs-Makefile.am
>--- files.orig/extra-patch-noportdocs-Makefile.am	2009-07-13 16:24:17.000000000 -0700
>+++ files/extra-patch-noportdocs-Makefile.am	1969-12-31 16:00:00.000000000 -0800
>@@ -1,9 +0,0 @@
>---- Makefile.am.orig	2009-06-07 06:07:25.000000000 -0700
>-+++ Makefile.am	2009-07-07 14:50:13.000000000 -0700
>-@@ -29,6 +29,3 @@
>- 
>- install-data-hook:
>- 	rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so
>--
>--docs:
>--	doxygen
>diff -urN files.orig/extra-patch-noportdocs-Makefile.in files/extra-patch-noportdocs-Makefile.in
>--- files.orig/extra-patch-noportdocs-Makefile.in	2010-02-08 00:51:44.000000000 -0800
>+++ files/extra-patch-noportdocs-Makefile.in	1969-12-31 16:00:00.000000000 -0800
>@@ -1,20 +0,0 @@
>---- Makefile.in.orig	2009-11-03 07:31:16.000000000 -0800
>-+++ Makefile.in	2009-12-29 23:24:29.000000000 -0800
>-@@ -231,7 +231,6 @@
>- builddir = @builddir@
>- datadir = @datadir@
>- datarootdir = @datarootdir@
>--docdir = @docdir@
>- dvidir = @dvidir@
>- exec_prefix = @exec_prefix@
>- host = @host@
>-@@ -855,9 +854,6 @@
>- install-data-hook:
>- 	rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so
>- 
>--docs:
>--	doxygen
>--
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>- .NOEXPORT:
>diff -urN files.orig/extra-patch-noportdocs-configure files/extra-patch-noportdocs-configure
>--- files.orig/extra-patch-noportdocs-configure	2010-02-08 00:51:44.000000000 -0800
>+++ files/extra-patch-noportdocs-configure	1969-12-31 16:00:00.000000000 -0800
>@@ -1,70 +0,0 @@
>---- configure.orig	2009-11-03 07:31:18.000000000 -0800
>-+++ configure	2009-12-29 23:25:57.000000000 -0800
>-@@ -851,10 +851,7 @@
>- libdir
>- psdir
>- pdfdir
>--dvidir
>--htmldir
>- infodir
>--docdir
>- oldincludedir
>- includedir
>- localstatedir
>-@@ -949,12 +946,7 @@
>- localstatedir='${prefix}/var'
>- includedir='${prefix}/include'
>- oldincludedir='/usr/include'
>--docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
>- infodir='${datarootdir}/info'
>--htmldir='${docdir}'
>--dvidir='${docdir}'
>--pdfdir='${docdir}'
>--psdir='${docdir}'
>- libdir='${exec_prefix}/lib'
>- localedir='${datarootdir}/locale'
>- mandir='${datarootdir}/man'
>-@@ -1029,11 +1021,6 @@
>-     esac
>-     eval enable_$ac_useropt=no ;;
>- 
>--  -docdir | --docdir | --docdi | --doc | --do)
>--    ac_prev=docdir ;;
>--  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
>--    docdir=$ac_optarg ;;
>--
>-   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
>-     ac_prev=dvidir ;;
>-   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
>-@@ -1334,7 +1321,7 @@
>- # Check all directory arguments for consistency.
>- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
>- 		datadir sysconfdir sharedstatedir localstatedir includedir \
>--		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
>-+		oldincludedir infodir \
>- 		libdir localedir mandir
>- do
>-   eval ac_val=\$$ac_var
>-@@ -15561,10 +15548,6 @@
>- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>- 
>- 
>--if test "x$docdir" = "x" ; then
>--  docdir=$datadir/doc
>--fi
>--
>- # Check whether --enable-subdirs was given.
>- if test "${enable_subdirs+set}" = set; then :
>-   enableval=$enable_subdirs; gemrb_use_subdirs=$enableval
>-@@ -19890,11 +19873,6 @@
>-     "gemrb/plugins/WEDImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WEDImporter/Makefile" ;;
>-     "gemrb/plugins/WMPImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WMPImporter/Makefile" ;;
>-     "gemrb/plugins/ZLibMgr/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/ZLibMgr/Makefile" ;;
>--    "gemrb/docs/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/Makefile" ;;
>--    "gemrb/docs/en/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Makefile" ;;
>--    "gemrb/docs/en/GUIScript/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/GUIScript/Makefile" ;;
>--    "gemrb/docs/en/Tables/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Tables/Makefile" ;;
>--    "gemrb/docs/en/Engine/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Engine/Makefile" ;;
>-     "gemrb.spec") CONFIG_FILES="$CONFIG_FILES gemrb.spec" ;;
>- 
>-   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>diff -urN files.orig/extra-patch-noportdocs-gemrb-CMakeLists.txt files/extra-patch-noportdocs-gemrb-CMakeLists.txt
>--- files.orig/extra-patch-noportdocs-gemrb-CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
>+++ files/extra-patch-noportdocs-gemrb-CMakeLists.txt	2010-09-06 01:41:09.000000000 -0700
>@@ -0,0 +1,10 @@
>+--- gemrb/CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
>++++ gemrb/CMakeLists.txt	2010-09-06 01:40:42.000000000 -0700
>+@@ -2,7 +2,6 @@
>+ ADD_SUBDIRECTORY( plugins )
>+ ADD_SUBDIRECTORY( override )
>+ ADD_SUBDIRECTORY( GUIScripts )
>+-ADD_SUBDIRECTORY( docs )
>+ ADD_SUBDIRECTORY( tests )
>+ 
>+ ADD_EXECUTABLE(gemrb GemRB.cpp )
>diff -urN files.orig/extra-patch-noportdocs-gemrb-Makefile.in files/extra-patch-noportdocs-gemrb-Makefile.in
>--- files.orig/extra-patch-noportdocs-gemrb-Makefile.in	2010-02-08 00:51:44.000000000 -0800
>+++ files/extra-patch-noportdocs-gemrb-Makefile.in	1969-12-31 16:00:00.000000000 -0800
>@@ -1,19 +0,0 @@
>---- gemrb/Makefile.in.orig	2009-11-03 07:31:04.000000000 -0800
>-+++ gemrb/Makefile.in	2009-12-29 23:33:24.000000000 -0800
>-@@ -235,7 +235,6 @@
>- builddir = @builddir@
>- datadir = @datadir@
>- datarootdir = @datarootdir@
>--docdir = @docdir@
>- dvidir = @dvidir@
>- exec_prefix = @exec_prefix@
>- host = @host@
>-@@ -276,7 +275,7 @@
>- sysconf_DATA = GemRB.cfg.sample GemRB.cfg.subdir.sample
>- gemrb_SOURCES = GemRB.cpp 
>- gemrb_LDADD = ./plugins/Core/libgemrb_core.la
>--SUBDIRS = plugins includes GUIScripts override docs
>-+SUBDIRS = plugins includes GUIScripts override
>- EXTRA_DIST = GemRB.cfg* plugins-prepare.sh CMakeLists.txt
>- INCLUDES = \
>- 	$(all_includes) \
>diff -urN files.orig/extra-patch-noportdocs-gemrb-docs-CMakeLists.txt files/extra-patch-noportdocs-gemrb-docs-CMakeLists.txt
>--- files.orig/extra-patch-noportdocs-gemrb-docs-CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
>+++ files/extra-patch-noportdocs-gemrb-docs-CMakeLists.txt	2010-09-06 01:44:51.000000000 -0700
>@@ -0,0 +1,4 @@
>+--- gemrb/docs/CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
>++++ gemrb/docs/CMakeLists.txt	2010-09-06 01:43:26.000000000 -0700
>+@@ -1 +0,0 @@
>+-ADD_SUBDIRECTORY( en )
>diff -urN files.orig/patch-CMakeLists.txt files/patch-CMakeLists.txt
>--- files.orig/patch-CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
>+++ files/patch-CMakeLists.txt	2010-09-05 23:18:16.000000000 -0700
>@@ -0,0 +1,21 @@
>+--- CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
>++++ CMakeLists.txt	2010-09-05 23:18:12.000000000 -0700
>+@@ -137,18 +137,6 @@
>+ 	MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
>+ ENDIF()
>+ 
>+-IF(UNIX)
>+-	FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
>+-	IF(DLD_LIBRARY_PATH)
>+-		MESSAGE(STATUS "Looking for dl library: found")
>+-	ELSE(DLD_LIBRARY_PATH)
>+-		MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
>+-	ENDIF(DLD_LIBRARY_PATH)
>+-
>+-	SET(CMAKE_THREAD_PREFER_PTHREAD true)
>+-	FIND_PACKAGE(Threads REQUIRED)
>+-ENDIF(UNIX)
>+-
>+ INCLUDE(FindOpenAL)
>+ IF(OPENAL_FOUND)
>+ 	MESSAGE(STATUS "Looking for OpenAL: found")
>diff -urN files.orig/patch-gemrb.cfg files/patch-gemrb.cfg
>--- files.orig/patch-gemrb.cfg	2008-06-22 14:48:03.000000000 -0700
>+++ files/patch-gemrb.cfg	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- gemrb/GemRB.cfg.sample.orig	2008-02-17 09:07:28.000000000 -0800
>-+++ gemrb/GemRB.cfg.sample	2008-04-21 19:22:34.000000000 -0700
>-@@ -226,7 +226,7 @@
>- #  You probably do NOT want to specify this!        #
>- #####################################################
>- 
>--#GemRBOverridePath=/usr/share/games/gemrb
>-+GemRBOverridePath=/usr/local/share/gemrb
>- 
>- #####################################################
>- #  END                                              #
>--- files.diff ends here ---

Actions: View | Diff

Attachments on bug 150319: 109316 | 109317 | 109318