widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/debian-disable-patch into lp:~widelands-dev/widelands/debian.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/debian-disable-patch/+merge/210030

A fix for bug 1279679 recently got merged to trunk. A patch for this issue is also included as part of the Debian packaging and the PPA will attempt to apply this patch on top of current trunk. Understandably, it fails to apply the patch [1] leading FTBFS. After removing the kfreebsd patch from patches/series (which specifies which patches should be applied and in which order) it built fine again. See latest builds from [2] for details/proof.



[1] https://launchpadlibrarian.net/168638281/buildlog.txt.gz
[2] https://code.launchpad.net/~hjd/+recipe/widelands-test
-- 
https://code.launchpad.net/~hjd/widelands/debian-disable-patch/+merge/210030
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-disable-patch into lp:~widelands-dev/widelands/debian.

=== removed file 'debian/patches/kfreebsd-FTBFS'
--- debian/patches/kfreebsd-FTBFS	2014-02-15 13:00:44 +0000
+++ debian/patches/kfreebsd-FTBFS	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-Description: Fix a FTBFS on kfreebsd
- The kfreebsd architecture is using the GNU libc on a FreeBSD kernel.
- .
- So we don't need to search for execinfo and intl libs on this
- perticular architecture, as they are included in the libc.
-Author: Teppo Maenpaa <teppo.maenpaa@xxxxxxx>
-Forwarded-Upstream: not yet, should be.
-
----
- src/CMakeLists.txt |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -326,7 +326,9 @@
- 
- # on BSD this must be explicitly linked
- if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
--  find_library(EXECINFO_LIBRARY NAMES execinfo)
-+  if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-+    find_library(EXECINFO_LIBRARY NAMES execinfo)
-+  endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
- endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- 
- 
-@@ -436,8 +438,10 @@
- endif (MINIZIP_FOUND)
- 
- if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
--  find_package(intl REQUIRED)
--  include_directories(${INTL_INCLUDE_DIR})
-+  if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-+    find_package(intl REQUIRED)
-+    include_directories(${INTL_INCLUDE_DIR})
-+    endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
- endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- 
- # Gettext is required, but it does not provide GETTEXT_INCLUDE_DIR or

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-15 13:00:44 +0000
+++ debian/patches/series	2014-03-07 22:44:03 +0000
@@ -1,4 +1,3 @@
-kfreebsd-FTBFS
 s390
 dbg_symbols
 PATH_MAX