Attachment 1397 Details for Bug 437 – knoda : fix FTBFS because missing LDFLAGS

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] knoda : fix FTBFS because missing LDFLAGS

knoda-0.8.3-trinity.patch (text/plain), 5.32 KB, created by Francois Andriot on 2013-07-24 15:54:48 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-07-24 15:54:48 CDT

Size: 5.32 KB

patch

obsolete

>--- knoda-0.8.3/admin/cvs.sh.trinity	2013-04-08 14:24:07.974878542 +0200
>+++ knoda-0.8.3/admin/cvs.sh	2013-04-08 14:24:20.931606750 +0200
>@@ -68,7 +68,7 @@
>     echo "*** KDE requires automake $required_automake_version"
>     exit 1
>     ;;
>-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
>+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
>     echo "*** $AUTOMAKE_STRING found."
>     UNSERMAKE=no
>     ;;
>--- knoda-0.8.3/admin/acinclude.m4.in.ORI	2013-04-08 14:25:32.193111808 +0200
>+++ knoda-0.8.3/admin/acinclude.m4.in	2013-04-08 14:25:46.235817198 +0200
>@@ -479,14 +479,14 @@
>     if test "$kde_qtver" = "2"; then
>       kde_moduledir='\${libdir}/kde2'
>     else
>-      kde_moduledir='\${libdir}/kde3'
>+      kde_moduledir='\${libdir}/trinity'
>     fi
>   fi
>   if test -z "$kde_styledir"; then
>-    kde_styledir='\${libdir}/kde3/plugins/styles'
>+    kde_styledir='\${libdir}/trinity/plugins/styles'
>   fi
>   if test -z "$kde_widgetdir"; then
>-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
>+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
>   fi
>   if test -z "$xdg_appsdir"; then
>     xdg_appsdir='\${datadir}/applications/kde'
>@@ -546,7 +546,7 @@
> 
> AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
> [
>-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
>+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
>     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
>     if test -n "$KDEDIRS"; then
>        kde_save_IFS=$IFS
>@@ -612,7 +612,7 @@
>         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
> 
>         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
>- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
>+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
>             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
>             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
> 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
>@@ -1793,7 +1793,7 @@
> 
> if test -z "$1"; then
> 
>-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
>+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
> test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
> kde_incdirs="$ac_kde_includes $kde_incdirs"
> AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
>@@ -1805,7 +1805,7 @@
> So, check this please and use another prefix!])
> fi
> 
>-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
>+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
> test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
> kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
> AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
>@@ -1813,7 +1813,7 @@
> 
> kde_widgetdir=NO
> dnl this might be somewhere else
>-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
>+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
> 
> if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
> AC_MSG_ERROR([
>@@ -1821,14 +1821,14 @@
> So, check this please and use another prefix!])
> fi
> 
>-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
>+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
> AC_MSG_ERROR([
> I can't find the designer plugins. These are required and should have been installed
> by kdelibs])
> fi
> 
> if test -n "$kde_widgetdir"; then
>-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
>+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
> fi
> 
> 
>--- knoda-0.8.3/hk_kdeclasses/Makefile.am.ORI	2013-04-08 15:13:14.090068576 +0200
>+++ knoda-0.8.3/hk_kdeclasses/Makefile.am	2013-04-08 15:13:34.388642952 +0200
>@@ -142,7 +142,7 @@
> 				knodamaindockwindowbase.cpp
> 
> 
>-libhk_kdeclasses_la_LIBADD =  -lkatepartinterfaces -lkdeprint -lkmdi $(LIB_KPARTS) $(KDE_PLUGIN)
>+libhk_kdeclasses_la_LIBADD =  -lkatepartinterfaces -lkdeprint -lkmdi $(LIB_KPARTS) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
> 
> # this is where the XML-GUI resource file goes
> rcdir = $(kde_datadir)/hk_kdeclasses

Actions: View | Diff

Attachments on bug 437: 1397 | 1405 | 1406 | 1407 | 1408 | 1409 | 1410 | 1411 | 1412 | 1413 | 1414