[patch] Updated klash patch

gnash-0.8.7-klash.patch (text/plain), 3.73 KB, created by Jon Severinsson on 2010-02-20 19:25:15 UTC

--- gnash-0.8.5/macros/kde4.m4.alt-kde4	2009-02-28 15:27:53 +0300
+++ gnash-0.8.5/macros/kde4.m4	2009-07-15 16:02:13 +0400
@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
              with_kde4_incl=${withval})
   dnl make sure the path is a useable one
   if test x"${with_kde4_incl}" != x ; then
-    if test ! -f ${with_kde4_incl}/kapp.h ; then
+    if test ! -f ${with_kde4_incl}/kapplication.h ; then
       AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
     fi
   fi
@@ -38,7 +38,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
              with_kde4_lib=${withval})
   dnl make sure the path is a useable one
   if test x"${with_kde4_lib}" != x ; then 
-    if test ! -f ${with_kde4_lib}/libkdeui.la; then
+    if test ! -f ${with_kde4_lib}/libkdeui.so; then
       AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
     fi
   fi
@@ -136,7 +136,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
     dnl Look for the libraries
     AC_CACHE_VAL(ac_cv_path_kde4_lib, [
       if test x"${with_kde4_lib}" != x ; then
-        if test -f ${with_kde4_lib}/libkdeui.la; then
+        if test -f ${with_kde4_lib}/libkdeui.so; then
 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
         else
 	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
@@ -146,7 +146,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
         AC_MSG_CHECKING([for kdeui library])
         kde4_topdir=
         for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
-          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
+          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
             kde4_topdir=$i
             AC_MSG_RESULT(${kde4_topdir}/libkdeui)
 	          if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
@@ -169,19 +169,6 @@ AC_DEFUN([GNASH_PATH_KDE4],
          AC_MSG_RESULT(no)
         fi
       fi
-      dnl Look for the kdeprint library, which is required
-      AC_MSG_CHECKING([for kdeprint library])
-      if test x"${libkdeprint}" = x; then
-        if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
-          ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
-          AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
-        else
-          AC_MSG_RESULT(no)
-        fi
-      else
-        AC_MSG_RESULT(${libkdeprint})
-        ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
-      fi	
     ])                  dnl end of cache ac_cv_path_kde4_lib
   fi                    dnl end of build_kde4
 
@@ -218,7 +205,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
   fi                            dnl end of build_kparts4
 
   if test x"${ac_cv_path_kde4_incl}" != x ; then
-    if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
+    if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
       KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
     else
       KDE4_CFLAGS=""
--- gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4	2009-06-15 11:53:31 +0400
+++ gnash-0.8.5/plugin/klash4/Makefile.am	2009-07-15 16:02:58 +0400
@@ -42,6 +39,7 @@ libklashpart_la_LDFLAGS = -avoid-version
 else
 libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
 endif
+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
 
 dist_kde_services_DATA = klash_part.desktop
 dist_kde_rc_DATA = klashpartui.rc
--- gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4	2008-12-28 13:13:38 +0300
+++ gnash-0.8.5/plugin/klash4/pluginsinfo	2009-07-15 16:02:13 +0400
@@ -1,7 +1,7 @@
 number=1
 
 [0]
-description=Shockwave Flash 7.0
+description=Shockwave Flash 10.1 r999
 file=libklashpart.so
 mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
 name=Shockwave Flash