rpms/gnash/devel gnash-0.8.4-port-to-kde4.patch,1.1,1.2

Kevin Kofler kkofler at fedoraproject.org
Sat Oct 18 21:52:28 UTC 2008 

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31905/devel

Modified Files:
	gnash-0.8.4-port-to-kde4.patch 
Log Message:
Unbackport harder.

gnash-0.8.4-port-to-kde4.patch:

Index: gnash-0.8.4-port-to-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.4-port-to-kde4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnash-0.8.4-port-to-kde4.patch	18 Oct 2008 21:10:04 -0000	1.1
+++ gnash-0.8.4-port-to-kde4.patch	18 Oct 2008 21:52:27 -0000	1.2
@@ -1,7 +1,6 @@
-diff -Nur gnash-0.8.3/configure.ac gnash-0.8.3-port-to-kde4/configure.ac
---- gnash-0.8.3/configure.ac	2008-06-12 16:58:28.000000000 +0200
-+++ gnash-0.8.3-port-to-kde4/configure.ac	2008-10-08 18:59:24.000000000 +0200
-@@ -475,10 +475,12 @@
+--- gnash/configure.ac.kde4~	2008-10-07 13:30:16.000000000 +0200
++++ gnash/configure.ac	2008-10-08 16:22:25.912076411 +0200
+@@ -478,10 +478,12 @@ esac], sdkinstall=no)
  
  AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
  
@@ -14,7 +13,7 @@
  build_kde=no
  build_gtk=no
  build_sdl=no
-@@ -511,9 +513,12 @@
+@@ -514,9 +516,12 @@ dnl        AC_DEFINE(USE_ALP, [1], [Use 
  dnl        AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
          build_gtk=yes
          ;;
@@ -28,7 +27,7 @@
        qtopia|QTOPIA)
          build_qtopia=yes
          build_qt=yes
-@@ -544,6 +549,7 @@
+@@ -547,6 +552,7 @@ dnl        AC_DEFINE(USE_GTK, [1], [Use 
          build_fb=yes
          build_fltk=yes
          build_kde=yes
@@ -36,7 +35,7 @@
          build_gtk=yes
          build_sdl=yes
  dnl        build_qtopia=yes
-@@ -551,7 +557,7 @@
+@@ -554,7 +560,7 @@ dnl        build_hildon=yes
  dnl        build_alp=yes
  dnl        build_riscos=yes
          ;;
@@ -45,7 +44,7 @@
           ;;
        esac]
      enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
-@@ -1209,9 +1215,21 @@
+@@ -1236,9 +1242,21 @@ AC_ARG_ENABLE(kparts,
  [case "${enableval}" in
    yes) kparts=yes ;;
    no)  kparts=no ;;
@@ -66,17 +65,17 @@
 +esac],kparts4=$build_kde4)
 +
  dnl ----------------------------------------------------
- dnl Add NSAPI support, if specified or GTK gui is built
+ dnl Add NPAPI support, if specified or GTK gui is built
  dnl ----------------------------------------------------
-@@ -1242,6 +1260,7 @@
+@@ -1269,6 +1287,7 @@ AC_ARG_ENABLE(plugins,
  if test x$plugins = xno; then
-   nsapi=no
+   npapi=no
    kparts=no
 +  kparts4=no
  fi
  
- GNASH_PATH_FIREFOX
-@@ -1556,6 +1575,13 @@
+ dnl
+@@ -1618,6 +1637,13 @@ dnl # Check KDE if kde gui or kparts wer
  if test x$build_kde = xyes -o x$kparts = xyes; then
    GNASH_PATH_KDE
  fi
@@ -90,15 +89,15 @@
  if test x$build_qt = xyes -o x$build_qtopia = xyes -o x$build_kde = xyes; then
    GNASH_PATH_QT
    if test x$build_qtopia = xyes; then
-@@ -1564,6 +1590,7 @@
+@@ -1626,6 +1652,7 @@ if test x$build_qt = xyes -o x$build_qto
  fi
  AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
  AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
 +AM_CONDITIONAL(HAVE_KDE4, [test x$has_kde4 = xyes])
  AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
- AM_CONDITIONAL(HAVE_QTOPIA_2, [test "$gnash_qtopia_version " -eq 2])
- AM_CONDITIONAL(HAVE_QTOPIA_3, [test "$gnash_qtopia_version " -eq 3])
-@@ -1603,6 +1630,15 @@
+ 
+ AM_CONDITIONAL(HAVE_QTOPIA_2, [test x"$gnash_qtopia_version" = x2])
+@@ -1667,6 +1694,15 @@ fi
  if test x$build_kde = xno -a x$kparts = xyes; then
    AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based GUI!"])
  fi
@@ -114,7 +113,7 @@
  
  AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
  AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
-@@ -1610,6 +1646,7 @@
+@@ -1674,6 +1710,7 @@ AM_CONDITIONAL(BUILD_QT_GUI, [ test x$bu
  AM_CONDITIONAL(BUILD_HILDON_GUI, [ test x$build_hildon = xyes ])
  AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
  AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
@@ -122,15 +121,15 @@
  AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
  AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
  AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
-@@ -1620,6 +1657,7 @@
+@@ -1684,6 +1721,7 @@ AM_CONDITIONAL(BUILD_DUMP_GUI, [ test x$
  # plugin building flags
- AM_CONDITIONAL(NSAPI, [test x$nsapi = xyes])
+ AM_CONDITIONAL(NPAPI, [test x$npapi = xyes])
  AM_CONDITIONAL(KPARTS, [test x$kparts = xyes])
 +AM_CONDITIONAL(KPARTS4, [test x$kparts4 = xyes])
  
  AC_SUBST(KDE_CFLAGS)
  AC_SUBST(KDE_LIBS)
-@@ -2039,6 +2077,9 @@
+@@ -2088,6 +2126,9 @@ fi
  if test x$build_kde = xyes; then
    SUPPORTED_GUIS="${SUPPORTED_GUIS},kde"
  fi
@@ -140,23 +139,23 @@
  if test x$build_gtk = xyes; then
    SUPPORTED_GUIS="${SUPPORTED_GUIS},gtk"
  fi
-@@ -2109,6 +2150,7 @@
- extensions/metome/Makefile
+@@ -2158,6 +2199,7 @@ extensions/metome/Makefile
  plugin/Makefile
+ plugin/xpcom/Makefile
  plugin/klash/Makefile
 +plugin/klash4/Makefile
  plugin/mozilla-sdk/Makefile
  plugin/win32/Makefile
  cygnal/Makefile
-@@ -2163,13 +2205,23 @@
+@@ -2212,13 +2254,23 @@ else
  fi
  
  if test x"$kparts" = x"yes"; then
 -  echo "        KPARTS plugin enabled (default). Use --disable-kparts to disable"
--  echo "            KDE plugin will be installed in ${KDE_PLUGINDIR}"
--  echo "            KDE service will be installed in ${KDE_SERVICESDIR}"
--  echo "            KDE config dir will be in ${KDE_CONFIGDIR}"
--  echo "            KDE appsdata will be installed in ${KDE_APPSDATADIR}"
+-  echo "            KPARTS plugin will be installed in ${KDE_PLUGINDIR}"
+-  echo "            KPARTS service will be installed in ${KDE_SERVICESDIR}"
+-  echo "            KPARTS config dir will be in ${KDE_CONFIGDIR}"
+-  echo "            KPARTS appsdata will be installed in ${KDE_APPSDATADIR}"
 +  echo "        KPARTS 3.x plugin enabled (default). Use --disable-kparts to disable"
 +  echo "            KPARTS 3.x plugin will be installed in ${KDE_PLUGINDIR}"
 +  echo "            KPARTS 3.x service will be installed in ${KDE_SERVICESDIR}"
@@ -178,7 +177,7 @@
  fi
  
  dnl -- if test x"${dynamic_gui}" = x"yes"; then
-@@ -2264,17 +2316,17 @@
+@@ -2311,17 +2363,17 @@ fi
  
  if test x$build_kde = xyes -o x$kparts = xyes; then
    if test x"$has_kde" = xyes; then
@@ -202,9 +201,8 @@
        echo "               or .deb users: apt-get install kdelibs-dev" >&3
        echo "               or .rpm users: yum install <something-else>." >&3
    fi
-diff -Nur gnash-0.8.3/gui/am-frag/kde4.am gnash-0.8.3-port-to-kde4/gui/am-frag/kde4.am
---- gnash-0.8.3/gui/am-frag/kde4.am	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/am-frag/kde4.am	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/am-frag/kde4.am.kde4~	2008-10-08 15:59:00.103075776 +0200
++++ gnash/gui/am-frag/kde4.am	2008-10-08 15:59:00.103075776 +0200
 @@ -0,0 +1,38 @@
 +# 
 +#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
@@ -244,9 +242,8 @@
 +	 	Kde4Gui.cpp Kde4Gui.h KdeGlue.h
 +endif
 +endif
-diff -Nur gnash-0.8.3/gui/GuiKde4.cpp gnash-0.8.3-port-to-kde4/gui/GuiKde4.cpp
---- gnash-0.8.3/gui/GuiKde4.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/GuiKde4.cpp	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/GuiKde4.cpp.kde4~	2008-10-08 15:59:00.103075776 +0200
++++ gnash/gui/GuiKde4.cpp	2008-10-08 15:59:00.103075776 +0200
 @@ -0,0 +1,46 @@
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -294,9 +291,8 @@
 +
 +} // namespace gnash
 +
-diff -Nur gnash-0.8.3/gui/Kde4GlueAgg.cpp gnash-0.8.3-port-to-kde4/gui/Kde4GlueAgg.cpp
---- gnash-0.8.3/gui/Kde4GlueAgg.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4GlueAgg.cpp	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/Kde4GlueAgg.cpp.kde4~	2008-10-08 15:59:00.104075745 +0200
++++ gnash/gui/Kde4GlueAgg.cpp	2008-10-08 15:59:00.104075745 +0200
 @@ -0,0 +1,130 @@
 +//
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -428,9 +424,8 @@
 +
 +// end of namespace gnash
 +}
-diff -Nur gnash-0.8.3/gui/Kde4GlueAgg.h gnash-0.8.3-port-to-kde4/gui/Kde4GlueAgg.h
---- gnash-0.8.3/gui/Kde4GlueAgg.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4GlueAgg.h	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/Kde4GlueAgg.h.kde4~	2008-10-08 15:59:00.104075745 +0200
++++ gnash/gui/Kde4GlueAgg.h	2008-10-08 15:59:00.104075745 +0200
 @@ -0,0 +1,60 @@
 +//
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -492,9 +487,8 @@
 +
 +
 +}
-diff -Nur gnash-0.8.3/gui/Kde4Glue.h gnash-0.8.3-port-to-kde4/gui/Kde4Glue.h
---- gnash-0.8.3/gui/Kde4Glue.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4Glue.h	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/Kde4Glue.h.kde4~	2008-10-08 15:59:00.104075745 +0200
++++ gnash/gui/Kde4Glue.h	2008-10-08 15:59:00.104075745 +0200
 @@ -0,0 +1,47 @@
 +//
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -543,9 +537,8 @@
 +};
 +
 +} // namespace gnash
-diff -Nur gnash-0.8.3/gui/Kde4Gui.cpp gnash-0.8.3-port-to-kde4/gui/Kde4Gui.cpp
---- gnash-0.8.3/gui/Kde4Gui.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.cpp	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/Kde4Gui.cpp.kde4~	2008-10-08 15:59:00.109075805 +0200
++++ gnash/gui/Kde4Gui.cpp	2008-10-08 15:59:00.109075805 +0200
 @@ -0,0 +1,530 @@
 +// kde.cpp:  K Development Environment top level window, for Gnash.
 +// 
@@ -1077,9 +1070,8 @@
 +
 +}
 +
-diff -Nur gnash-0.8.3/gui/Kde4Gui.h gnash-0.8.3-port-to-kde4/gui/Kde4Gui.h
---- gnash-0.8.3/gui/Kde4Gui.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.h	2008-10-08 18:57:44.000000000 +0200
+--- gnash/gui/Kde4Gui.h.kde4~	2008-10-08 15:59:00.109075805 +0200
++++ gnash/gui/Kde4Gui.h	2008-10-08 15:59:00.109075805 +0200
 @@ -0,0 +1,170 @@
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1251,10 +1243,9 @@
 +}
 +
 +#endif
-diff -Nur gnash-0.8.3/gui/Makefile.am gnash-0.8.3-port-to-kde4/gui/Makefile.am
---- gnash-0.8.3/gui/Makefile.am	2008-05-02 22:23:30.000000000 +0200
-+++ gnash-0.8.3-port-to-kde4/gui/Makefile.am	2008-10-08 18:57:44.000000000 +0200
-@@ -195,6 +195,15 @@
+--- gnash/gui/Makefile.am.kde4~	2008-10-07 13:30:16.000000000 +0200
++++ gnash/gui/Makefile.am	2008-10-08 15:59:00.109075805 +0200
+@@ -188,6 +188,15 @@ BUILT_SOURCES += klash.moc 
  include $(srcdir)/am-frag/kde.am
  endif
  
@@ -1270,9 +1261,8 @@
  # Build the SDL gui
  if BUILD_SDL_GUI
  include $(srcdir)/am-frag/sdl.am
-diff -Nur gnash-0.8.3/macros/kde4.m4 gnash-0.8.3-port-to-kde4/macros/kde4.m4
---- gnash-0.8.3/macros/kde4.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/macros/kde4.m4	2008-10-08 18:57:44.000000000 +0200
+--- gnash/macros/kde4.m4.kde4~	2008-10-08 15:59:00.110076044 +0200
++++ gnash/macros/kde4.m4	2008-10-08 15:59:00.110076044 +0200
 @@ -0,0 +1,337 @@
 +AC_DEFUN([GNASH_PATH_QT4], [
 +	AC_ARG_WITH(qt4, AS_HELP_STRING([--with-qt4=DIR], [Location of Qt 4.x]))
@@ -1611,9 +1601,8 @@
 +	AM_CONDITIONAL([QT_WIN32], [test "$platform" = "Win32"])
 +	AC_MSG_RESULT([$platform])
 +])
-diff -Nur gnash-0.8.3/plugin/klash4/klash.desktop gnash-0.8.3-port-to-kde4/plugin/klash4/klash.desktop
---- gnash-0.8.3/plugin/klash4/klash.desktop	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klash.desktop	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klash.desktop.kde4~	2008-10-08 15:59:00.110076044 +0200
++++ gnash/plugin/klash4/klash.desktop	2008-10-08 15:59:00.110076044 +0200
 @@ -0,0 +1,80 @@
 +# KDE Config File
 +[Desktop Entry]
@@ -1695,9 +1684,8 @@
 +GenericName[xx]=xxMedia Playerxx
 +GenericName[zh_CN]=媒体播放器
 +GenericName[zu]=Umdlali Wezezindaba
-diff -Nur gnash-0.8.3/plugin/klash4/klash_part.cpp gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.cpp
---- gnash-0.8.3/plugin/klash4/klash_part.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.cpp	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klash_part.cpp.kde4~	2008-10-08 15:59:00.111075491 +0200
++++ gnash/plugin/klash4/klash_part.cpp	2008-10-08 15:59:00.110076044 +0200
 @@ -0,0 +1,588 @@
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -2287,9 +2275,8 @@
 +}
 +
 +#include "klash_part.moc"
-diff -Nur gnash-0.8.3/plugin/klash4/klash_part.desktop gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.desktop
---- gnash-0.8.3/plugin/klash4/klash_part.desktop	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.desktop	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klash_part.desktop.kde4~	2008-10-08 15:59:00.111075491 +0200
++++ gnash/plugin/klash4/klash_part.desktop	2008-10-08 15:59:00.111075491 +0200
 @@ -0,0 +1,12 @@
 +[Desktop Entry]
 +Encoding=UTF-8
@@ -2303,9 +2290,8 @@
 +ServiceTypes=KParts/ReadOnlyPart,Browser/View
 +X-KDE-BrowserView-PluginsInfo=klash/pluginsinfo
 +InitialPreference=1
-diff -Nur gnash-0.8.3/plugin/klash4/klash_part.h gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.h
---- gnash-0.8.3/plugin/klash4/klash_part.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.h	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klash_part.h.kde4~	2008-10-08 15:59:00.111075491 +0200
++++ gnash/plugin/klash4/klash_part.h	2008-10-08 15:59:00.111075491 +0200
 @@ -0,0 +1,162 @@
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -2469,9 +2455,8 @@
 +
 +
 +#endif
-diff -Nur gnash-0.8.3/plugin/klash4/klash_part.moc.in gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.moc.in
---- gnash-0.8.3/plugin/klash4/klash_part.moc.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.moc.in	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klash_part.moc.in.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/klash_part.moc.in	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,340 @@
 +/****************************************************************************
 +** KlashBrowserExtension meta object code from reading C++ file 'klash_part.h'
@@ -2813,9 +2798,8 @@
 +
 +bool KlashPart::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
 +#endif // QT_NO_PROPERTIES
-diff -Nur gnash-0.8.3/plugin/klash4/klashpartui.rc gnash-0.8.3-port-to-kde4/plugin/klash4/klashpartui.rc
---- gnash-0.8.3/plugin/klash4/klashpartui.rc	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klashpartui.rc	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klashpartui.rc.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/klashpartui.rc	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,15 @@
 +<!DOCTYPE kpartgui>
 +<kpartgui name="klash" version="1">
@@ -2832,9 +2816,8 @@
 +  <Action name="stop"/>
 +</Toolbar>
 +</kpartgui>
-diff -Nur gnash-0.8.3/plugin/klash4/klashplayer.lsm gnash-0.8.3-port-to-kde4/plugin/klash4/klashplayer.lsm
---- gnash-0.8.3/plugin/klash4/klashplayer.lsm	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/klashplayer.lsm	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/klashplayer.lsm.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/klashplayer.lsm	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,14 @@
 +Begin3
 +Title:          Klashplayer 
@@ -2850,9 +2833,8 @@
 +Platforms:       Linux and other Unices
 +Copying-policy: GNU Public License
 +End
-diff -Nur gnash-0.8.3/plugin/klash4/Makefile.am gnash-0.8.3-port-to-kde4/plugin/klash4/Makefile.am
---- gnash-0.8.3/plugin/klash4/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/Makefile.am	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/Makefile.am.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/Makefile.am	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,104 @@
 +## Process this file with automake to generate Makefile.in
 +# 
@@ -2958,9 +2940,8 @@
 +force:
 +
 +.PHONY : install-plugins install-plugin test_perms
-diff -Nur gnash-0.8.3/plugin/klash4/pluginsinfo gnash-0.8.3-port-to-kde4/plugin/klash4/pluginsinfo
---- gnash-0.8.3/plugin/klash4/pluginsinfo	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/pluginsinfo	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/pluginsinfo.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/pluginsinfo	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,7 @@
 +number=1
 +
@@ -2969,19 +2950,17 @@
 +file=libklashpart.so
 +mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
 +name=Shockwave Flash
-diff -Nur gnash-0.8.3/plugin/klash4/README gnash-0.8.3-port-to-kde4/plugin/klash4/README
---- gnash-0.8.3/plugin/klash4/README	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/plugin/klash4/README	2008-10-08 18:57:44.000000000 +0200
+--- gnash/plugin/klash4/README.kde4~	2008-10-08 15:59:00.112076067 +0200
++++ gnash/plugin/klash4/README	2008-10-08 15:59:00.112076067 +0200
 @@ -0,0 +1,5 @@
 +Klash is a plugin for Konqueror, using the gnash binary from the Gnash
 +project. As of this writing, you can only get it by checking it out their
 +CVS repository. It should be newer than 2006-02-23, because that version
 +has the -x option to embed in a window.
 +You also need automake/autoconf and the SDL development.
-diff -Nur gnash-0.8.3/plugin/Makefile.am gnash-0.8.3-port-to-kde4/plugin/Makefile.am
---- gnash-0.8.3/plugin/Makefile.am	2008-04-27 03:48:13.000000000 +0200
-+++ gnash-0.8.3-port-to-kde4/plugin/Makefile.am	2008-10-08 19:00:21.000000000 +0200
-@@ -24,6 +24,10 @@
+--- gnash/plugin/Makefile.am.kde4~	2008-10-07 13:30:16.000000000 +0200
++++ gnash/plugin/Makefile.am	2008-10-08 15:59:00.113075634 +0200
+@@ -24,6 +24,10 @@ if KPARTS
  SUBDIRS += klash
  endif
  
@@ -2989,10 +2968,19 @@
 +SUBDIRS += klash4
 +endif
 +
- if NSAPI
+ if NPAPI
  SUBDIRS += mozilla-sdk
  
-@@ -123,6 +127,7 @@
+@@ -41,7 +45,7 @@ endif
+ endif # NPAPI
+ 
+ # make sure these files make it into the distribution tarball.
+-DIST_SUBDIRS = klash mozilla-sdk xpcom win32
++DIST_SUBDIRS = klash klash4 mozilla-sdk xpcom win32
+ 
+ # This is a hard coded path to where the plugin gets installed.
+ GNASHBINDIR = $(bindir)
+@@ -132,6 +136,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLI
  	@echo "Use \"make install-plugin\" to install the Firefox plugin to $(DESTDIR)$(plugindir)."
  
  if !WIN32
@@ -3000,7 +2988,7 @@
  install-plugin: $(plugin_LTLIBRARIES)
  	@test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) "$(DESTDIR)$(plugindir)"
  	@echo "Installing plugin to $(DESTDIR)$(plugindir)"
-@@ -131,6 +136,10 @@
+@@ -140,6 +145,10 @@ install-plugin: $(plugin_LTLIBRARIES)
  	else \
  	  cp -f libgnashplugin.so* $(DESTDIR)$(plugindir)/libgnashplugin.so; \
  	fi
@@ -3011,7 +2999,7 @@
  else
  install-plugin: 
  	: # do nothing
-@@ -138,6 +147,7 @@
+@@ -147,6 +156,7 @@ endif # WIN32
  
  install-plugins: install-plugin
  	$(MAKE) -C klash install-plugins

More information about the fedora-extras-commits mailing list