rpms/gnash/devel gnash-0.8.4-port-to-kde4.patch, NONE, 1.1 gnash.spec, 1.36, 1.37 gnash-0.8.3-port-to-kde4.patch, 1.4, NONE
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 18 21:10:34 UTC 2008
- Previous message (by thread): rpms/HamFax/devel import.log,1.4,1.5
- Next message (by thread): rpms/kernel/devel linux-2.6-upstream-reverts.patch, 1.2, 1.3 patch-2.6.27.2.bz2.sign, NONE, 1.1 patch-2.6.27.3-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.948, 1.949 TODO, 1.24, 1.25 kernel.spec, 1.1062, 1.1063 linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.1, 1.2 sources, 1.910, 1.911 upstream, 1.822, 1.823 patch-2.6.27.1.bz2.sign, 1.1, NONE patch-2.6.27.2-rc1.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26219/devel
Modified Files:
gnash.spec
Added Files:
gnash-0.8.4-port-to-kde4.patch
Removed Files:
gnash-0.8.3-port-to-kde4.patch
Log Message:
* Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-2
- update KDE 4 patch (undo the backporting and use original patch)
gnash-0.8.4-port-to-kde4.patch:
--- NEW FILE gnash-0.8.4-port-to-kde4.patch ---
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 @@
AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
+has_kde4=no
has_kde=no
has_gtk2=no
build_fb=no
build_fltk=no
+build_kde4=no
build_kde=no
build_gtk=no
build_sdl=no
@@ -511,9 +513,12 @@
dnl AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
build_gtk=yes
;;
- kde|KDE)
+ kde|KDE|kde3|KDE3)
build_kde=yes
;;
+ kde4|KDE4)
+ build_kde4=yes
+ ;;
qtopia|QTOPIA)
build_qtopia=yes
build_qt=yes
@@ -544,6 +549,7 @@
build_fb=yes
build_fltk=yes
build_kde=yes
+ build_kde4=yes
build_gtk=yes
build_sdl=yes
dnl build_qtopia=yes
@@ -551,7 +557,7 @@
dnl build_alp=yes
dnl build_riscos=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: gtk|kde|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia|dump)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: gtk|kde|kde4|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia|dump)])
;;
esac]
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1209,9 +1215,21 @@
[case "${enableval}" in
yes) kparts=yes ;;
no) kparts=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --disable-kpart option]) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --disable-kparts option]) ;;
esac],kparts=$build_kde)
+dnl --------------------------------------------------------
+dnl Add KPARTS 4.x support, if specified or KDE gui is built
+dnl --------------------------------------------------------
+
+AC_ARG_ENABLE(kparts4,
+ AC_HELP_STRING([--disable-kparts4], [Disble support for Konqueror 4.x plugin (default: enabled if kde4 gui is)]),
+[case "${enableval}" in
+ yes) kparts4=yes ;;
+ no) kparts4=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --disable-kparts4 option]) ;;
+esac],kparts4=$build_kde4)
+
dnl ----------------------------------------------------
dnl Add NSAPI support, if specified or GTK gui is built
dnl ----------------------------------------------------
@@ -1242,6 +1260,7 @@
if test x$plugins = xno; then
nsapi=no
kparts=no
+ kparts4=no
fi
GNASH_PATH_FIREFOX
@@ -1556,6 +1575,13 @@
if test x$build_kde = xyes -o x$kparts = xyes; then
GNASH_PATH_KDE
fi
+if test x$build_kde4 = xyes -o x$kparts4 = xyes; then
+ GNASH_QT4_GUI
+ GNASH_PATH_KDE4
+ if test "x$gnash_cv_lib_kde_dir" != xno; then
+ has_kde4=yes
+ fi
+fi
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 @@
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 @@
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
+if test x$has_kde4 = xno -a x$kparts4 = xyes; then
+ kparts4=no
+dnl build_kde4=no
+ AC_MSG_WARN(["Disabling KPARTS 4.x plugin, no KDE 4.x development found"])
+fi
+
+if test x$build_kde4 = xno -a x$kparts4 = xyes; then
+ AC_MSG_WARN(["Enabled KPARTS 4.x plugin, but you aren't building a KDE 4.x based GUI!"])
+fi
AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
@@ -1610,6 +1646,7 @@
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 ])
+AM_CONDITIONAL(BUILD_KDE4_GUI, [ test x$build_kde4 = xyes ])
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 @@
# plugin building flags
AM_CONDITIONAL(NSAPI, [test x$nsapi = 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 @@
if test x$build_kde = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},kde"
fi
+if test x$build_kde4 = xyes; then
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},kde4"
+fi
if test x$build_gtk = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},gtk"
fi
@@ -2109,6 +2150,7 @@
extensions/metome/Makefile
plugin/Makefile
plugin/klash/Makefile
+plugin/klash4/Makefile
plugin/mozilla-sdk/Makefile
plugin/win32/Makefile
cygnal/Makefile
@@ -2163,13 +2205,23 @@
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 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}"
+ echo " KPARTS 3.x config dir will be in ${KDE_CONFIGDIR}"
+ echo " KPARTS 3.x appsdata will be installed in ${KDE_APPSDATADIR}"
+else
+ echo " KPARTS 3.x plugin disabled."
+fi
+
+if test x"$kparts4" = x"yes"; then
+ echo " KPARTS 4.x plugin enabled (default). Use --disable-kparts4 to disable"
+ echo " KPARTS 4.x plugin will be installed in ${KDE4_PLUGINDIR}"
+ echo " KPARTS 4.x service will be installed in ${KDE4_SERVICESDIR}"
+ echo " KPARTS 4.x config dir will be in ${KDE4_CONFIGDIR}"
+ echo " KPARTS 4.x appsdata will be installed in ${KDE4_APPSDATADIR}"
else
- echo " KPARTS plugin disabled."
+ echo " KPARTS 4.x plugin disabled."
fi
dnl -- if test x"${dynamic_gui}" = x"yes"; then
@@ -2264,17 +2316,17 @@
if test x$build_kde = xyes -o x$kparts = xyes; then
if test x"$has_kde" = xyes; then
- echo " KDE flags are: $KDE_CFLAGS"
- echo " KDE libs are: $KDE_LIBS"
+ echo " KDE 3.x flags are: $KDE_CFLAGS"
+ echo " KDE 3.x libs are: $KDE_LIBS"
else
- echo " ERROR: No KDE development package installed!" >&3
- echo " To disable the KDE gui," >&3
+ echo " ERROR: No KDE 3.x development package installed!" >&3
+ echo " To disable the KDE 3.x gui," >&3
echo " reconfigure using --enable-gui=<list-of-guis>" >&3
echo " and omit "kde" from the list." >&3
echo " When the option --enable-gui=... is omitted," >&3
echo " the default is the same of --enable-gui=kde,gtk" >&3
- echo " To be able to build the kde gui," >&3
- echo " install the KDE development environment from http://kde.org" >&3
[...2622 lines suppressed...]
+<MenuBar>
+ <Menu name="view"><text>&View</text>
+ <Action name="play"/>
+ <Action name="pause"/>
+ <Action name="stop"/>
+ </Menu>
+</MenuBar>
+<Toolbar name="mainToolBar"><text></text>
+ <Action name="play"/>
+ <Action name="pause"/>
+ <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
@@ -0,0 +1,14 @@
+Begin3
+Title: Klashplayer
+Version: 0.0.1-pre1
+Entered-date:
+Description:
+Keywords:
+Author: Koos Vriezen <>
+Maintained-by: Koos Vriezen <>
+Primary-site:
+Home-page: http://xx.kde.org
+Original-site:
+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
@@ -0,0 +1,104 @@
+## Process this file with automake to generate Makefile.in
+#
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+AUTOMAKE_OPTIONS =
+
+if KPARTS4
+AM_CPPFLAGS = \
+ $(KDE4_CFLAGS) \
+ $(QT4_CFLAGS) \
+ $(X11_CFLAGS) \
+ -DGNASHBINDIR=\"${bindir}\"
+
+plugindir = $(KDE4_PLUGINDIR)
+kde_servicesdir = $(KDE4_SERVICESDIR)
+kde_rcdir = $(KDE4_APPSDATADIR)
+#$(prefix)/share/apps/klash
+kde_appsdatadir = $(KDE4_APPSDATADIR)
+#$(prefix)/share/apps/klash
+kde_configdir = $(KDE4_CONFIGDIR)
+#$(prefix)/share/config
+
+plugin_LTLIBRARIES= libklashpart.la
+
+libklashpart_la_SOURCES = klash_part.cpp klash_part.h
+libklashpart_la_DEPENDENCIES = klash_part.moc
+if PLUGIN_LINK_UNDEFINED
+libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir) @QTCORE@ @QTGUI@ @KDECORE@ @KDEUI@
+else
+libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) @QTCORE@ @QTGUI@ @KDECORE@ @KDEUI@
+endif
+
+dist_kde_services_DATA = klash_part.desktop
+dist_kde_rc_DATA = klashpartui.rc
+dist_kde_appsdata_DATA = pluginsinfo
+#dist_kde_config_DATA = klashrc
+
+# DIST_COMMON = $(dist_kde_appsdata_DATA) $(dist_kde_services_DATA) $(dist_kde_rc_DATA)
+
+BUILT_SOURCES = klash_part.moc
+CLEANFILES = klash_part.moc
+
+klash_part.moc: $(srcdir)/klash_part.h
+ $(MOC4) $(srcdir)/klash_part.h -o klash_part.moc;
+
+install-data: $(dist_kde_services_DATA)
+ test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
+ $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+
+test_perms:
+ @if test ! -w $(DESTDIR)$(kde_appsdatadir) -o ! -w $(DESTDIR)$(kde_servicesdir); then \
+ if test -d $(DESTDIR)$(kde_appsdatadir); then \
+ echo "WARNING: Improper permissions for $(DESTDIR)$(kde_appsdatadir)!"; \
+ echo "You probably need to be root"; \
+ echo "Or configure with --with-kde-pluginprefix= set to a writable directory"; \
+ exit 1; \
+ fi; \
+ if test -d $(DESTDIR)$(kde_servicesdir); then \
+ echo "WARNING: Improper permissions for $(DESTDIR)$(kde_appsdatadir) and $(DESTDIR)$(kde_servicesdir)!"; \
+ echo "You probably need to be root"; \
+ echo "Or configure with --with-kde-pluginprefix= set to a writable directory"; \
+ exit 1; \
+ fi; \
+ fi
+
+install-data-am: $(dist_kde_services_DATA) $(dist_kde_appsdata_DATA)
+ test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
+ $(INSTALL) $(srcdir)/$(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+ test -d $(DESTDIR)$(kde_appsdatadir) || $(mkinstalldirs) $(DESTDIR)$(kde_appsdatadir)
+ $(INSTALL) $(srcdir)/$(dist_kde_appsdata_DATA) $(DESTDIR)$(kde_appsdatadir)
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @echo "Nothing to install here now."
+ @echo "Use \"make install-plugin\" to install the KDE plugin to $(DESTDIR)$(plugindir)."
+
+install-plugin install-plugins: test_perms $(plugin_LTLIBRARIES) $(dist_kde_services_DATA) \
+ install-dist_kde_appsdataDATA install-dist_kde_rcDATA \
+ install-dist_kde_servicesDATA
+ test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) $(DESTDIR)$(plugindir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
+
+uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
+
+endif
+
+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
@@ -0,0 +1,7 @@
+number=1
+
+[0]
+description=Shockwave Flash 7.0
+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
@@ -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 @@
SUBDIRS += klash
endif
+if KPARTS4
+SUBDIRS += klash4
+endif
+
if NSAPI
SUBDIRS += mozilla-sdk
@@ -123,6 +127,7 @@
@echo "Use \"make install-plugin\" to install the Firefox plugin to $(DESTDIR)$(plugindir)."
if !WIN32
+if NPAPI
install-plugin: $(plugin_LTLIBRARIES)
@test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) "$(DESTDIR)$(plugindir)"
@echo "Installing plugin to $(DESTDIR)$(plugindir)"
@@ -131,6 +136,10 @@
else \
cp -f libgnashplugin.so* $(DESTDIR)$(plugindir)/libgnashplugin.so; \
fi
+else # NPAPI
+install-plugin:
+ : # do nothing
+endif
else
install-plugin:
: # do nothing
@@ -138,6 +147,7 @@
install-plugins: install-plugin
$(MAKE) -C klash install-plugins
+ $(MAKE) -C klash4 install-plugins
$(MAKE) -C win32 install-plugins
uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnash.spec 18 Oct 2008 20:47:55 -0000 1.36
+++ gnash.spec 18 Oct 2008 21:10:04 -0000 1.37
@@ -5,7 +5,7 @@
Name: gnash
Version: 0.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNU flash movie player
Group: Applications/Multimedia
@@ -14,7 +14,7 @@
Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
Patch0: gnash-0.8.3-manual.patch
# patch by Benjamin Wolsey and Bernhard Rosenkränzer
-Patch2: gnash-0.8.3-port-to-kde4.patch
+Patch2: gnash-0.8.4-port-to-kde4.patch
# register KComponentData properly in KDE 4 KPart
Patch3: gnash-0.8.3-fix-kde4-port.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -90,19 +90,19 @@
%prep
%setup -q
%patch0 -p1 -b .manual
-#%patch2 -p1 -b .kde4
-#%patch3 -p1 -b .fix-kde4
-## handle the /usr/lib(64)/kde4/devel hack
-## If only this package used cmake, this wouldn't be necessary...
-#sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
-## Hack so it finds libQtCore.so in /usr on lib64 arches
-#sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4
-## both the kde4 patch and the above sed hacks touched autotools stuff
-#autoreconf
-#%if 0%{?use_kde3_executable}
-## hack the KDE 4 KPart so it uses the KDE 3 executable
-#sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp
-#%endif
+%patch2 -p1 -b .kde4
+%patch3 -p1 -b .fix-kde4
+# handle the /usr/lib(64)/kde4/devel hack
+# If only this package used cmake, this wouldn't be necessary...
+sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
+# Hack so it finds libQtCore.so in /usr on lib64 arches
+sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4
+# both the kde4 patch and the above sed hacks touched autotools stuff
+autoreconf
+%if 0%{?use_kde3_executable}
+# hack the KDE 4 KPart so it uses the KDE 3 executable
+sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp
+%endif
#chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
@@ -114,7 +114,6 @@
%if 0%{?use_kde3_executable}
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
%endif
-# --enable-gui=gtk,kde,kde4,sdl,fb \
# --enable-ghelp is disabled
# We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for
# is actually in /, not in the QT4DIR (_qt4_prefix).
@@ -123,7 +122,7 @@
--enable-docbook --enable-ghelp --enable-media=GST \
--disable-dependency-tracking --disable-rpath \
--enable-cygnal \
- --enable-gui=gtk,kde,sdl,fb \
+ --enable-gui=gtk,kde,kde4,sdl,fb \
--disable-kparts \
--with-qtdir=$QTDIR \
--with-qt4=%{_kde4_prefix} \
@@ -153,7 +152,7 @@
KDE4_APPSDATADIR=%{_kde4_appsdir}/klash
rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
# KDE 4 doesn't need the .la file anymore, thankfully
-#rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
+rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
rm \
$RPM_BUILD_ROOT%{_libdir}/gnash/libgnashamf.so \
$RPM_BUILD_ROOT%{_libdir}/gnash/libgnashbase.so \
@@ -199,7 +198,7 @@
# $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
%if 0%{?use_kde3_executable}
-#rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash
+rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash
%endif
%find_lang %{name}
@@ -270,9 +269,9 @@
%else
%{_kde4_bindir}/kde4-gnash
%endif
-#%{_kde4_libdir}/kde4/libklashpart.so
-#%{_kde4_appsdir}/klash/
-#%{_kde4_datadir}/kde4/services/klash_part.desktop
+%{_kde4_libdir}/kde4/libklashpart.so
+%{_kde4_appsdir}/klash/
+%{_kde4_datadir}/kde4/services/klash_part.desktop
%files cygnal
%defattr(-,root,root,-)
@@ -280,6 +279,9 @@
%{_mandir}/man1/cygnal.1*
%changelog
+* Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-2
+- update KDE 4 patch (undo the backporting and use original patch)
+
* Sat Oct 18 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-1
- update to 0.8.4
--- gnash-0.8.3-port-to-kde4.patch DELETED ---
- Previous message (by thread): rpms/HamFax/devel import.log,1.4,1.5
- Next message (by thread): rpms/kernel/devel linux-2.6-upstream-reverts.patch, 1.2, 1.3 patch-2.6.27.2.bz2.sign, NONE, 1.1 patch-2.6.27.3-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.948, 1.949 TODO, 1.24, 1.25 kernel.spec, 1.1062, 1.1063 linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.1, 1.2 sources, 1.910, 1.911 upstream, 1.822, 1.823 patch-2.6.27.1.bz2.sign, 1.1, NONE patch-2.6.27.2-rc1.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list