Hello community,
here is the log from the commit of package kdesdk4 for openSUSE:Factory checked
in at 2011-12-01 17:37:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdesdk4 (Old)
and /work/SRC/openSUSE:Factory/.kdesdk4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk4", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdesdk4/kdesdk4.changes 2011-11-14
14:18:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdesdk4.new/kdesdk4.changes 2011-12-01
17:37:51.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 30 12:26:42 UTC 2011 - idoen...@suse.de
+
+- Fix build with Qt 4.8
+
+-------------------------------------------------------------------
New:
----
umbrella-virtual-qobject.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.wi2kt3/_old 2011-12-01 17:37:52.000000000 +0100
+++ /var/tmp/diff_new_pack.wi2kt3/_new 2011-12-01 17:37:52.000000000 +0100
@@ -27,6 +27,7 @@
Source0: kdesdk-%{version}.tar.bz2
Source100: kdesdk4-rpmlintrc
Patch0: desktop-files.diff
+Patch1: umbrella-virtual-qobject.patch
BuildRequires: antlr
BuildRequires: antlr-devel
# for libiberty (used by kmtrace for cp_demangle)
@@ -36,13 +37,13 @@
BuildRequires: flex
BuildRequires: hunspell-devel
BuildRequires: kdebase4-workspace-devel
+BuildRequires: libkde4-devel >= %{version}
BuildRequires: libkdepimlibs4-devel
BuildRequires: libkonq-devel
BuildRequires: libqca2-devel
BuildRequires: oxygen-icon-theme
BuildRequires: strigi
BuildRequires: subversion-devel
-BuildRequires: libkde4-devel >= %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Requires(post): shared-mime-info
@@ -54,6 +55,7 @@
%prep
%setup -q -n kdesdk-%{version}
%patch0
+%patch1 -p1
%build
%ifarch ppc64
@@ -104,10 +106,6 @@
/sbin/ldconfig
%_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || :
-%clean
- rm -rf %{buildroot}
- rm -rf filelists
-
%package scripts
License: GPLv2+
Summary: Scripts for KDE Development
++++++ umbrella-virtual-qobject.patch ++++++
Index: kdesdk-4.7.3/umbrello/umbrello/codegenerators/ownedcodeblock.h
===================================================================
--- kdesdk-4.7.3.orig/umbrello/umbrello/codegenerators/ownedcodeblock.h
+++ kdesdk-4.7.3/umbrello/umbrello/codegenerators/ownedcodeblock.h
@@ -23,7 +23,7 @@ class UMLObject;
* Describes any codeblock which is 'owned' by a UMLobject of some sort and
should
* be in sync with that parent.
*/
-class OwnedCodeBlock : virtual public QObject
+class OwnedCodeBlock : public QObject
{
Q_OBJECT
public:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
