rpms/kdebase4/F-8 kdebase-4.0.3-kde#160422.patch, NONE, 1.1 kdebase-4.0.3-kwrite-dt_categories.patch, NONE, 1.1 kdebase-4.0.3-nspluginviewer.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kdebase4.spec, 1.11, 1.12 sources, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19124/F-8

Modified Files:
	.cvsignore kdebase4.spec sources 
Added Files:
	kdebase-4.0.3-kde#160422.patch 
	kdebase-4.0.3-kwrite-dt_categories.patch 
	kdebase-4.0.3-nspluginviewer.patch 
Log Message:
sync with kdebase/devel (kde-4.0.3)


kdebase-4.0.3-kde#160422.patch:

--- NEW FILE kdebase-4.0.3-kde#160422.patch ---
Index: apps/konsole/src/TerminalDisplay.cpp
===================================================================
--- apps/konsole/src/TerminalDisplay.cpp	(revision 793963)
+++ apps/konsole/src/TerminalDisplay.cpp	(revision 793970)
@@ -2575,7 +2575,7 @@
 
   _topMargin = DEFAULT_TOP_MARGIN;
   _contentHeight = contentsRect().height() - 2 * DEFAULT_TOP_MARGIN + /* mysterious */ 1;
-
+   
   if (!_isFixedSize)
   {
      // ensure that display is always at least one column wide
@@ -2606,16 +2606,16 @@
   clearImage();
 }
 
-// calculate the needed size
+// calculate the needed size, this must be synced with calcGeometry()
 void TerminalDisplay::setSize(int columns, int lines)
 {
-  //FIXME - Not quite correct, a small amount of additional space
-  // will be used for margins, the scrollbar etc.
-  // we need to allow for this so that '_size' does allow
-  // enough room for the specified number of columns and lines to fit
+  int scrollBarWidth = _scrollBar->isHidden() ? 0 :  
+						style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+  int horizontalMargin = 2 * DEFAULT_LEFT_MARGIN;
+  int verticalMargin = 2 * DEFAULT_TOP_MARGIN;
 
-  QSize newSize = QSize( columns * _fontWidth  ,
-				 lines * _fontHeight   );
+  QSize newSize = QSize( horizontalMargin + scrollBarWidth + (columns * _fontWidth)  ,
+				 verticalMargin + (lines * _fontHeight)   );
 
   if ( newSize != size() )
   {
Index: apps/konsole/src/Application.cpp
===================================================================
--- apps/konsole/src/Application.cpp	(revision 793963)
+++ apps/konsole/src/Application.cpp	(revision 793970)
@@ -131,8 +131,23 @@
     if ( args->isSet("background-mode") )
         startBackgroundMode(window);
     else
-        window->show();
+	{
+		// Qt constrains top-level windows which have not been manually resized
+		// (via QWidget::resize()) to a maximum of 2/3rds of the screen size.
+		//
+		// This means that the terminal display might not get the width/height
+		// it asks for.  To work around this, the widget must be manually resized
+		// to its sizeHint().
+		//
+		// This problem only affects the first time the application is run.  After
+		// that KMainWindow will have manually resized the window to its saved size
+		// at this point (so the Qt::WA_Resized attribute will be set)
+		if (!window->testAttribute(Qt::WA_Resized))
+			window->resize(window->sizeHint());
 
+		window->show();
+	}
+
     return 0;
 }
 

kdebase-4.0.3-kwrite-dt_categories.patch:

--- NEW FILE kdebase-4.0.3-kwrite-dt_categories.patch ---
diff -up kdebase-4.0.3/apps/kwrite/kwrite.desktop.dt kdebase-4.0.3/apps/kwrite/kwrite.desktop
--- kdebase-4.0.3/apps/kwrite/kwrite.desktop.dt	2008-03-27 15:34:11.000000000 -0500
+++ kdebase-4.0.3/apps/kwrite/kwrite.desktop	2008-04-18 12:02:58.000000000 -0500
@@ -92,4 +92,4 @@ Terminal=false
 InitialPreference=8
 X-DBUS-StartupType=Multi
 X-DBUS-ServiceName=org.kate-editor.kwrite
-Categories=Qt;KDE;TextEditor;
+Categories=Qt;KDE;Utility;TextEditor;

kdebase-4.0.3-nspluginviewer.patch:

--- NEW FILE kdebase-4.0.3-nspluginviewer.patch ---
Index: kdebase/apps/nsplugins/viewer/nsplugin.cpp
===================================================================
--- kdebase/apps/nsplugins/viewer/nsplugin.cpp	(revision 796100)
+++ kdebase/apps/nsplugins/viewer/nsplugin.cpp	(working copy)
@@ -1391,14 +1391,10 @@
    memset(npp, 0, sizeof(NPP_t));
    npp->ndata = NULL;
 
-   // Create plugin instance object
-   NSPluginInstance *inst = new NSPluginInstance( npp, &_pluginFuncs, _handle,
-                                                  baseURL, mimeType, appId,
-                                                  callbackId, embed, this );
-
    // create plugin instance
    NPError error = _pluginFuncs.newp(mime, npp, embed ? NP_EMBED : NP_FULL,
                                      argc, _argn, _argv, 0);
+
    kDebug(1431) << "NPP_New = " << (int)error;
 
    // free arrays with arguments
@@ -1408,12 +1404,17 @@
    // check for error
    if ( error!=NPERR_NO_ERROR)
    {
-      delete inst;
       //delete npp;    double delete!
       kDebug(1431) << "<- PluginClass::NewInstance = 0";
       return QDBusObjectPath();
    }
 
+   // Create plugin instance object
+   NSPluginInstance *inst = new NSPluginInstance( npp, &_pluginFuncs, _handle,
+                                                  baseURL, mimeType, appId,
+                                                  callbackId, embed, this );
+
+
    // create source stream
    if ( !src.isEmpty() )
       inst->requestURL( src, mimeType, QString(), 0, false, reload );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Mar 2008 02:17:42 -0000	1.7
+++ .cvsignore	22 Apr 2008 19:02:57 -0000	1.8
@@ -1 +1 @@
-kdebase-4.0.2.tar.bz2
+kdebase-4.0.3.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdebase4.spec	9 Mar 2008 02:17:42 -0000	1.11
+++ kdebase4.spec	22 Apr 2008 19:02:57 -0000	1.12
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.2
-Release: 2%{?dist}
+Version: 4.0.3
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -10,7 +10,7 @@
 Obsoletes: kdebase4 < %{version}-%{release}
 Provides: kdebase4 = %{version}-%{release}
 
-Obsoletes: %{name}-extras < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # make -libs subpkg
 %define libs 1
@@ -23,10 +23,18 @@
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
-# upstream patches
-Patch0:    kdebase-4.0.2-favicons.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# fix Konsole window size (backported from 4.1, #439638, kde#160422)
+# http://websvn.kde.org/?view=rev&revision=793964
+# http://websvn.kde.org/?view=rev&revision=793970
+Patch100: kdebase-4.0.3-kde#160422.patch
+# http://bugs.kde.org/160143
+Patch101: kdebase-4.0.3-nspluginviewer.patch
+# http://bugzilla.redhat.com/438786 (will upstream -- Rex)
+Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
+
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
@@ -36,42 +44,38 @@
 %endif
 
 %if 0%{?libs}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
-# are these 2 *really* needed? -- Rex
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
-Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 %endif
 
-Provides:      dolphin = 0.9.5-1
-Obsoletes:     dolphin < 0.9.5-1
+Provides:      dolphin = 1.0.2-1
+Obsoletes:     dolphin < 1.0.2-1
 Obsoletes:     d3lphin
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
-# needed?
-BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
 BuildRequires: fontconfig-devel
 BuildRequires: gettext
+BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-# needed?
-BuildRequires: libart_lgpl-devel
-# needed?
-BuildRequires: libfontenc-devel
+%ifnarch s390 s390x
+BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
+%endif
 BuildRequires: OpenEXR-devel
-# needed?
-BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
@@ -82,17 +86,12 @@
 %endif
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
-BuildRequires: xine-lib-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} >= 8
-BuildRequires:  libxcb-devel
-%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: zlib-devel
-# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
-BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
+
+# Dolphin needs the ioslaves and icons from kdebase-runtime (#438632)
+Requires: kdebase-runtime oxygen-icon-theme
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
@@ -103,14 +102,9 @@
 
 %if 0%{?libs}
 %package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name} 
 Group:   System Environment/Libraries
-# helps multilib upgrades? -- Rex
-Obsoletes: kdebase < %{epoch}:%{version}-%{release}
-# are these 2 *really* needed? -- Rex
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-# include to be paranoid, installing libs-only is untested -- Rex
-Requires: %{name} = %{epoch}:%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -118,7 +112,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name} 
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
@@ -130,7 +124,11 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch0 -p0 -b .favicons
+
+%patch100 -p0 -b .kde#160422
+%patch101 -p1 -b .kde#160143 
+%patch102 -p1 -b kwrite-dt_categories
+
 
 %build
 
@@ -139,17 +137,13 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-
 %if "%{name}" != "kdebase"
 # remove files which conflict with KDE 3
 # FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
@@ -245,6 +239,8 @@
 done
 popd
 
+# konquerorsu only show in KDE
+echo OnlyShowIn=KDE; >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop 
 
 %clean
 rm -rf %{buildroot}
@@ -309,6 +305,38 @@
 
 
 %changelog
+* Fri Apr 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-9
+- kwrite.desktop: Categories += Utility (#438786)
+
+* Thu Apr 17 2008 Than Ngo <than at redhat.com> 4.0.3-8
+- konquerorsu only show in KDE, #442834
+
+* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-7
+- nspluginviewer patch (kde#160413)
+
+* Sun Apr 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-6
+- backport Konsole window size fixes from 4.1 (#439638, kde#160422)
+
+* Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-5
+- rebuild (again) for the fixed %%{_kde4_buildtype}
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
+- add missing BR libraw1394-devel (thanks to Karsten Hopp)
+- don't BR libusb-devel on s390 or s390x
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
+- rebuild for NDEBUG and _kde4_libexecdir
+
+* Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
+- add Requires: kdebase-runtime oxygen-icon-theme (#438632)
+
+* Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3
+- drop fix for favicons infinite loop, it's included in new version
+- omit multilib upgrade hacks
+- omit extraneous BR's
+- (re)include oxgygen/scalable icons
+
 * Fri Feb 29 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.2-2
 - fix favicons infinite loop
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Mar 2008 02:17:42 -0000	1.7
+++ sources	22 Apr 2008 19:02:57 -0000	1.8
@@ -1 +1 @@
-19cb1996626417f2bf23e9bcbd7dbf00  kdebase-4.0.2.tar.bz2
+edff276a45b5348e9fa26924519fabbf  kdebase-4.0.3.tar.bz2