Attachment 1145 Details for Bug 172 – mplayerthumbs 0.5b : fix build under TDE 3.5.13.2

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] mplayerthumbs 0.5b : fix build under TDE 3.5.13.2

mplayerthumbs-0.5b-trinity.patch (text/plain), 7.43 KB, created by Francois Andriot on 2013-04-08 06:57:16 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-04-08 06:57:16 CDT

Size: 7.43 KB

patch

obsolete

>--- mplayerthumbs-0.5b/admin/cvs.sh.trinity	2006-06-20 14:31:29.000000000 +0200
>+++ mplayerthumbs-0.5b/admin/cvs.sh	2013-04-08 13:12:14.116293374 +0200
>@@ -32,7 +32,7 @@
> required_autoconf_version="2.53 or newer"
> AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
> case $AUTOCONF_VERSION in
>-  Autoconf*2.5* | autoconf*2.5* ) : ;;
>+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
>   "" )
>     echo "*** AUTOCONF NOT FOUND!."
>     echo "*** KDE requires autoconf $required_autoconf_version"
>@@ -47,7 +47,7 @@
> 
> AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
> case $AUTOHEADER_VERSION in
>-  Autoconf*2.5* | autoheader*2.5* ) : ;;
>+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
>   "" )
>     echo "*** AUTOHEADER NOT FOUND!."
>     echo "*** KDE requires autoheader $required_autoconf_version"
>@@ -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
>     ;;
>--- mplayerthumbs-0.5b/admin/acinclude.m4.in.ORI	2013-04-08 13:13:06.494149472 +0200
>+++ mplayerthumbs-0.5b/admin/acinclude.m4.in	2013-04-08 13:13:36.368497934 +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
> 
> 
>--- mplayerthumbs-0.5b/src/videopreview.cpp.trinity	2006-07-10 17:17:11.000000000 +0200
>+++ mplayerthumbs-0.5b/src/videopreview.cpp	2013-04-08 13:48:18.957932849 +0200
>@@ -39,6 +39,8 @@
> #include <math.h>
> #include <qfileinfo.h>
> 
>+#include <cstdlib>
>+
> #include "mplayerthumbs.h"
> 
> #include "config.h"
>@@ -160,11 +162,11 @@
>     QPixmap sprocket;
> 
>     if (pix.height() < 60)
>-        sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-small.png" ));
>+        sprocket = QPixmap(locate( "data", "videopreview/sprocket-small.png" ));
>     else if (pix.height() < 90)
>-        sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-medium.png" ));
>+        sprocket = QPixmap(locate( "data", "videopreview/sprocket-medium.png" ));
>     else
>-        sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-large.png" ));
>+        sprocket = QPixmap(locate( "data", "videopreview/sprocket-large.png" ));
> 
>     for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
>         painter.drawPixmap( 0, y, sprocket );
>--- mplayerthumbs-0.5b/src/Makefile.am.trinity	2006-06-29 10:48:04.000000000 +0200
>+++ mplayerthumbs-0.5b/src/Makefile.am	2013-04-08 13:49:46.586076536 +0200
>@@ -6,7 +6,7 @@
> kde_module_LTLIBRARIES = videopreview.la
> 
> videopreview_la_SOURCES = videopreview.cpp mplayerthumbs.kcfgc
>-videopreview_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
>+videopreview_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT)
> 
> protocoldir = $(kde_servicesdir)
> 
>@@ -14,9 +14,9 @@
> 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
> 	$(XGETTEXT) *.cpp -o $(podir)/videopreview.pot
> protocol_DATA = videopreview.desktop
>-videopreview_la_LIBADD = $(LIB_KDECORE)
>+videopreview_la_LIBADD = $(LIB_KDECORE) -lkdefx
> 
> videothumbnail_DATA = sprocket-small.png sprocket-medium.png sprocket-large.png
>-videothumbnaildir = $(kde_datadir)/videothumbnail
>+videothumbnaildir = $(kde_datadir)/videopreview
> kde_kcfg_DATA = mplayerthumbs.kcfg
>

Actions: View | Diff

Attachments on bug 172: 1145