Modestas Vainius
15 years ago
parent
1bac40f3e7
commit
d8fcc4f4dc
@ -1,27 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: Prefer *-qt3 binaries to generic names which might come from Qt4
|
||||
*-qt3 names are Debian specific. Nevertheless, the patch could be applied
|
||||
upstream.
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538864
|
||||
|
||||
--- a/Modules/FindQt3.cmake
|
||||
+++ b/Modules/FindQt3.cmake
|
||||
@@ -138,7 +138,7 @@
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
||||
- NAMES moc moc-qt3
|
||||
+ NAMES moc-qt3 moc
|
||||
HINTS
|
||||
$ENV{QTDIR}/bin
|
||||
PATHS
|
||||
@@ -160,7 +160,8 @@
|
||||
ENDIF(QT_MOC_EXECUTABLE)
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
|
||||
+FIND_PROGRAM(QT_UIC_EXECUTABLE
|
||||
+ NAMES uic-qt3 uic
|
||||
HINTS
|
||||
$ENV{QTDIR}/bin
|
||||
PATHS
|
||||
@ -1,20 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: Remove deprecated Enconding field from CMake.desktop
|
||||
The Encoding key is now deprecated by the FreeDesktop standard and all
|
||||
strings are required to be encoded in UTF-8. This desktop entry
|
||||
explicitly specifies an Encoding of UTF-8, which is harmless but no
|
||||
longer necessary.
|
||||
.
|
||||
Refer to http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html for
|
||||
details
|
||||
Forwarded: yes
|
||||
|
||||
--- a/Source/QtDialog/CMake.desktop
|
||||
+++ b/Source/QtDialog/CMake.desktop
|
||||
@@ -1,6 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
-Encoding=UTF-8
|
||||
Name=CMake
|
||||
Comment=Cross-platform buildsystem
|
||||
Exec=cmake-gui %f
|
||||
@ -1,29 +0,0 @@
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Subject: Do not use -fPIC when linking executables
|
||||
cmake includes ${CMAKE_SHARED_LIBRARY_C_FLAGS} in the command line to
|
||||
link an executable, and by default this is -fPIC. Either the use or
|
||||
the definition of this variable is wrong, because executables should
|
||||
not be linked with this option by default.
|
||||
.
|
||||
It's not entirely obvious how this variable gets into the command
|
||||
line, but you can verify that it does by changing its value to e.g. -D
|
||||
SHARED and running make VERBOSE=1.
|
||||
.
|
||||
Any special options needed for linking with shared libraries can be put
|
||||
in CMAKE_SHARED_LIBRARY_LINK_C_FLAGS.
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=478404
|
||||
|
||||
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
|
||||
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
|
||||
@@ -199,11 +199,6 @@
|
||||
std::string flags;
|
||||
std::string linkFlags;
|
||||
|
||||
- // Add flags to deal with shared libraries. Any library being
|
||||
- // linked in might be shared, so always use shared flags for an
|
||||
- // executable.
|
||||
- this->LocalGenerator->AddSharedFlags(linkFlags, linkLanguage, true);
|
||||
-
|
||||
// Add flags to create an executable.
|
||||
this->LocalGenerator->
|
||||
AddConfigVariableFlags(linkFlags, "CMAKE_EXE_LINKER_FLAGS",
|
||||
@ -1,39 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: Fix bashisms in CMake scripts.
|
||||
Fix bashisms found in /bin/sh scripts. Thanks to Raphael Geissert for heads
|
||||
up.
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530056
|
||||
|
||||
--- a/Modules/CPack.RuntimeScript.in
|
||||
+++ b/Modules/CPack.RuntimeScript.in
|
||||
@@ -3,10 +3,10 @@
|
||||
# Modified from: Aaron Voisine <aaron@voisine.org>
|
||||
|
||||
CWD="`dirname \"$0\"`"
|
||||
-TMP=/tmp/$UID/TemporaryItems
|
||||
+TMP=/tmp/$(id -ru)/TemporaryItems
|
||||
|
||||
version=`sw_vers -productVersion`
|
||||
-if [ "$?" == "0" ]; then
|
||||
+if [ "$?" = "0" ]; then
|
||||
major=${version%%\.*}
|
||||
rest=${version#*\.}
|
||||
minor=${rest%%\.*}
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
# if 10.5 or greater, then all the open-x11 stuff need not occur
|
||||
-if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
|
||||
+if [ "$major" -lt 10 ] || ([ "$major" -eq 10 ] && [ "$minor" -lt 5 ]); then
|
||||
version=`sw_vers -productVersion`
|
||||
if [ "$?" = "0" ]; then
|
||||
major=${version%%\.*}
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
|
||||
# if 10.5 or greater, then all the open-x11 stuff need not occur
|
||||
-if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
|
||||
+if [ "$major" -lt 10 ] || ([ "$major" -eq 10 ] && [ "$minor" -lt 5 ]); then
|
||||
ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
|
||||
if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
|
||||
echo "rm -f ~/.xinitrc" > ~/.xinitrc
|
||||
@ -1,55 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: Support GNU/kFreeBSD
|
||||
GNU/kFreeBSD = FreeBSD kernel + userspace with glibc,
|
||||
and Linux.cmake doesn't contain anything OS specific.
|
||||
.
|
||||
Here are outputs of /bin/uname:
|
||||
.
|
||||
$ uname -p
|
||||
i386
|
||||
$ uname -o
|
||||
GNU/kFreeBSD
|
||||
$ uname -s
|
||||
GNU/kFreeBSD
|
||||
$ uname -r
|
||||
5.4-1-686
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340764
|
||||
|
||||
--- a/Modules/CMakeDetermineSystem.cmake
|
||||
+++ b/Modules/CMakeDetermineSystem.cmake
|
||||
@@ -25,6 +25,7 @@
|
||||
# HP-UX HP-UX
|
||||
# IRIX IRIX
|
||||
# Linux Linux
|
||||
+# GNU/kFreeBSD GNU/kFreeBSD
|
||||
# NetBSD NetBSD
|
||||
# OpenBSD OpenBSD
|
||||
# OFS/1 (Digital Unix) OSF1
|
||||
@@ -121,6 +122,11 @@
|
||||
SET(${_PREFIX}_NAME BSDOS)
|
||||
ENDIF(${_PREFIX}_NAME MATCHES BSD.OS)
|
||||
|
||||
+ # fix for GNU/kFreeBSD, remove the GNU/
|
||||
+ IF(${_PREFIX}_NAME MATCHES kFreeBSD)
|
||||
+ SET(${_PREFIX}_NAME kFreeBSD)
|
||||
+ ENDIF(${_PREFIX}_NAME MATCHES kFreeBSD)
|
||||
+
|
||||
# fix for CYGWIN which has windows version in it
|
||||
IF(${_PREFIX}_NAME MATCHES CYGWIN)
|
||||
SET(${_PREFIX}_NAME CYGWIN)
|
||||
--- a/Modules/Platform/kFreeBSD.cmake
|
||||
+++ b/Modules/Platform/kFreeBSD.cmake
|
||||
@@ -1,12 +1,2 @@
|
||||
# kFreeBSD looks just like Linux.
|
||||
-SET(CMAKE_DL_LIBS "dl")
|
||||
-SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
|
||||
-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
|
||||
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
|
||||
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
|
||||
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
|
||||
-SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
|
||||
-SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
|
||||
-SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
|
||||
-
|
||||
-INCLUDE(Platform/UnixPaths)
|
||||
+INCLUDE(Platform/Linux)
|
||||
@ -1,123 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vanius.eu>
|
||||
Subject: Fix formatting of cmake module docs to be manpage (groff) friendly
|
||||
Most problems are fixed (or rather workarounded) by making long =====
|
||||
separators pre-formatted (i.e. prefixed with two spaces). In order to preserve
|
||||
visual view, the code examples themselves are prefixed with 3 spaces.
|
||||
.
|
||||
This patch fixes the following man warnings (as of cmake 2.8-rc2):
|
||||
$ cmake --help-man - | LANG=C MANWIDTH=80 man --warnings -l - > /dev/null
|
||||
<standard input>:6024: warning [p 105, 1.7i]: can't break line
|
||||
<standard input>:6027: warning [p 105, 2.7i]: cannot adjust line
|
||||
<standard input>:6027: warning [p 105, 2.8i]: can't break line
|
||||
<standard input>:7142: warning [p 117, 7.8i]: can't break line
|
||||
<standard input>:7171: warning [p 117, 11.8i]: can't break line
|
||||
<standard input>:8878: warning [p 136, 9.0i]: can't break line
|
||||
<standard input>:8887: warning [p 136, 11.5i]: cannot adjust line
|
||||
<standard input>:8887: warning [p 136, 11.7i]: can't break line
|
||||
<standard input>:8904: warning [p 136, 14.2i]: can't break line
|
||||
Forwarded: yes
|
||||
|
||||
--- a/Modules/FindBISON.cmake
|
||||
+++ b/Modules/FindBISON.cmake
|
||||
@@ -22,13 +22,13 @@
|
||||
# BISON_${Name}_OUTPUTS - The sources files generated by bison
|
||||
# BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
|
||||
#
|
||||
-#====================================================================
|
||||
-# Example:
|
||||
+# ====================================================================
|
||||
+# Example:
|
||||
#
|
||||
-# find_package(BISON)
|
||||
-# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
|
||||
-# add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
|
||||
-#====================================================================
|
||||
+# find_package(BISON)
|
||||
+# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
|
||||
+# add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
|
||||
+# ====================================================================
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2009 Kitware, Inc.
|
||||
--- a/Modules/FindFLEX.cmake
|
||||
+++ b/Modules/FindFLEX.cmake
|
||||
@@ -26,23 +26,23 @@
|
||||
# where <FlexTarget> and <BisonTarget> are the first parameters of
|
||||
# respectively FLEX_TARGET and BISON_TARGET macros.
|
||||
#
|
||||
-#====================================================================
|
||||
-# Example:
|
||||
+# ====================================================================
|
||||
+# Example:
|
||||
#
|
||||
-# find_package(BISON)
|
||||
-# find_package(FLEX)
|
||||
+# find_package(BISON)
|
||||
+# find_package(FLEX)
|
||||
#
|
||||
-# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
|
||||
-# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp)
|
||||
-# ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
|
||||
-#
|
||||
-# include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
-# add_executable(Foo
|
||||
-# Foo.cc
|
||||
-# ${BISON_MyParser_OUTPUTS}
|
||||
-# ${FLEX_MyScanner_OUTPUTS}
|
||||
-# )
|
||||
-#====================================================================
|
||||
+# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
|
||||
+# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp)
|
||||
+# ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
|
||||
+#
|
||||
+# include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
+# add_executable(Foo
|
||||
+# Foo.cc
|
||||
+# ${BISON_MyParser_OUTPUTS}
|
||||
+# ${FLEX_MyScanner_OUTPUTS}
|
||||
+# )
|
||||
+# ====================================================================
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2009 Kitware, Inc.
|
||||
--- a/Modules/FindProtobuf.cmake
|
||||
+++ b/Modules/FindProtobuf.cmake
|
||||
@@ -11,20 +11,20 @@
|
||||
# PROTOBUF_INCLUDE_DIR - The include directory for protocol buffers
|
||||
# PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
|
||||
#
|
||||
-#====================================================================
|
||||
-# Example:
|
||||
+# ====================================================================
|
||||
+# Example:
|
||||
#
|
||||
-# find_package(Protobuf REQUIRED)
|
||||
-# include_directories(${PROTOBUF_INCLUDE_DIRS})
|
||||
+# find_package(Protobuf REQUIRED)
|
||||
+# include_directories(${PROTOBUF_INCLUDE_DIRS})
|
||||
#
|
||||
-# include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
-# PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
|
||||
-# add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
|
||||
-# target_link_libraries(bar ${PROTOBUF_LIBRARY})
|
||||
+# include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
+# PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
|
||||
+# add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
|
||||
+# target_link_libraries(bar ${PROTOBUF_LIBRARY})
|
||||
#
|
||||
# NOTE: You may need to link against pthreads, depending
|
||||
# on the platform.
|
||||
-#====================================================================
|
||||
+# ====================================================================
|
||||
#
|
||||
# PROTOBUF_GENERATE_CPP (public function)
|
||||
# SRCS = Variable to define with autogenerated
|
||||
@@ -33,7 +33,7 @@
|
||||
# header files
|
||||
# ARGN = proto files
|
||||
#
|
||||
-#====================================================================
|
||||
+# ====================================================================
|
||||
|
||||
|
||||
#=============================================================================
|
||||
@ -1,29 +0,0 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: Fix scripts and their permissions in Modules/ and Templates/
|
||||
The first hunk fixes permissions of Modules/SquishRunTestCase.sh script.
|
||||
INSTALL() used to remove executable permissions.
|
||||
.
|
||||
The second hunk adds #!/bin/sh to the top of the script
|
||||
Templates/cygwin-package.sh.in. All executable interpreted scripts
|
||||
should have this directive.
|
||||
Forwarded: yes.
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -460,7 +460,7 @@
|
||||
DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
|
||||
GROUP_READ GROUP_EXECUTE
|
||||
WORLD_READ WORLD_EXECUTE
|
||||
- PATTERN "*.sh.in" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
|
||||
+ PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
|
||||
GROUP_READ GROUP_EXECUTE
|
||||
WORLD_READ WORLD_EXECUTE
|
||||
PATTERN "CVS" EXCLUDE
|
||||
--- a/Templates/cygwin-package.sh.in
|
||||
+++ b/Templates/cygwin-package.sh.in
|
||||
@@ -1,3 +1,5 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
# this is a sample shell script used for building a cmake
|
||||
# based project for a cygwin setup package.
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
FindQt3.cmake.diff
|
||||
kfreebsd-Platform.diff
|
||||
executables-dont-need-fpic.diff
|
||||
fix_bashisms.diff
|
||||
manpage_friendly_docs.diff
|
||||
desktop-remove-deprecated.diff
|
||||
scripts-and-permissions.diff
|
||||
Loading…
Reference in new issue