Browse Source
Andreas V. Meier <avmeier@web.de>:
- updates kasc/paragui to most recent version. - makes neccessary changes to the libs.patch for new version - includes a patch for the configure script to be python2.3 aware git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1523 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
Andreas V. 'netrunner' Meier
21 years ago
4 changed files with 83 additions and 41 deletions
Split View
Diff Options
-
+1 -0Documentation/Developers/CHANGELOG-RENE
-
+20 -39package/kasc/paragui/libs.patch
-
+2 -2package/kasc/paragui/paragui.desc
-
+60 -0package/kasc/paragui/python23.patch
@ -1,44 +1,25 @@ |
|||
# --- 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/kasc/paragui/libs.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 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 |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./bindings/python/Makefile.in.org Fri Jan 3 17:29:08 2003
|
|||
+++ ./bindings/python/Makefile.in Tue May 27 10:14:37 2003
|
|||
@@ -180,7 +180,7 @@
|
|||
$(SDL_LIBS) \ |
|||
$(IMAGE_LIBS) \ |
|||
$(LIBSTDCPP) \ |
|||
- -lparagui -L$(top_srcdir)/src
|
|||
+ -lparagui -L$(top_srcdir)/src/.libs
|
|||
diff -ruN paragui-1.0.4/bindings/python/Makefile.in paragui-1.0.4-avm/bindings/python/Makefile.in
|
|||
--- paragui-1.0.4/bindings/python/Makefile.in 2003-07-07 11:06:19.000000000 +0200
|
|||
+++ paragui-1.0.4-avm/bindings/python/Makefile.in 2003-09-27 16:34:18.000000000 +0200
|
|||
@@ -123,7 +123,7 @@
|
|||
|
|||
PGHEADERS = $(shell ls $(top_srcdir)/include/*.h) |
|||
|
|||
-LINK = $(COMPILE) -shared -L@prefix@/lib -lexpat -lz $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP) -lparagui -L$(top_srcdir)/src
|
|||
+LINK = $(COMPILE) -shared -L@prefix@/lib -lexpat -lz $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP) -lparagui -L$(top_srcdir)/src/.libs
|
|||
|
|||
|
|||
INCLUDES = \ |
|||
--- ./bindings/ruby/Makefile.in.org Fri Jan 3 17:29:08 2003
|
|||
+++ ./bindings/ruby/Makefile.in Tue May 27 10:15:32 2003
|
|||
@@ -177,7 +177,7 @@
|
|||
INCLUDES = $(SDL_CFLAGS) -I$(top_srcdir)/include -I$(PYTHON_INCLUDE_DIR) -I../../include |
|||
diff -ruN paragui-1.0.4/bindings/ruby/Makefile.in paragui-1.0.4-avm/bindings/ruby/Makefile.in
|
|||
--- paragui-1.0.4/bindings/ruby/Makefile.in 2003-07-07 11:06:20.000000000 +0200
|
|||
+++ paragui-1.0.4-avm/bindings/ruby/Makefile.in 2003-09-27 16:35:11.000000000 +0200
|
|||
@@ -125,7 +125,7 @@
|
|||
|
|||
LINK = $(COMPILE) -shared \ |
|||
-L@prefix@/lib \ |
|||
- -L$(top_srcdir)/src \
|
|||
+ -L$(top_srcdir)/src/.libs \
|
|||
$(PARAGUI_LIBS) |
|||
PGHEADERS = $(shell ls $(top_srcdir)/include/*.h) |
|||
|
|||
-LINK = $(COMPILE) -shared -L@prefix@/lib -L$(top_srcdir)/src $(PARAGUI_LIBS)
|
|||
+LINK = $(COMPILE) -shared -L@prefix@/lib -L$(top_srcdir)/src/.libs $(PARAGUI_LIBS)
|
|||
|
|||
|
|||
INCLUDES = $(SDL_CFLAGS) -I$(top_srcdir)/include -I$(RUBY_INCLUDE_DIR) -I../../include |
|||
|
|||
@ -0,0 +1,60 @@ |
|||
diff -ruN paragui-1.0.4/configure paragui-1.0.4-avm/configure
|
|||
--- paragui-1.0.4/configure 2003-06-27 10:34:29.000000000 +0200
|
|||
+++ paragui-1.0.4-avm/configure 2003-09-27 18:31:27.000000000 +0200
|
|||
@@ -7381,10 +7381,46 @@
|
|||
if test "x$PYTHON" = xno; then |
|||
{ echo "configure: error: *** Unable to find python interpreter! ***" 1>&2; exit 1; } |
|||
fi |
|||
- PYTHON_INCLUDE_DIR=""
|
|||
+ PYTHON_INCLUDE_DIR=""
|
|||
PYTHON_LIB_DIR="" |
|||
have_python_include=no |
|||
- ac_safe=`echo "python2.2/Python.h" | sed 'y%./+-%__p_%'`
|
|||
+ ac_safe=`echo "python2.3/Python.h" | sed 'y%./+-%__p_%'`
|
|||
+echo $ac_n "checking for python2.3/Python.h""... $ac_c" 1>&6
|
|||
+echo "configure:7426: checking for python2.3/Python.h" >&5
|
|||
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|||
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|||
+else
|
|||
+ cat > conftest.$ac_ext <<EOF
|
|||
+#line 7431 "configure"
|
|||
+#include "confdefs.h"
|
|||
+#include <python2.3/Python.h>
|
|||
+EOF
|
|||
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|||
+{ (eval echo configure:7436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|||
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|||
+if test -z "$ac_err"; then
|
|||
+ rm -rf conftest*
|
|||
+ eval "ac_cv_header_$ac_safe=yes"
|
|||
+else
|
|||
+ echo "$ac_err" >&5
|
|||
+ echo "configure: failed program was:" >&5
|
|||
+ cat conftest.$ac_ext >&5
|
|||
+ rm -rf conftest*
|
|||
+ eval "ac_cv_header_$ac_safe=no"
|
|||
+fi
|
|||
+rm -f conftest*
|
|||
+fi
|
|||
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
+ echo "$ac_t""yes" 1>&6
|
|||
+ have_python_include=yes
|
|||
+else
|
|||
+ echo "$ac_t""no" 1>&6
|
|||
+fi
|
|||
+
|
|||
+ PYTHON_INCLUDE_DIR=$prefix/include/python2.3
|
|||
+ PYTHON_LIB_DIR=$libdir/python2.3
|
|||
+ if test x$have_python_include = xno; then
|
|||
+ ac_safe=`echo "python2.2/Python.h" | sed 'y%./+-%__p_%'`
|
|||
echo $ac_n "checking for python2.2/Python.h""... $ac_c" 1>&6 |
|||
echo "configure:7390: checking for python2.2/Python.h" >&5 |
|||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
|||
@@ -7419,6 +7455,7 @@
|
|||
|
|||
PYTHON_INCLUDE_DIR=$prefix/include/python2.2 |
|||
PYTHON_LIB_DIR=$libdir/python2.2 |
|||
+ fi
|
|||
if test x$have_python_include = xno; then |
|||
ac_safe=`echo "python2.1/Python.h" | sed 'y%./+-%__p_%'` |
|||
echo $ac_n "checking for python2.1/Python.h""... $ac_c" 1>&6 |
|||