19 Apr
2012
19 Apr
'12
11:58 p.m.
On 04/19/2012 06:45 PM, David C. Rankin wrote:
I think that is probably the problem - where could
that problem be?? That
smells like something a digikam/admin/acinclude.m4.in patch broke.
Can somebody confirm and suggest a fix. My build was with:
CXXFLAGS="${CXXFLAGS} -fpermissive" \
./configure --prefix=${TDEDIR} \
--with-qt-dir=${QTDIR} \
--localstatedir=/var
so that wasn't something I did.... Oh, brother, "Get a rope..."
I think this patch probably broke it (however, I don't know which part):
diff -uNrb ../digikam/admin/acinclude.m4.in digikam/admin/acinclude.m4.in
--- ../digikam/admin/acinclude.m4.in 2012-04-12 12:46:52.000000000 -0500
+++ digikam/admin/acinclude.m4.in 2012-04-15 07:04:48.000000000 -0500
@@ -623,36 +623,21 @@
fi
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
- trinity2ornewer=1
- trinity3ornewer=1
- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3;
then
- trinity2ornewer=
- trinity3ornewer=
- else
+ trinity14ornewer=1
if test "$kde_qtver" = "3"; then
- if test "$kde_qtsubver" -le 1; then
- trinity2ornewer=
- fi
- if test "$kde_qtsubver" -le 2; then
- trinity3ornewer=
- fi
if test "$KDECONFIG" != "compiled"; then
- if test `$KDECONFIG --version | grep TDE | sed 's/TDE:
\(...\).*/\1/'` = 3.2; then
- trinity3ornewer=
+ if test `$KDECONFIG --version | grep TDE | sed 's/TDE:
R\(..\).*/\1/'` -lt 14; then
+ trinity14ornewer=
fi
fi
fi
if test "$kde_qtver" = "4"; then
- trinity2ornewer=1
- trinity3ornewer=1
- fi
+ trinity14ornewer=1
fi
- if test -n "$trinity2ornewer"; then
+ if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER,
[$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(dcopidlng)])
- fi
- if test -n "$trinity3ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS,
[$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
@@ -670,7 +655,7 @@
fi
DCOP_DEPENDENCIES='$(DCOPIDL)'
- if test -n "$trinity2ornewer"; then
+ if test -n "$trinity14ornewer"; then
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
AC_SUBST(KCONFIG_COMPILER)
@@ -2925,7 +2910,7 @@
if test "$build_arts" '!=' "no"; then
KDE_FIND_PATH(mcopidl, TQTMCOPIDL, [$kde_default_bindirs],
[KDE_MISSING_ARTS_ERROR(mcopidl)])
fi
- if test -n "$trinity2ornewer"; then
+ if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(dcopidlng, TQTDCOPIDLNG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
How can I unpatch it? Download the version before it to test?
--
David C. Rankin, J.D.,P.E.