PATCHe: do plptools.spec
Bobby Spark
sparky w servek.sparky.homelinux.org
Pon, 28 Cze 2004, 17:41:27 CEST
Bez tego plptools.spec (mi) się nie chciało kompilować.
Patch plptools-assert.patch dodale linię
#include <assert.h>
która kiedyś nie była potrzebna.
Drugi patch, plptools-kde.patch zmienia -lqt na -lqt-mt
i wyrzuca z configure szukanie kdb2html którego niema w nowym KDE
a program i tak go nie potrzebuje.
Pozatym proponuję zmianę nazw pakietów klipsi i kpsion na plptools-klipsi i plptools-kpsion bo tak to ich nazwa niewiele mówi.
-------------- następna część ---------
--- plptools-0.12/lib/Enum.h.orig 2004-06-28 17:25:52.444060736 +0200
+++ plptools-0.12/lib/Enum.h 2004-06-28 17:26:00.591822088 +0200
@@ -31,6 +31,7 @@
#include <map>
#include <string>
+#include <assert.h>
/**
* the Base for the Enum template.
-------------- następna część ---------
--- plptools-0.12/configure.orig 2004-06-28 17:16:08.120891360 +0200
+++ plptools-0.12/configure 2004-06-28 17:16:40.993893904 +0200
@@ -11572,7 +11572,7 @@
- LIBQT="-lqt"
+ LIBQT="-lqt-mt"
if test $kde_qtver = 2; then
LIBQT="$LIBQT $LIBPNG"
@@ -11799,7 +11799,7 @@
CXXFLAGS="$CXXFLAGS -I$qt_includes"
LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
+LIBS="-lqt-mt -lXext -lX11 $LIBSOCKET"
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
LIBRARY_PATH=
@@ -11976,7 +11976,7 @@
- LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
+ LIB_QT='-lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
@@ -12482,64 +12482,6 @@
fi
- echo $ac_n "checking for kdb2html""... $ac_c" 1>&6
-echo "configure:12487: checking for kdb2html" >&5
- kde_cache=`echo kdb2html | sed 'y%./+-%__p_%'`
-
- if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- kde_cv_path="NONE"
- if test -n "$KDB2HTML"; then
- kde_cv_path="$KDB2HTML";
- else
- dirs="$kde_default_bindirs"
- kde_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/kdb2html"; then
- if test -n ""
- then
- evalstr="$dir/kdb2html 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/kdb2html"
- break
- fi
- else
- kde_cv_path="$dir/kdb2html"
- break
- fi
- fi
- done
-
- fi
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$ac_t""not found" 1>&6
-
- { echo "configure: error: The important program kdb2html was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
- else
- echo "$ac_t""$kde_cv_path" 1>&6
- KDB2HTML=$kde_cv_path
-
- fi
-
echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
echo "configure:12546: checking for artsc-config" >&5
@@ -12874,64 +12816,6 @@
fi
- echo $ac_n "checking for kdb2html""... $ac_c" 1>&6
-echo "configure:12879: checking for kdb2html" >&5
- kde_cache=`echo kdb2html | sed 'y%./+-%__p_%'`
-
- if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- kde_cv_path="NONE"
- if test -n "$KDB2HTML"; then
- kde_cv_path="$KDB2HTML";
- else
- dirs="$kde_default_bindirs"
- kde_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/kdb2html"; then
- if test -n ""
- then
- evalstr="$dir/kdb2html 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/kdb2html"
- break
- fi
- else
- kde_cv_path="$dir/kdb2html"
- break
- fi
- fi
- done
-
- fi
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$ac_t""not found" 1>&6
-
- { echo "configure: error: The important program kdb2html was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
- else
- echo "$ac_t""$kde_cv_path" 1>&6
- KDB2HTML=$kde_cv_path
-
- fi
-
echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
echo "configure:12938: checking for artsc-config" >&5
@@ -13712,7 +13596,6 @@
s%@DCOPIDL2CPP@%$DCOPIDL2CPP%g
s%@DCOP_DEPENDENCIES@%$DCOP_DEPENDENCIES%g
s%@MCOPIDL@%$MCOPIDL%g
-s%@KDB2HTML@%$KDB2HTML%g
s%@ARTSCCONFIG@%$ARTSCCONFIG%g
s%@KDECONFIG@%$KDECONFIG%g
s%@kde_libs_prefix@%$kde_libs_prefix%g
Więcej informacji o liście dyskusyjnej pld-devel-pl