r13848 - packages/trunk/libphysfs/debian/patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-11-12 18:30:07 +0000 (Mon, 12 Nov 2012)
New Revision: 13848

Modified:
   packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff
Log:
Update rejected patch.


Modified: packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff
===================================================================
--- packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff	2012-11-12 18:26:08 UTC (rev 13847)
+++ packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff	2012-11-12 18:30:07 UTC (rev 13848)
@@ -1,24 +1,23 @@
 Description: Do not unnecessarily link against ncurses
-Author: Sven Joachim <svenjoac at gmx.de>
+Author: Sven Joachim <svenjoac at gmx.de>,
+		Patrick Matthäi <pmatthaei at debian.org>
 Bug-Debian: http://bugs.debian.org/646146
-Last-Update: <2011-11-03>
+Last-Update: <2012-11-12>
 
----
-
---- libphysfs-2.0.2.orig/CMakeLists.txt
-+++ libphysfs-2.0.2/CMakeLists.txt
-@@ -300,13 +300,11 @@ IF(PHYSFS_BUILD_TEST)
+diff -Naur physfs-2.0.3.orig/CMakeLists.txt physfs-2.0.3/CMakeLists.txt
+--- physfs-2.0.3.orig/CMakeLists.txt	2012-10-23 05:41:04.000000000 +0200
++++ physfs-2.0.3/CMakeLists.txt	2012-11-12 19:27:50.590920820 +0100
+@@ -305,12 +305,10 @@
      FIND_PATH(READLINE_H readline/readline.h)
      FIND_PATH(HISTORY_H readline/history.h)
      IF(READLINE_H AND HISTORY_H)
 -        FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses)
 -        SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
          FIND_LIBRARY(READLINE_LIBRARY readline)
-         FIND_LIBRARY(HISTORY_LIBRARY history)
-         IF(READLINE_LIBRARY AND HISTORY_LIBRARY)
+         IF(READLINE_LIBRARY)
              SET(HAVE_SYSTEM_READLINE TRUE)
 -            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY})
 +            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY})
              INCLUDE_DIRECTORIES(${READLINE_H} ${HISTORY_H})
              ADD_DEFINITIONS(-DPHYSFS_HAVE_READLINE=1)
-         ENDIF(READLINE_LIBRARY AND HISTORY_LIBRARY)
+         ENDIF(READLINE_LIBRARY)