On Thu, Apr 02, 2009 at 02:22:40PM +0200, Sascha 'saigkill' Manns wrote:
Hello Petr,
Hi,
On Donnerstag 02 April 2009 12:47:17 Petr Uzel wrote: I've generated the Patch (attached). But osc says: + echo 'Patch #1 (kqlives-dumb_exit.patch):' Patch #1 (kqlives-dumb_exit.patch): + patch -p1 -s 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej What is false with my Patch? I've used: diff -uNrp kq-src-20080202/configure.ac kq-src-20080202p/configure.ac
Ouch, previously I did not notice that there is already a patch which modifies the same line in configure.ac - so the changes conflict. I think you can just replace the existing patch with the new one.
diff -uNrp kq-src-20080202/configure.ac kq-src-20080202p/configure.ac --- kq-src-20080202/configure.ac 2008-02-02 21:33:02.000000000 +0100 +++ kq-src-20080202p/configure.ac 2009-04-02 14:11:28.000000000 +0200 @@ -79,7 +79,7 @@ AC_SUBST(WARNING_CFLAGS)
# Checks for libraries and library functions. AC_CHECK_FUNCS([atexit gettimeofday memmove memset mkdir pow strchr strstr]) -AC_CHECK_LIB(dumb, dumb_exit, [ALLEGRO_LIBS="-ldumb $ALLEGRO_LIBS"], [AC_MSG_ERROR([Dumb not found])]) +AC_CHECK_LIB(dumb, dumb_exit, [ALLEGRO_LIBS="-ldumb -lm $ALLEGRO_LIBS"], [AC_MSG_ERROR([Dumb not found])] -lm) AX_CHECK_ALDUMB([ALLEGRO_LIBS="-laldmb $ALLEGRO_LIBS"], [AC_MSG_ERROR([Aldumb not found])], [$ALLEGRO_LIBS]) AC_SEARCH_LIBS(lua_gettop, lua50 lua5.1 lua, [], [AC_MSG_ERROR([Lua not found])])
HTH -- Best regards / s pozdravem Petr Uzel, Packages maintainer --------------------------------------------------------------------- SUSE LINUX, s.r.o. e-mail: puzel@suse.cz Lihovarská 1060/12 tel: +420 284 028 964 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org