Browse Source

Juergen Sawinski:

updated jsaw/gnomesword (2.0.0), jsaw/sword, jsaw/ginac (1.1.5),
        jsaw/root (3.10.2) and jsaw/bibletime (1.4)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2359 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Juergen "George" Sawinski 21 years ago
parent
commit
5535752485
8 changed files with 318 additions and 21 deletions
  1. +3
    -0
      package/jsaw/bibletime/bibletime.conf
  2. +3
    -4
      package/jsaw/bibletime/bibletime.desc
  3. +3
    -3
      package/jsaw/ginac/ginac.desc
  4. +297
    -0
      package/jsaw/gnomesword/glib-h-fix.patch
  5. +2
    -4
      package/jsaw/gnomesword/gnomesword.conf
  6. +4
    -4
      package/jsaw/gnomesword/gnomesword.desc
  7. +3
    -3
      package/jsaw/root/root.desc
  8. +3
    -3
      package/jsaw/sword/sword.desc

+ 3
- 0
package/jsaw/bibletime/bibletime.conf

@ -22,4 +22,7 @@
. $base/package/*/*/kde-31.conf
var_append confopt ' ' "--with-extra-includes=$root/$prefix/includes"
var_append confopt ' ' "--with-extra-libs=$root/$prefix/libs"
#@FIXME: documentation (bibletime-doc-1.2.2)

+ 3
- 4
package/jsaw/bibletime/bibletime.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/jsaw/bibletime/bibletime.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -37,8 +37,7 @@
[L] GPL
[S] Stable
[V] 1.2.2
[V] 1.4
[P] X -----5---9 959.000
[D] 4189212058 bibletime-1.2.2.tar.bz2 http://dl.sourceforge.net/sourceforge/bibletime/
#[D] 0 bibletime-doc-1.2.2.tar.bz2 http://dl.sourceforge.net/sourceforge/bibletime/
[D] 666190013 bibletime-1.4.tar.bz2 http://dl.sourceforge.net/sourceforge/bibletime/

+ 3
- 3
package/jsaw/ginac/ginac.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/jsaw/ginac/ginac.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -42,8 +42,8 @@
[L] GPL
[S] Stable
[V] 1.1.0
[V] 1.1.5
[P] X -----5---9 960.000
[D] 1264472422 GiNaC-1.1.0.tar.bz2 http://www.ginac.de/
[D] 2382055085 GiNaC-1.1.5.tar.bz2 http://www.ginac.de/

+ 297
- 0
package/jsaw/gnomesword/glib-h-fix.patch

@ -0,0 +1,297 @@
# --- 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/jsaw/gnomesword/glib-h-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2004 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 ---
diff -urN gnomesword2-2.0.0/src/backend/config.cc gnomesword2-2.0.0-my/src/backend/config.cc
--- gnomesword2-2.0.0/src/backend/config.cc 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/backend/config.cc 2004-01-09 04:21:54.000000000 +0100
@@ -44,7 +44,7 @@
#include <sys/stat.h>
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/backend/key.cc gnomesword2-2.0.0-my/src/backend/key.cc
--- gnomesword2-2.0.0/src/backend/key.cc 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/backend/key.cc 2004-01-09 04:21:54.000000000 +0100
@@ -32,7 +32,7 @@
#include <swmodule.h>
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/backend/sword.cpp gnomesword2-2.0.0-my/src/backend/sword.cpp
--- gnomesword2-2.0.0/src/backend/sword.cpp 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/backend/sword.cpp 2004-01-09 04:21:54.000000000 +0100
@@ -31,7 +31,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/gnome2/toolbar_nav.c gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c
--- gnomesword2-2.0.0/src/gnome2/toolbar_nav.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c 2004-01-09 04:21:55.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#include <gnome.h>
-#include <gal-2.0/gal/widgets/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
#include "gui/toolbar_nav.h"
#include "gui/shortcutbar_main.h"
diff -urN gnomesword2-2.0.0/src/main/bibletext.c gnomesword2-2.0.0-my/src/main/bibletext.c
--- gnomesword2-2.0.0/src/main/bibletext.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/bibletext.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/commentary.c gnomesword2-2.0.0-my/src/main/commentary.c
--- gnomesword2-2.0.0/src/main/commentary.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/commentary.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/configs.c gnomesword2-2.0.0-my/src/main/configs.c
--- gnomesword2-2.0.0/src/main/configs.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/configs.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/configs.h gnomesword2-2.0.0-my/src/main/configs.h
--- gnomesword2-2.0.0/src/main/configs.h 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/configs.h 2004-01-09 04:21:54.000000000 +0100
@@ -26,7 +26,7 @@
extern "C" {
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/dictlex.c gnomesword2-2.0.0-my/src/main/dictlex.c
--- gnomesword2-2.0.0/src/main/dictlex.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/dictlex.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/gbs.c gnomesword2-2.0.0-my/src/main/gbs.c
--- gnomesword2-2.0.0/src/main/gbs.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/gbs.c 2004-01-09 04:21:54.000000000 +0100
@@ -28,7 +28,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/key.c gnomesword2-2.0.0-my/src/main/key.c
--- gnomesword2-2.0.0/src/main/key.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/key.c 2004-01-09 04:21:54.000000000 +0100
@@ -23,7 +23,7 @@
#include <config.h>
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/lists.c gnomesword2-2.0.0-my/src/main/lists.c
--- gnomesword2-2.0.0/src/main/lists.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/lists.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,8 +24,8 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
-#include <gal-2.0/gal/widgets/e-unicode.h>
+#include <glib.h>
+#include <gal/widgets/e-unicode.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/lists.h gnomesword2-2.0.0-my/src/main/lists.h
--- gnomesword2-2.0.0/src/main/lists.h 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/lists.h 2004-01-09 04:21:54.000000000 +0100
@@ -27,7 +27,7 @@
{
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/module.c gnomesword2-2.0.0-my/src/main/module.c
--- gnomesword2-2.0.0/src/main/module.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/module.c 2004-01-09 04:21:54.000000000 +0100
@@ -26,7 +26,7 @@
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/percomm.c gnomesword2-2.0.0-my/src/main/percomm.c
--- gnomesword2-2.0.0/src/main/percomm.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/percomm.c 2004-01-09 04:21:54.000000000 +0100
@@ -25,7 +25,7 @@
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/search.c gnomesword2-2.0.0-my/src/main/search.c
--- gnomesword2-2.0.0/src/main/search.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/search.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/search.h gnomesword2-2.0.0-my/src/main/search.h
--- gnomesword2-2.0.0/src/main/search.h 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/search.h 2004-01-09 04:21:54.000000000 +0100
@@ -27,7 +27,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/settings.c gnomesword2-2.0.0-my/src/main/settings.c
--- gnomesword2-2.0.0/src/main/settings.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/settings.c 2004-01-09 04:21:54.000000000 +0100
@@ -25,7 +25,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/shortcutbar.c gnomesword2-2.0.0-my/src/main/shortcutbar.c
--- gnomesword2-2.0.0/src/main/shortcutbar.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/shortcutbar.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/shortcutbar.h gnomesword2-2.0.0-my/src/main/shortcutbar.h
--- gnomesword2-2.0.0/src/main/shortcutbar.h 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/shortcutbar.h 2004-01-09 04:21:54.000000000 +0100
@@ -27,7 +27,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/spell_pspell.c gnomesword2-2.0.0-my/src/main/spell_pspell.c
--- gnomesword2-2.0.0/src/main/spell_pspell.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/spell_pspell.c 2004-01-09 04:21:54.000000000 +0100
@@ -26,7 +26,7 @@
#ifdef USE_PSPELL
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/sword.c gnomesword2-2.0.0-my/src/main/sword.c
--- gnomesword2-2.0.0/src/main/sword.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/sword.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif
diff -urN gnomesword2-2.0.0/src/main/xml.c gnomesword2-2.0.0-my/src/main/xml.c
--- gnomesword2-2.0.0/src/main/xml.c 2003-12-24 20:10:38.000000000 +0100
+++ gnomesword2-2.0.0-my/src/main/xml.c 2004-01-09 04:21:54.000000000 +0100
@@ -24,7 +24,7 @@
#endif
#ifdef USE_GNOME2
-#include <glib-2.0/glib.h>
+#include <glib.h>
#else
#include <glib-1.2/glib.h>
#endif

+ 2
- 4
package/jsaw/gnomesword/gnomesword.conf

@ -6,7 +6,7 @@
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/jsaw/gnomesword/gnomesword.conf
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -20,6 +20,4 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
. $base/package/*/*/gnome-14.conf
#confopt="$confopt --with-sworddir=/usr"
. $base/package/*/*/gnome-24.conf

+ 4
- 4
package/jsaw/gnomesword/gnomesword.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/jsaw/gnomesword/gnomesword.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -36,8 +36,8 @@
[C] extra/religion
[L] GPL
[S] Beta
[V] 0.7.9
[S] Stable
[V] 2.0.0
[P] X -----5---9 961.000
[D] 2864427298 gnomesword-0.7.9.tar.gz http://dl.sourceforge.net/sourceforge/gnomesword/
[D] 4105476931 gnomesword2-2.0.0.tar.gz http://dl.sourceforge.net/gnomesword/

+ 3
- 3
package/jsaw/root/root.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/jsaw/root/root.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -47,9 +47,9 @@
[L] Free-to-use
[S] Stable
[V] 3.05.07
[V] 3.10.02
[P] X -----5---9 957.000
[D] 2506499770 root_v3.05.07.source.tar.gz ftp://root.cern.ch/root/
[D] 2083763574 root_v3.10.02.source.tar.gz ftp://root.cern.ch/root/

+ 3
- 3
package/jsaw/sword/sword.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/jsaw/sword/sword.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -40,8 +40,8 @@
[L] GPL
[S] Stable
[V] 1.5.5
[V] 1.5.6
[P] X -----5---9 958.000
[D] 4209416162 sword-1.5.5.tar.gz http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/
[D] 3879770220 sword-1.5.6.tar.gz http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/

|||||||
100:0
Loading…
Cancel
Save