[gentoo-commits] gentoo-x86 commit in www-plugins/gnash/files: gnash-0.8.5-klash.patch gnash-0.8.5-moc-qt4.patch

[Romain Perier (mrpouet)]

mrpouet     09/09/08 21:20:24

  Added:                gnash-0.8.5-klash.patch gnash-0.8.5-moc-qt4.patch
  Log:
  Fix kde4 headers detection, moc and uic checks, Import patch from Linux Alt to fix klash support, many thanks to Chi-Thanh Christopher Nguyen <chithanh@××××××××××××.de>
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  www-plugins/gnash/files/gnash-0.8.5-klash.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-klash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-klash.patch?rev=1.1&content-type=text/plain

Index: gnash-0.8.5-klash.patch
===================================================================
--- 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
@@ -134,7 +134,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.])
@@ -144,7 +144,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
@@ -160,26 +160,13 @@ AC_DEFUN([GNASH_PATH_KDE4],
       dnl Look for the kdecore library, which is required
       if test x"${ac_cv_path_kde4_lib}" != x; then
         AC_MSG_CHECKING([for kdecore library])
-        if test -f ${kde4_topdir}/libkdecore.la; then
+        if test -f ${kde4_topdir}/libkdecore.so; then
           ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdecore"
           AC_MSG_RESULT(${kde4_topdir}/libkdecore)
         else
          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
 
@@ -216,7 +203,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



1.1                  www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch?rev=1.1&content-type=text/plain

Index: gnash-0.8.5-moc-qt4.patch
===================================================================
--- a/macros/qt4.m4	2009-03-02 16:29:42.000000000 +0100
+++ b/macros/qt4.m4	2009-09-08 14:53:31.355928666 +0200
@@ -165,8 +165,8 @@
       has_qt4="no"
     fi
 
-    AC_PATH_PROG(MOC4, moc-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-    AC_PATH_PROG(UIC4, uic-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+    AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+    AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
 
 
     AC_SUBST([QT4_CFLAGS])