From 4c6a0716676d333bc79ceaf9f225d9fe1655cfdc Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 24 Mar 2006 23:42:23 +0000 Subject: [PATCH] Stefan Fiedler: update motor (3.4.0) fix linkage to static ncurses that dynamically links to libgpm (rediffed) Index: package/jimmy/motor/gcc34.patch =================================================================== [2006031321004821320] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7339 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jimmy/motor/gcc34.patch | 36 ----------------------- package/jimmy/motor/motor.conf | 3 ++ package/jimmy/motor/motor.desc | 4 +-- package/jimmy/motor/no-deprecated.patch | 39 ------------------------- 4 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 package/jimmy/motor/gcc34.patch delete mode 100644 package/jimmy/motor/no-deprecated.patch diff --git a/package/jimmy/motor/gcc34.patch b/package/jimmy/motor/gcc34.patch deleted file mode 100644 index d5f78f7a6..000000000 --- a/package/jimmy/motor/gcc34.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jimmy/motor/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -An ugly patch for an ugly lvalue cast - for gcc-3.4. - - - Rene Rebe - ---- ./src/ui/ncurses/uitagbrowser.cc.vanilla 2004-07-05 14:13:59.000000000 +0200 -+++ ./src/ui/ncurses/uitagbrowser.cc 2004-07-05 14:08:51.000000000 +0200 -@@ -78,7 +78,8 @@ - cm.setwindow(textwindow(w.x1, w.y1, w.x1+20, 0, uiconf.getcolor(cp_menufr))); - - for(motortagbrowser::viewscope scope = motortagbrowser::File; -- scope != motortagbrowser::viewscope_size; (int) scope += 1) { -+ scope != motortagbrowser::viewscope_size; -+ scope = (motortagbrowser::viewscope) ((int)scope + 1) ) { - cm.additem(0, scope, (string) " " + getscopename(scope)); - if(scope == tagbrowser.getscope()) - cm.setpos(cm.getcount()-1); diff --git a/package/jimmy/motor/motor.conf b/package/jimmy/motor/motor.conf index 1fe8a0d5c..e77bcef97 100644 --- a/package/jimmy/motor/motor.conf +++ b/package/jimmy/motor/motor.conf @@ -28,3 +28,6 @@ motor_postmake() { postmake=motor_postmake +# the following is needed to link against a static ncurses library +# that dynamically links to libgpm +var_append configprefix " " "LDFLAGS=\"\$LDFLAGS -ldl\"" diff --git a/package/jimmy/motor/motor.desc b/package/jimmy/motor/motor.desc index 6e5ffc7f7..30269a984 100644 --- a/package/jimmy/motor/motor.desc +++ b/package/jimmy/motor/motor.desc @@ -38,10 +38,10 @@ [L] GPL [S] Stable -[V] 3.3.0 +[V] 3.4.0 [P] X -?---5---9 173.200 [CV-URL] http://konst.org.ua/en/motor/ -[D] 3875962623 motor-3.3.0.tar.bz2 http://konst.org.ua/download/ +[D] 2371486038 motor-3.4.0.tar.bz2 http://konst.org.ua/download/ diff --git a/package/jimmy/motor/no-deprecated.patch b/package/jimmy/motor/no-deprecated.patch deleted file mode 100644 index f4c39f527..000000000 --- a/package/jimmy/motor/no-deprecated.patch +++ /dev/null @@ -1,39 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jimmy/motor/no-deprecated.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./parser/src/parser.c.orig 2004-06-12 13:10:03.228842992 +0300 -+++ ./parser/src/parser.c 2004-06-12 13:09:46.551378352 +0300 -@@ -313,7 +313,7 @@ - buf = mmap(0, *size, PROT_READ, MAP_SHARED, f, 0); - if (buf == MAP_FAILED) buf = NULL; - break; -- default: -+ default: ; - } - } - close(f); -@@ -333,7 +333,7 @@ - // munmap - munmap(text, size); - break; -- default: -+ default: ; - } - } -