rpms/kdebase3/devel kdebase-3.5.8-new-flash.patch, 1.1, 1.2 kdebase3.spec, 1.5, 1.6

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Dec 14 16:30:57 UTC 2007 

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22648

Modified Files:
	kdebase-3.5.8-new-flash.patch kdebase3.spec 
Log Message:
* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-20
- nspluginviewer: +gtk_init (#410651)
- use kde's kde.desktop for xsession support


kdebase-3.5.8-new-flash.patch:

Index: kdebase-3.5.8-new-flash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase-3.5.8-new-flash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.8-new-flash.patch	13 Dec 2007 20:34:06 -0000	1.1
+++ kdebase-3.5.8-new-flash.patch	14 Dec 2007 16:30:50 -0000	1.2
@@ -33,24 +33,6 @@
    void destroyInstance( NSPluginInstance* inst );
    bool error() { return _error; }
  
---- nsplugins/viewer/Makefile.am.sav	2007-04-11 16:25:04.000000000 +0200
-+++ nsplugins/viewer/Makefile.am	2007-12-11 19:30:13.000000000 +0100
-@@ -1,12 +1,11 @@
--INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes)
-+INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes) `pkg-config --cflags glib-2.0`
- METASOURCES = AUTO
- 
- bin_PROGRAMS = nspluginviewer 
- 
- nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
--	nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
--nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-+	nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp
-+nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic `pkg-config --libs glib-2.0`
- nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
- 
- NSPluginCallbackIface_DIR = $(srcdir)/..
--
 --- nsplugins/viewer/viewer.cpp.sav	2007-12-11 15:56:33.000000000 +0100
 +++ nsplugins/viewer/viewer.cpp	2007-12-11 19:30:34.000000000 +0100
 @@ -87,6 +86,7 @@ static int x_errhandler(Display *dpy, XE
@@ -579,3 +561,88 @@
  };
  
  
+--- nsplugins/configure.in.in.gtk	2007-07-27 12:37:20.000000000 -0400
++++ nsplugins/configure.in.in	2007-07-27 12:37:26.000000000 -0400
+@@ -0,0 +1,40 @@
++dnl Check for pkg-config
++AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++if test "$PKG_CONFIG" = "no"; then
++  AC_MSG_ERROR([
++This package requires pkg-config.
++])
++fi
++
++dnl Check for Gtk+-2.0
++# GTK_CFLAGS:  cflags for compiling glib dependant sources
++# GTK_LIBADD:  glib libraries (-l options)
++# GTK_LDFLAGS: flags containing path to glib libraries (-L options)
++
++GTK_PACKAGES="gtk+-2.0"
++GTK_VERSION="0.21"
++AC_MSG_CHECKING(for GTK+-2.0 (at least $GTK_VERSION))
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then
++   if $PKG_CONFIG --atleast-version $GTK_VERSION $GTK_PACKAGES >/dev/null 2>&1 ; then
++       GTK_CFLAGS="`$PKG_CONFIG --cflags $GTK_PACKAGES`"
++       GTK_LIBADD="`$PKG_CONFIG --libs-only-l --libs-only-other $GTK_PACKAGES`"
++       GTK_LDFLAGS="`$PKG_CONFIG --libs-only-L $GTK_PACKAGES`"
++       AC_MSG_RESULT(yes)
++   fi
++else
++   if $PKG_CONFIG --atleast-version $GTK_VERSION $GTK_PACKAGES >/dev/null 2>&1 ; then
++       GTK_CFLAGS="`$PKG_CONFIG --cflags $GTK_PACKAGES`"
++       GTK_LIBADD="`$PKG_CONFIG --libs-only-l $GTK_PACKAGES`"
++       GTK_LDFLAGS="`$PKG_CONFIG --libs-only-L $GTK_PACKAGES`"
++       AC_MSG_RESULT(yes)
++       AC_MSG_WARN([you may need to run make LDFLAGS=-pthread to compile arts])
++   fi
++fi
++
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBADD)
++AC_SUBST(GTK_LDFLAGS)
++
++
+--- nsplugins/viewer/Makefile.am.gtk	2007-07-27 12:40:05.000000000 -0400
++++ nsplugins/viewer/Makefile.am	2007-07-27 12:40:07.000000000 -0400
+@@ -1,12 +1,12 @@
+-INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes)
++INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes) $(GTK_CFLAGS)
+ METASOURCES = AUTO
+ 
+ bin_PROGRAMS = nspluginviewer 
+ 
+ nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
+ 	nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
+-nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+-nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
++nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic $(GTK_LDFLAGS)
++nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt $(GTK_LIBADD)
+ 
+ NSPluginCallbackIface_DIR = $(srcdir)/..
+ 
+--- nsplugins/viewer/viewer.cpp.gtk	2007-07-27 12:40:38.000000000 -0400
++++ nsplugins/viewer/viewer.cpp	2007-07-27 12:42:41.000000000 -0400
+@@ -54,6 +54,10 @@
+ #include "qxteventloop.h"
+ #endif
+ 
++// FIXME: this is just for calling gtk_init and fix the buggy flash player
++// initialization
++#include <gtk/gtkmain.h>
++
+ /**
+  *  Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
+  *  such as FreeBSD 4.
+@@ -215,6 +219,10 @@ bool qt_set_socket_handler( int sockfd, 
+ 
+ int main(int argc, char** argv)
+ {
++   // FIXME: the gtk_init() call is here to fix a bug in flash player that does
++   // not call it properly, or call it in a wrong place
++   gtk_init(&argc, &argv);
++
+     // nspluginviewer is a helper app, it shouldn't do session management at all
+    setenv( "SESSION_MANAGER", "", 1 );
+ 


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdebase3.spec	13 Dec 2007 20:34:06 -0000	1.5
+++ kdebase3.spec	14 Dec 2007 16:30:50 -0000	1.6
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -433,8 +433,9 @@
 
 install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
 
-# install gdm session support
-install -p -m755 -D %{SOURCE3} %{buildroot}%{_datadir}/xsessions/kde.desktop
+# xsession support
+mkdir -p %{buildroot}%{_datadir}/xsessions/
+ln -s %{_datadir}/apps/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
 
 # install logrotate script
 install -p -m 644 -D %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
@@ -749,7 +750,6 @@
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 
-
 %if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
@@ -773,8 +773,12 @@
 
 
 %changelog
+* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-20
+- nspluginviewer: +gtk_init (#410651)
+- use kde's kde.desktop for xsession support
+
 * Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
-- flash fix (#410651, kde#132138, kde#146784)
+- nspluginviewer: XEmbed support (#410651, kde#132138, kde#146784)
 
 * Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-18
 - omit pam configs, kdm bits, xsession/gdm support (f9+)

More information about the fedora-extras-commits mailing list