January 2012 - openSUSE Commits - openSUSE Mailing Lists

commit libxflaim for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package libxflaim for openSUSE:Factory checked in at 2012-01-31 10:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxflaim (Old) and /work/SRC/openSUSE:Factory/.libxflaim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxflaim", Maintainer is "CSarangthem(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libxflaim/libxflaim.changes 2011-09-23 02:11:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxflaim.new/libxflaim.changes 2012-01-31 10:21:21.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 30 08:15:51 UTC 2012 - mhrusecky(a)suse.cz + +- adding ARM definitions + +------------------------------------------------------------------- +Sun Jan 29 22:00:27 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + +------------------------------------------------------------------- New: ---- libxflaim-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxflaim.spec ++++++ --- /var/tmp/diff_new_pack.8qnTlt/_old 2012-01-31 10:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.8qnTlt/_new 2012-01-31 10:21:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxflaim # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,22 @@ Name: libxflaim -BuildRequires: gcc-c++ java2-devel-packages mono-devel ncurses-devel +BuildRequires: gcc-c++ +BuildRequires: java2-devel-packages +BuildRequires: mono-devel +BuildRequires: ncurses-devel Summary: Embeddable XML Database Engine -Url: http://forge.novell.com/modules/xfmod/project/?flaim -Version: 5.1.1046 -Release: 177 License: LGPL-2.1+ Group: Development/Libraries/C and C++ +Url: http://forge.novell.com/modules/xfmod/project/?flaim +Version: 5.1.1046 +Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch: libxflaim-warning.patch +Patch0: libxflaim-warning.patch Patch1: gcc46-Makefile.patch +Patch2: libxflaim-arm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description XFLAIM is an embeddable cross-platform XML database engine that @@ -42,7 +47,6 @@ Andrew Hodgkinson %package devel -License: LGPL-2.1+ Summary: Embeddable XML Database Engine Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glibc-devel @@ -62,20 +66,20 @@ %prep %setup -q -%patch +%patch0 %if 0%{?suse_version} > 1140 %patch1 %endif +%ifarch %arm +%patch2 +%endif %build -make lib_dir_name=%{_lib} libs csharp +make lib_dir_name=%{_lib} libs csharp %{?_smp_mflags} %install make rpm_build_root=$RPM_BUILD_ROOT install_prefix=%{_prefix} lib_dir_name=%{_lib} install -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig ++++++ libxflaim-arm.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -467,6 +467,14 @@ ifndef host_native_word_size endif ifndef host_native_word_size + ifneq (,$(findstring arm,$(HOSTTYPE))) + host_processor_family = arm + host_native_word_size = 32 + host_supported_word_sizes = 32 + endif +endif + +ifndef host_native_word_size $(error Unable to determine host word size. $(HOSTTYPE)) endif @@ -1060,7 +1068,9 @@ ifdef unix_target ifeq ($(compiler),g++) ccflags += -Wall -Werror -fPIC ifneq ($(target_processor_family),ia64) - ccflags += -m$(target_word_size) + ifneq ($(HOSTTYPE),arm) + ccflags += -m$(target_word_size) + endif endif endif Index: src/xflaimtk.h =================================================================== --- src/xflaimtk.h.orig +++ src/xflaimtk.h @@ -54,6 +54,7 @@ #undef FLM_GNUC #undef FLM_HAS_ASYNC_IO #undef FLM_HAS_DIRECT_IO + #undef FLM_ARM #if defined( __GNUC__) #define FLM_GNUC @@ -149,6 +150,8 @@ #endif #elif defined( __x86__) || defined( __i386__) || defined( __x86_64__) #define FLM_X86 + #elif defined( __arm__) || defined( __thumb__) + #define FLM_ARM #else #error Platform architecture not supported #endif Index: ftk/src/ftk.h =================================================================== --- ftk/src/ftk.h.orig +++ ftk/src/ftk.h @@ -54,6 +54,7 @@ #undef FLM_GNUC #undef FLM_HAS_ASYNC_IO #undef FLM_HAS_DIRECT_IO + #undef FLM_ARM #if defined( __GNUC__) #define FLM_GNUC @@ -149,6 +150,8 @@ #endif #elif defined( __x86__) || defined( __i386__) || defined( __x86_64__) #define FLM_X86 + #elif defined( __arm__) || defined( __thumb__) + #define FLM_ARM #else #error Platform architecture not supported #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libQtWebKit4 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-01-31 10:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libQtWebKit4", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2012-01-06 11:45:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-01-31 10:21:09.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 20 15:34:57 CET 2012 - dmueller(a)suse.de + +- fix build + +------------------------------------------------------------------- New: ---- avoid-rpath.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.O1wuhE/_old 2012-01-31 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.O1wuhE/_new 2012-01-31 10:21:21.000000000 +0100 @@ -43,6 +43,7 @@ Patch10: do-not-force-optimization-level.diff Patch11: reduce-link-optimization.diff Patch12: build-with-glib-231.diff +Patch13: avoid-rpath.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -101,6 +102,7 @@ %patch11 %endif %patch12 +%patch13 %build export QTDIR=%{_prefix} ++++++ avoid-rpath.diff ++++++ Binärdateien a/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png and b/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png sind verschieden. --- Source/WebKit/qt/declarative/declarative.pro +++ Source/WebKit/qt/declarative/declarative.pro @@ -41,21 +41,6 @@ QT += declarative -!CONFIG(standalone_package) { - linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = - } else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR - } -} - SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h --- Source/WebKit2/WebProcess.pro +++ Source/WebKit2/WebProcess.pro @@ -20,19 +20,6 @@ QT += network macx:QT+=xml -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E544 MMP_RULES += pageddata --- Tools/MiniBrowser/qt/MiniBrowser.pro +++ Tools/MiniBrowser/qt/MiniBrowser.pro @@ -33,19 +33,6 @@ QT += network macx:QT+=xml -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E545 MMP_RULES += pageddata --- Tools/QtTestBrowser/QtTestBrowser.pro +++ Tools/QtTestBrowser/QtTestBrowser.pro @@ -39,19 +39,6 @@ PKGCONFIG += fontconfig } -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - symbian { TARGET.UID3 = 0xA000E543 TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location --- Tools/WebKitTestRunner/qt/WebKitTestRunner.pro +++ Tools/WebKitTestRunner/qt/WebKitTestRunner.pro @@ -50,18 +50,5 @@ PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - include(../../../Source/JavaScriptCore/JavaScriptCore.pri) prependJavaScriptCoreLib(../../JavaScriptCore) ++++++ build-with-glib-231.diff ++++++ --- /var/tmp/diff_new_pack.O1wuhE/_old 2012-01-31 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.O1wuhE/_new 2012-01-31 10:21:21.000000000 +0100 @@ -10,26 +10,6 @@ fi # check for libjpeg the way Gtk does it. ---- Source/JavaScriptCore/ChangeLog -+++ Source/JavaScriptCore/ChangeLog -@@ -1,3 +1,17 @@ -+2011-10-12 Gustavo Noronha Silva <gustavo.noronha(a)collabora.co.uk> -+ -+ Fix build with GLib 2.31 -+ https://bugs.webkit.org/show_bug.cgi?id=69840 -+ -+ Reviewed by Martin Robinson. -+ -+ * GNUmakefile.list.am: removed ThreadingGtk.cpp. -+ * wtf/ThreadingPrimitives.h: remove GTK+-specific definitions. -+ * wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations. -+ * wtf/gobject/GOwnPtr.h: ditto. -+ * wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations. -+ * wtf/gtk/ThreadingGtk.cpp: Removed. -+ - 2011-05-23 Thouraya ANDOLSI <thouraya.andolsi(a)st.com> - - Reviewed by Gavin Barraclough. --- Source/JavaScriptCore/GNUmakefile.list.am +++ Source/JavaScriptCore/GNUmakefile.list.am @@ -438,7 +438,6 @@ @@ -112,3 +92,46 @@ #elif PLATFORM(QT) typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; typedef void* PlatformReadWriteLock; // FIXME: Implement. +--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp ++++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp +@@ -34,4 +34,5 @@ + #include <gst/gst.h> + #include <gst/video/video.h> ++#include <wtf/FastAllocBase.h> + + static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink", +@@ -106,6 +107,13 @@ + + sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate); ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ priv->data_cond = WTF::fastNew<GCond>(); ++ g_cond_init(priv->data_cond); ++ priv->buffer_mutex = WTF::fastNew<GMutex>(); ++ g_mutex_init(priv->buffer_mutex); ++#else + priv->data_cond = g_cond_new(); + priv->buffer_mutex = g_mutex_new(); ++#endif + } + +@@ -243,10 +251,20 @@ + + if (priv->data_cond) { ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ g_cond_clear(priv->data_cond); ++ WTF::fastDelete(priv->data_cond); ++#else + g_cond_free(priv->data_cond); ++#endif + priv->data_cond = 0; + } + + if (priv->buffer_mutex) { ++#if GLIB_CHECK_VERSION(2, 31, 0) ++ g_mutex_clear(priv->buffer_mutex); ++ WTF::fastDelete(priv->buffer_mutex); ++#else + g_mutex_free(priv->buffer_mutex); ++#endif + priv->buffer_mutex = 0; + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkdeedu4 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package libkdeedu4 for openSUSE:Factory checked in at 2012-01-31 10:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdeedu4 (Old) and /work/SRC/openSUSE:Factory/.libkdeedu4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdeedu4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdeedu4/libkdeedu4.changes 2011-12-08 12:12:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdeedu4.new/libkdeedu4.changes 2012-01-31 10:21:07.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 20:59:56 CET 2012 - dmueller(a)suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:34:31 CET 2012 - dmueller(a)suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- libkdeedu-4.7.4.tar.bz2 New: ---- libkdeedu-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.SnunSX/_old 2012-01-31 10:21:08.000000000 +0100 +++ /var/tmp/diff_new_pack.SnunSX/_new 2012-01-31 10:21:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkdeedu4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Library for KDE Education Applications License: GPL-2.0+ ++++++ libkdeedu-4.7.4.tar.bz2 -> libkdeedu-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvocdeclension.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvocdeclension.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvocdeclension.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvocdeclension.cpp 2011-12-20 20:13:11.000000000 +0100 @@ -80,6 +80,11 @@ QDomDocument domDoc = parent.ownerDocument(); QDomElement declensionElement = domDoc.createElement( KVTML_DECLENSION ); + QMap<int, KEduVocWordFlags> genders; + genders[0] = KEduVocWordFlag::Masculine; + genders[1] = KEduVocWordFlag::Feminine; + genders[2] = KEduVocWordFlag::Neuter; + QMap<int, KEduVocWordFlags> numbers; numbers[0] = KEduVocWordFlag::Singular; numbers[1] = KEduVocWordFlag::Dual; @@ -95,19 +100,25 @@ cases[6] = KEduVocWordFlag::Vocative; + for ( int gen = 0; gen <= 2; ++gen) + { + QDomElement genderElement = domDoc.createElement( KVTML_GRAMMATICAL_GENDER[gen] ); + for ( int num = 0; num <= 2; ++num) { + QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] ); + for ( int dcase = 0; dcase <= 6; ++dcase ) { + QDomElement caseElement = domDoc.createElement( KVTML_DECLENSION_CASE[dcase] ); + declension(genders[gen] | numbers[num] | cases[dcase]).toKVTML2(caseElement); - for ( int num = 0; num <= 2; ++num) { - QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] ); - for ( int dcase = 0; dcase <= 6; ++dcase ) { - QDomElement caseElement = domDoc.createElement( KVTML_DECLENSION_CASE[dcase] ); - declension(numbers[num] | cases[dcase]).toKVTML2(caseElement); - - if (caseElement.hasChildNodes()) { - numberElement.appendChild(caseElement); + if (caseElement.hasChildNodes()) { + numberElement.appendChild(caseElement); + } + } + if (numberElement.hasChildNodes()) { + genderElement.appendChild(numberElement); } } - if (numberElement.hasChildNodes()) { - declensionElement.appendChild(numberElement); + if (genderElement.hasChildNodes()) { + declensionElement.appendChild(genderElement); } } if (declensionElement.hasChildNodes()) { @@ -124,6 +135,11 @@ } + QMap<int, KEduVocWordFlags> genders; + genders[0] = KEduVocWordFlag::Masculine; + genders[1] = KEduVocWordFlag::Feminine; + genders[2] = KEduVocWordFlag::Neuter; + QMap<int, KEduVocWordFlags> numbers; numbers[0] = KEduVocWordFlag::Singular; numbers[1] = KEduVocWordFlag::Dual; @@ -138,17 +154,24 @@ cases[5] = KEduVocWordFlag::Locative; cases[6] = KEduVocWordFlag::Vocative; + KEduVocDeclension* declension = new KEduVocDeclension; - for ( int num = 0; num <= 2; ++num ) { - QDomElement numberElement = declensionElement.firstChildElement( KVTML_GRAMMATICAL_NUMBER[num] ); - if (!numberElement.isNull()) { - for ( int dcase = 0; dcase <= 6; ++dcase) { - QDomElement caseElement = numberElement.firstChildElement( KVTML_DECLENSION_CASE[dcase] ); - if (!caseElement.isNull()) { - KEduVocText text; - text.fromKVTML2(caseElement); - declension->setDeclension(text, numbers[num] | cases[dcase]); + for ( int gen = 0; gen <= 2; ++gen ) { + QDomElement genderElement = declensionElement.firstChildElement( KVTML_GRAMMATICAL_GENDER[gen] ); + if (!genderElement.isNull()) + { + for ( int num = 0; num <= 2; ++num ) { + QDomElement numberElement = genderElement.firstChildElement( KVTML_GRAMMATICAL_NUMBER[num] ); + if (!numberElement.isNull()) { + for ( int dcase = 0; dcase <= 6; ++dcase) { + QDomElement caseElement = numberElement.firstChildElement( KVTML_DECLENSION_CASE[dcase] ); + if (!caseElement.isNull()) { + KEduVocText text; + text.fromKVTML2(caseElement); + declension->setDeclension(text, genders[gen] | numbers[num] | cases[dcase]); + } + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2reader.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2reader.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2reader.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2reader.cpp 2011-12-02 22:31:45.000000000 +0100 @@ -589,6 +589,9 @@ if ( specialType == KVTML_SPECIALWORDTYPE_NOUN_NEUTRAL ) { wordTypeContainer->setWordType(KEduVocWordFlag::Noun| KEduVocWordFlag::Neuter); } + if ( specialType == KVTML_SPECIALWORDTYPE_CONJUNCTION ) { + wordTypeContainer->setWordType(KEduVocWordFlag::Conjunction); + } } // special type // read entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2writer.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2writer.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2writer.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2writer.cpp 2011-12-02 22:31:45.000000000 +0100 @@ -403,6 +403,9 @@ else if (wordType->wordType().testFlag(KEduVocWordFlag::Adverb)) typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_ADVERB ) ); + else if (wordType->wordType().testFlag(KEduVocWordFlag::Conjunction)) + typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_CONJUNCTION ) ); + // child entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/kvtml2defs.h new/libkdeedu-4.8.0/keduvocdocument/kvtml2defs.h --- old/libkdeedu-4.7.4/keduvocdocument/kvtml2defs.h 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/kvtml2defs.h 2011-12-02 22:31:45.000000000 +0100 @@ -111,6 +111,7 @@ #define KVTML_SPECIALWORDTYPE_VERB "verb" #define KVTML_SPECIALWORDTYPE_ADJECTIVE "adjective" #define KVTML_SPECIALWORDTYPE_ADVERB "adverb" +#define KVTML_SPECIALWORDTYPE_CONJUNCTION "conjunction" #define KVTML_TENSES "tenses" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libical for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package libical for openSUSE:Factory checked in at 2012-01-31 10:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libical (Old) and /work/SRC/openSUSE:Factory/.libical.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libical", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libical/libical.changes 2012-01-26 16:00:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libical.new/libical.changes 2012-01-31 10:21:06.000000000 +0100 @@ -1,0 +2,23 @@ +Sat Jan 28 18:37:35 UTC 2012 - jengelh(a)medozas.de + +- Changed: The -devel subpackage should require the lib package, + not the main one + +------------------------------------------------------------------- +Sat Jan 28 17:40:52 UTC 2012 - tabraham(a)novell.com + +- Update to version 0.48 + + Allow duration specifications containing week along with day and + time. even though this is against the RFC, but apparently we + generate such durations so we need to be able to read them back. + + handle the case of the ATTACH type be explicitly set to URI + + added a lock to avoid threading problems when icaltimezone_parse_zone_tab + is called on multiple threads + + bugfixes + +- removed patches deprecated by this release: + - libical-0.46-fix-race.patch + - libical-0.46-fix-fatal-error-macro-usage.patch + - libical-0.46-fix-endless-loop.patch + +------------------------------------------------------------------- Old: ---- libical-0.46-fix-endless-loop.patch libical-0.46-fix-fatal-error-macro-usage.patch libical-0.46-fix-race.patch libical-0.46.tar.bz2 New: ---- libical-0.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libical.spec ++++++ --- /var/tmp/diff_new_pack.qvTJaT/_old 2012-01-31 10:21:06.000000000 +0100 +++ /var/tmp/diff_new_pack.qvTJaT/_new 2012-01-31 10:21:07.000000000 +0100 @@ -16,27 +16,21 @@ # + Name: libical BuildRequires: db-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-devel Url: http://sourceforge.net/projects/freeassociation/ -Version: 0.46 +Version: 0.48 Release: 0 Summary: An Implementation of Basic iCAL Protocols License: MPL-1.1 or LGPL-2.1 Group: Development/Libraries/C and C++ Source: libical-%{version}.tar.bz2 Source2: baselibs.conf -# libical-0.46-fix-race.patch gber(a)opensuse.org -- Fixes a race in populating builtin timezone components (from upstream svn) -Patch0: libical-0.46-fix-race.patch -# libical-0.46-fix-fatal-error-macro-usage.patch sf#3140405 gber(a)opensuse.org -- Replace broken ICAL_ERRORS_ARE_FATAL preprocessor conditions with the correct check for the macros value -Patch1: libical-0.46-fix-fatal-error-macro-usage.patch -# libical-0.46-fix-endless-loop.patch sf#3177380 gber(a)opensuse.org -- Fixes endless loop in recurrence calculation -Patch2: libical-0.46-fix-endless-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libical0 = %{version} %description Libical is an open source implementation of the IETF's iCalendar @@ -59,7 +53,7 @@ %package devel Summary: An implementation of basic iCAL protocols Group: Development/Libraries/C and C++ -Requires: libical = %{version} +Requires: libical0 = %{version} %description devel Libical is an Open Source implementation of the IETF's iCalendar @@ -70,7 +64,7 @@ %package doc Summary: An Implementation of Basic iCAL Protocols Group: Development/Libraries/C and C++ -Requires: libical = %{version} +Requires: libical0 = %{version} %description doc Libical is an open source implementation of the IETF's iCalendar @@ -80,9 +74,6 @@ %prep %setup -q -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 %build # triger autoreconf since the 0.46 tarball is missing autotools bootstrap files ++++++ libical-0.46.tar.bz2 -> libical-0.48.tar.bz2 ++++++ ++++ 88822 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ktoblzcheck for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package ktoblzcheck for openSUSE:Factory checked in at 2012-01-31 10:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktoblzcheck (Old) and /work/SRC/openSUSE:Factory/.ktoblzcheck.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktoblzcheck", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ktoblzcheck/ktoblzcheck.changes 2011-10-11 16:56:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktoblzcheck.new/ktoblzcheck.changes 2012-01-31 10:21:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 20 20:57:53 UTC 2011 - coolo(a)suse.com + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktoblzcheck.spec ++++++ --- /var/tmp/diff_new_pack.slFbn1/_old 2012-01-31 10:21:05.000000000 +0100 +++ /var/tmp/diff_new_pack.slFbn1/_new 2012-01-31 10:21:05.000000000 +0100 @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: ktoblzcheck Summary: Library to check account numbers and bank codes of German banks documents +License: LGPL-2.1+ +Group: Productivity/Office/Finance Version: 1.36 -Release: 1 +Release: 0 Source: %{name}-%{version}.tar.gz #Source: http://prdownloads.sourceforge.net/ktoblzcheck/%{name}-%{version}.tar.gz -Group: Productivity/Office/Finance -License: LGPL-2.1+ Url: http://ktoblzcheck.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on -BuildRequires: fdupes gcc-c++ pkg-config python +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: python %description KtoBLZCheck is a library to check account numbers and bank codes of @@ -38,15 +37,7 @@ account numbers and bank codes (BLZ) of German banks, and to map bank codes (BLZ) to the clear-text name and location of the bank. - - -Authors: --------- - Fabian Kaiser <fabian(a)openhbci.de> - Christian Stimming <stimming(a)tuhh.de> - %package -n libktoblzcheck1-devel -License: LGPL-2.1+ Summary: Libraries, includes etc to develop with ktoblzcheck library Group: Development/Libraries/C and C++ Requires: libktoblzcheck1 = %{version} @@ -58,30 +49,14 @@ %description -n libktoblzcheck1-devel Libraries and include files to develop with ktoblzcheck library. - - -Authors: --------- - Fabian Kaiser <fabian(a)openhbci.de> - Christian Stimming <stimming(a)tuhh.de> - %package -n libktoblzcheck1 -License: LGPL-2.1+ Summary: Shared Libraries for ktoblzcheck Group: System/Libraries %description -n libktoblzcheck1 Shared Libraries for package ktoblzcheck. - - -Authors: --------- - Fabian Kaiser <fabian(a)openhbci.de> - Christian Stimming <stimming(a)tuhh.de> - %package -n python-ktoblzcheck -License: LGPL-2.1+ Summary: KtoBLZCheck python-bindings Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -91,16 +66,8 @@ %description -n python-ktoblzcheck This package contains the python-bindings for ktoblzcheck. - - -Authors: --------- - Fabian Kaiser <fabian(a)openhbci.de> - Christian Stimming <stimming(a)tuhh.de> - %prep %setup -q -%{?suse_update_config:%{suse_update_config -f}} %build %{configure} \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-01-31 10:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-01-27 15:20:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-01-31 10:21:03.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 30 10:31:47 UTC 2012 - toddrme2178(a)gmail.com + +- Fixed aspell detection + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.ZgbcAA/_old 2012-01-31 10:21:04.000000000 +0100 +++ /var/tmp/diff_new_pack.ZgbcAA/_new 2012-01-31 10:21:04.000000000 +0100 @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: kdelibs4 BuildRequires: OpenEXR-devel BuildRequires: alsa-devel +BuildRequires: aspell BuildRequires: aspell-devel BuildRequires: automoc4 BuildRequires: avahi-compat-mDNSResponder-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-01-31 10:20:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-01-11 15:38:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-01-31 10:21:00.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 20:57:57 CET 2012 - dmueller(a)suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:32:48 CET 2012 - dmueller(a)suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes 2011-12-08 11:51:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes 2012-01-31 10:21:01.000000000 +0100 @@ -1,0 +2,31 @@ +Wed Jan 18 20:57:57 CET 2012 - dmueller(a)suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:32:48 CET 2012 - dmueller(a)suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Mon Dec 12 09:59:29 UTC 2011 - saschpe(a)suse.de + +- Use supplements packageand instead of recommends +- Added split provides + +------------------------------------------------------------------- +Wed Dec 7 14:18:37 UTC 2011 - saschpe(a)suse.de + + +- New subpackages plasma-engine-akonadi and plasma-calendar: + * Removed %kde4_akonadi_requires from base package, otherwise + half of KDE depends on akonadi-runtime. + * Both are recommended by base package + +------------------------------------------------------------------- @@ -12,0 +44,5 @@ +Sat Nov 26 18:44:48 UTC 2011 - ctrippe(a)opensuse.org + +- show window size in characters if resizing terminal (bnc#703594) + +------------------------------------------------------------------- @@ -17,0 +54,6 @@ +Tue Nov 22 20:41:08 UTC 2011 - wstephenson(a)sue.com + +- Fix slow KDE logout/shutdown dialog apearance + (bnc#729823,kde#265405) + +------------------------------------------------------------------- @@ -44,0 +87,5 @@ +Thu Nov 17 13:13:35 UTC 2011 - idonmez(a)suse.com + +- Unbreak signalling remaining time on the battery + +------------------------------------------------------------------- Old: ---- 94b134f9-kworkspace-async-shutdown-dialog.diff bnc703594_geometry_size_chars_terminal.diff kde-workspace-4.7.4.tar.bz2 New: ---- kde-workspace-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: kdebase4-workspace -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -33,8 +32,8 @@ BuildRequires: bluez-devel BuildRequires: fdupes BuildRequires: gpsd-devel -BuildRequires: libQtWebKit-devel BuildRequires: libdbusmenu-qt-devel +BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel BuildRequires: liblazy-devel @@ -42,6 +41,7 @@ BuildRequires: libprison-devel BuildRequires: libqalculate-devel BuildRequires: libqimageblitz-devel +BuildRequires: libQtWebKit-devel BuildRequires: libraw1394-devel BuildRequires: libsmbclient-devel BuildRequires: libusb-devel @@ -96,8 +96,6 @@ Patch201: plasma-notifications-kill-timer.diff Patch202: plasma-disable-networkmanager.diff Patch211: disable-python-support.diff -Patch212: 94b134f9-kworkspace-async-shutdown-dialog.diff -Patch213: bnc703594_geometry_size_chars_terminal.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 @@ -273,7 +271,7 @@ Summary: The Akonadi Plasma engine Group: System/GUI/KDE Supplements: packageand(akonadi-runtime:kdebase4-workspace) -Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_akonadi.so +Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_akonadi.so Requires: %{name} = %{version} %kde4_akonadi_requires %kde4_pimlibs_requires @@ -285,7 +283,7 @@ Summary: The calendar Plasma engine and applet Group: System/GUI/KDE Supplements: packageand(akonadi-runtime:kdebase4-workspace) -Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_calendar.so +Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so Requires: %{name} = %{version} %kde4_akonadi_requires @@ -319,17 +317,15 @@ %patch99 %patch104 %patch106 -%patch107 -p1 +%patch107 %patch108 -%patch123 -p1 +%patch123 %patch124 -p1 ###KDE47: rediff #%%patch125 %patch201 -p1 %patch202 -p1 %patch211 -%patch212 -p1 -%patch213 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build @@ -541,6 +537,7 @@ %{_kde4_libdir}/libkscreensaver.so %{_kde4_libdir}/libprocesscore.so %{_kde4_libdir}/libprocessui.so +%{_kde4_libdir}/libksgrd.so %{_kde4_libdir}/libtaskmanager.so %{_kde4_libdir}/libksignalplotter.so %{_kde4_libdir}/libweather_ion.so @@ -617,7 +614,7 @@ %exclude %{_kde4_libdir}/libkfontinstui.so %exclude %{_kde4_libdir}/libkscreensaver.so %exclude %{_kde4_libdir}/libksignalplotter.so -%exclude %{_kde4_libdir}/libksgrd.so* +%exclude %{_kde4_libdir}/libksgrd.so %exclude %{_kde4_libdir}/libkworkspace.so %exclude %{_kde4_libdir}/liblsofui.so %exclude %{_kde4_libdir}/liboxygenstyle.* ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-kdebase4 -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Python bindings for KDE 4 desktop shell License: GPL-2.0+ @@ -27,6 +28,7 @@ BuildRequires: NetworkManager-devel BuildRequires: bluez-devel BuildRequires: libdbusmenu-qt-devel +BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel BuildRequires: libknotificationitem-devel ++++++ kde-workspace-4.7.4.tar.bz2 -> kde-workspace-4.8.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.7.4.tar.bz2 /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.8.0.tar.bz2 differ: char 11, line 1 ++++++ kdm-cope-with-new-grub.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,25 +1,16 @@ Index: kdm/backend/bootman.c =================================================================== ---- kdm/backend/bootman.c.orig 2011-05-20 22:32:06.000000000 +0200 -+++ kdm/backend/bootman.c 2011-10-21 12:13:29.790475621 +0200 -@@ -81,8 +81,7 @@ getGrub(char ***opts, int *def, int *cur - int len; - char line[1000]; - -- if (!grubSetDefault && !grub && -- !(grubSetDefault = locate("grub-set-default")) && -+ if (!grub && - !(grub = locate("grub"))) - return BO_NOMAN; - -@@ -133,31 +132,10 @@ setGrub(const char *opt, SdRec *sdr) +--- kdm/backend/bootman.c.orig ++++ kdm/backend/bootman.c +@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr) static void commitGrub(void) { - if (sdRec.bmstamp != mTime(GRUB_MENU) && - setGrub(sdRec.osname, &sdRec) != BO_OK) - return; -- ++ char buffer[PATH_MAX]; + - if (grubSetDefault) { - /* The grub-set-default command must be used, which is - * not so good because there is no way of setting an @@ -41,10 +32,8 @@ - pClose(f, &pid); - } - } -+ char buffer[PATH_MAX]; -+ + snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex); + system(buffer); } - #define GRUB2_MENU "/boot/grub/grub.cfg" + static char *grubReboot; ++++++ kdm-fix-generic-greeter.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,14 +1,6 @@ -Subject: Fix broken KDM layout with fingerprint support -From: Lubos Lunak -Patch-upstream: not yet -Bug: bnc#533189 -Relates: kdm-fix-labelcolors.diff, same-pam-generic-classic.diff - -Index: kdebase-workspace-4.6.0/kdm/kfrontend/kgreeter.cpp -=================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/kgreeter.cpp -+++ kdebase-workspace-4.6.0/kdm/kfrontend/kgreeter.cpp -@@ -976,8 +976,6 @@ KThemedGreeter::KThemedGreeter(KdmThemer +--- kdm/kfrontend/kgreeter.cpp ++++ kdm/kfrontend/kgreeter.cpp +@@ -922,8 +922,6 @@ timed_label = themer->findNode("timed-label"); KdmItem *itm; @@ -17,11 +9,9 @@ if ((itm = themer->findNode("language_button"))) // not implemented yet itm->setVisible(false); -Index: kdebase-workspace-4.6.0/kdm/kfrontend/themes/greeter.dtd -=================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themes/greeter.dtd -+++ kdebase-workspace-4.6.0/kdm/kfrontend/themes/greeter.dtd -@@ -19,9 +19,9 @@ Items with these IDs get special treatme +--- kdm/kfrontend/themes/greeter.dtd ++++ kdm/kfrontend/themes/greeter.dtd +@@ -19,9 +19,9 @@ caps-lock-warning | xauth-warning | pam-error | timed-label | login_button | session_button | system_button Items with these IDs might get special treatment by conversation plugins: @@ -33,11 +23,60 @@ --> <!ATTLIST item -Index: kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.cpp -=================================================================== ---- kdebase-workspace-4.6.0.orig/libs/kdm/kgreet_generic.cpp -+++ kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.cpp -@@ -41,24 +41,14 @@ extern KDE_EXPORT KGreeterPluginInfo kgr +--- kdm/kfrontend/themes/oxygen-air/oxygen-air.xml ++++ kdm/kfrontend/themes/oxygen-air/oxygen-air.xml +@@ -26,7 +26,7 @@ + <stock type="welcome-label"/> + </item> + +- <item type="rect" id="user-field"> ++ <item type="rect" id="talker"> + <pos anchor="c" x="50%" y="43%" width="400" height="144"/> + <box orientation="vertical" spacing="0" homogeneous="true"> + +@@ -34,6 +34,7 @@ + <pos anchor="c" x="50%" y="60%" height="box" width="box"/> + <box orientation="horizontal" spacing="10"> + <item type="pixmap"> ++ <show type="!plugin-specific-generic"/> + <normal file="user-entry.png"/> + </item> + <item type="entry" id="user-entry"> +@@ -47,12 +48,31 @@ + <pos anchor="c" x="50%" y="40%" height="box" width="box"/> + <box orientation="horizontal" spacing="10"> + <item type="pixmap"> ++ <show type="!plugin-specific-generic"/> + <normal file="pw-entry.png"/> + </item> + <item type="entry" id="pw-entry"> ++ <show type="!plugin-specific-generic"/> + <pos width="157" height="30"/> + <style frame="true"/> + </item> ++  ++ <item type="label" id="pam-message"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="n" x="50%" y="60%" width="90%" height="30%"/> ++ <text> </text> ++ </item> ++ ++ <item type="label" id="pam-prompt"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="n" x="50%" y="30%" width="90%" height="22"/> ++ <text> </text> ++ </item> ++ ++ <item type="entry" id="user-pw-entry"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="c" x="50%" y="30%" width="90%" height="22"/> ++ </item> + </box> + </item> + +--- libs/kdm/kgreet_generic.cpp ++++ libs/kdm/kgreet_generic.cpp +@@ -41,24 +41,14 @@ static int echoMode; @@ -64,7 +103,7 @@ m_lineEdit(0), fixedUser(_fixedEntity), func(_func), -@@ -66,22 +56,56 @@ KGenericGreeter::KGenericGreeter(KGreete +@@ -66,22 +56,56 @@ exp(-1), running(false) { @@ -128,7 +167,7 @@ } void // virtual -@@ -127,8 +151,7 @@ KGenericGreeter::setEnabled(bool enable) +@@ -127,8 +151,7 @@ { // assert(func == Authenticate && ctx == Shutdown); // XXX this is likely to bear some bogosity @@ -138,7 +177,7 @@ if (enable && m_lineEdit) m_lineEdit->setFocus(); } -@@ -143,9 +166,7 @@ KGenericGreeter::textMessage(const char +@@ -143,9 +166,7 @@ revive(); QString qtext = QString::fromUtf8(text); m_infoMsgs.append(qtext); @@ -149,7 +188,7 @@ return true; } -@@ -169,15 +190,20 @@ KGenericGreeter::textPrompt(const char * +@@ -168,15 +189,20 @@ revive(); else m_infoMsgs.clear(); @@ -176,7 +215,7 @@ if (!m_users.isEmpty()) { KCompletion *userNamesCompletion = new KCompletion; userNamesCompletion->setItems(m_users); -@@ -188,20 +214,18 @@ KGenericGreeter::textPrompt(const char * +@@ -187,20 +213,18 @@ if (!curUser.isEmpty()) { m_lineEdit->setText(curUser); m_lineEdit->selectAll(); @@ -185,7 +224,7 @@ connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotLoginLostFocus())); } connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged())); - connect(m_lineEdit, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); + connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged())); } else { - m_lineEdit = new KDMPasswordEdit; + if (::echoMode == -1) @@ -202,7 +241,7 @@ m_lineEdit->setFocus(); } -@@ -236,7 +260,6 @@ KGenericGreeter::next() +@@ -235,7 +259,6 @@ if (m_lineEdit) { m_lineEdit->setEnabled(false); QString text = m_lineEdit->text(); @@ -210,7 +249,7 @@ handler->gplugReturnText(text.toLocal8Bit(), !m_echo ? KGreeterPluginHandler::IsSecret : -@@ -273,8 +296,7 @@ KGenericGreeter::failed() +@@ -272,8 +295,7 @@ revive(); handler->gplugMsgBox(QMessageBox::Information, text); } else { @@ -220,7 +259,7 @@ } exp = -1; running = false; -@@ -284,12 +306,9 @@ void // virtual +@@ -283,12 +305,9 @@ KGenericGreeter::revive() { // assert(!running); @@ -235,11 +274,9 @@ } void // virtual -Index: kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.h -=================================================================== ---- kdebase-workspace-4.6.0.orig/libs/kdm/kgreet_generic.h -+++ kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.h -@@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi +--- libs/kdm/kgreet_generic.h ++++ libs/kdm/kgreet_generic.h +@@ -33,7 +33,6 @@ #include <QObject> @@ -247,7 +284,7 @@ class QWidget; class KLineEdit; -@@ -68,11 +67,11 @@ class KGenericGreeter : public QObject, +@@ -68,11 +67,11 @@ void slotChanged(); private: @@ -262,56 +299,3 @@ QString fixedUser, curUser; QStringList m_users; Function func; -Index: kdebase-workspace-4.6.0/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml -=================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml -+++ kdebase-workspace-4.6.0/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml -@@ -26,7 +26,7 @@ - <stock type="welcome-label"/> - </item> - -- <item type="rect" id="user-field"> -+ <item type="rect" id="talker"> - <pos anchor="c" x="50%" y="43%" width="400" height="144"/> - <box orientation="vertical" spacing="0" homogeneous="true"> - -@@ -34,6 +34,7 @@ - <pos anchor="c" x="50%" y="60%" height="box" width="box"/> - <box orientation="horizontal" spacing="10"> - <item type="pixmap"> -+ <show type="!plugin-specific-generic"/> - <normal file="user-entry.png"/> - </item> - <item type="entry" id="user-entry"> -@@ -47,12 +48,31 @@ - <pos anchor="c" x="50%" y="40%" height="box" width="box"/> - <box orientation="horizontal" spacing="10"> - <item type="pixmap"> -+ <show type="!plugin-specific-generic"/> - <normal file="pw-entry.png"/> - </item> - <item type="entry" id="pw-entry"> -+ <show type="!plugin-specific-generic"/> - <pos width="157" height="30"/> - <style frame="true"/> - </item> -+  -+ <item type="label" id="pam-message"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="n" x="50%" y="60%" width="90%" height="30%"/> -+ <text> </text> -+ </item> -+ -+ <item type="label" id="pam-prompt"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="n" x="50%" y="30%" width="90%" height="22"/> -+ <text> </text> -+ </item> -+ -+ <item type="entry" id="user-pw-entry"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="c" x="50%" y="30%" width="90%" height="22"/> -+ </item> - </box> - </item> - ++++++ kdm-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,8 +1,6 @@ -Index: kdm/kfrontend/kgreeter.cpp -=================================================================== ---- kdm/kfrontend/kgreeter.cpp.orig -+++ kdm/kfrontend/kgreeter.cpp -@@ -68,20 +68,20 @@ Foundation, Inc., 51 Franklin Street, Fi +--- kdm/kfrontend/kgreeter.cpp 2011-08-18 18:54:29.000000000 +0200 ++++ kdm/kfrontend/kgreeter.cpp 2011-08-19 09:37:02.384127904 +0200 +@@ -68,20 +68,20 @@ class UserListView : public QListWidget { public: @@ -26,7 +24,7 @@ virtual QSize sizeHint() const { if (!cachedSizeHint.isValid()) { -@@ -149,6 +149,7 @@ class UserListView : public QListWidget +@@ -149,6 +149,7 @@ private: bool m_suppressClick; @@ -34,16 +32,16 @@ }; class UserListViewItem : public QListWidgetItem { -@@ -185,7 +186,7 @@ KGreeter::KGreeter(bool framed) +@@ -185,7 +186,7 @@ "PrevUser"); if (_userList) { - userView = new UserListView(this); + userView = new UserListView(framed, this); - connect(userView, SIGNAL(itemClicked(QListWidgetItem *)), - SLOT(slotUserClicked(QListWidgetItem *))); - connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), -@@ -193,8 +194,6 @@ KGreeter::KGreeter(bool framed) + connect(userView, SIGNAL(itemClicked(QListWidgetItem*)), + SLOT(slotUserClicked(QListWidgetItem*))); + connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), +@@ -193,8 +194,6 @@ } if (_userCompletion) userList = new QStringList; @@ -51,8 +49,8 @@ - insertUsers(); sessMenu = new QMenu(this); - connect(sessMenu, SIGNAL(triggered(QAction *)), -@@ -365,8 +364,11 @@ UserList::UserList(char **in) + connect(sessMenu, SIGNAL(triggered(QAction*)), +@@ -365,8 +364,11 @@ } } @@ -65,7 +63,7 @@ { struct passwd *ps; -@@ -392,6 +394,9 @@ KGreeter::insertUsers() +@@ -392,6 +394,9 @@ if (_showUsers == SHOW_ALL) { UserList noUsers(_noUsers); QSet<QString> dupes; @@ -75,7 +73,7 @@ for (setpwent(); (ps = getpwent()) != 0;) { if (*ps->pw_dir && *ps->pw_shell && (ps->pw_uid >= (unsigned)_lowUserId || -@@ -403,10 +408,55 @@ KGreeter::insertUsers() +@@ -403,10 +408,55 @@ QString username(QFile::decodeName(ps->pw_name)); if (!dupes.contains(username)) { dupes.insert(username); @@ -132,7 +130,7 @@ } else { UserList users(_users); if (users.hasGroups()) { -@@ -783,6 +833,9 @@ KStdGreeter::KStdGreeter() +@@ -783,6 +833,9 @@ break; } } @@ -142,7 +140,7 @@ if (userView) { if (clock) inner_box->addWidget(clock, 0, Qt::AlignCenter); -@@ -895,6 +948,7 @@ KThemedGreeter::KThemedGreeter(KdmThemer +@@ -895,6 +948,7 @@ setMouseTracking(true); adjustGeometry(); @@ -150,7 +148,7 @@ themer->setWidget(this); -@@ -983,6 +1037,13 @@ KThemedGreeter::KThemedGreeter(KdmThemer +@@ -983,6 +1037,13 @@ completeMenu(); #endif @@ -164,7 +162,7 @@ if ((system_button = themer->findNode("system_button"))) { if (optMenu) addAction(optMenu->menuAction()); -@@ -1021,6 +1082,8 @@ KThemedGreeter::pluginSetup() +@@ -1021,6 +1082,8 @@ inherited::pluginSetup(); if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_node) { @@ -173,11 +171,9 @@ userlist_node->setWidget(userView); userlist_rect->setVisible(true); } else { -Index: kdm/kfrontend/kgreeter.h -=================================================================== ---- kdm/kfrontend/kgreeter.h.orig -+++ kdm/kfrontend/kgreeter.h -@@ -70,7 +70,7 @@ class KGreeter : public KGDialog, public +--- kdm/kfrontend/kgreeter.h 2011-08-18 18:54:29.000000000 +0200 ++++ kdm/kfrontend/kgreeter.h 2011-08-19 09:36:00.097124913 +0200 +@@ -70,7 +70,7 @@ protected: void insertUser(const QImage &, const QString &, struct passwd *); @@ -186,11 +182,9 @@ void putSession(const QString &, const QString &, bool, const char *); void insertSessions(); virtual void pluginSetup(); -Index: kdm/kfrontend/themer/kdmitem.cpp -=================================================================== ---- kdm/kfrontend/themer/kdmitem.cpp.orig -+++ kdm/kfrontend/themer/kdmitem.cpp -@@ -65,7 +65,6 @@ KdmItem::KdmItem(QObject *parent, const +--- kdm/kfrontend/themer/kdmitem.cpp 2011-08-18 18:54:29.000000000 +0200 ++++ kdm/kfrontend/themer/kdmitem.cpp 2011-08-19 09:36:00.098124907 +0200 +@@ -65,7 +65,6 @@ !modes.split(",", QString::SkipEmptyParts).contains("console")))) { m_visible = false; @@ -198,7 +192,7 @@ } m_showType = sel.attribute("type"); -@@ -78,7 +77,6 @@ KdmItem::KdmItem(QObject *parent, const +@@ -78,7 +77,6 @@ themer()->typeVisible(m_showType) == m_showTypeInvert) { m_visible = false; @@ -206,11 +200,9 @@ } } -Index: kdm/kfrontend/themer/kdmlist.cpp -=================================================================== ---- kdm/kfrontend/themer/kdmlist.cpp.orig -+++ kdm/kfrontend/themer/kdmlist.cpp -@@ -29,8 +29,6 @@ KdmList::KdmList(QObject *parent, const +--- kdm/kfrontend/themer/kdmlist.cpp 2011-08-18 18:54:29.000000000 +0200 ++++ kdm/kfrontend/themer/kdmlist.cpp 2011-08-19 09:36:00.098124907 +0200 +@@ -29,8 +29,6 @@ : KdmItem(parent, node) { itemType = "list"; @@ -219,11 +211,9 @@ // Read RECT TAGS QDomNodeList childList = node.childNodes(); -Index: kdm/kfrontend/themer/kdmthemer.cpp -=================================================================== ---- kdm/kfrontend/themer/kdmthemer.cpp.orig -+++ kdm/kfrontend/themer/kdmthemer.cpp -@@ -223,10 +223,6 @@ KdmThemer::generateItems(KdmItem *parent +--- kdm/kfrontend/themer/kdmthemer.cpp 2011-08-18 18:54:29.000000000 +0200 ++++ kdm/kfrontend/themer/kdmthemer.cpp 2011-08-19 09:38:00.360130704 +0200 +@@ -223,10 +223,6 @@ } else { continue; } @@ -231,6 +221,6 @@ - delete newItem; - continue; - } - connect(newItem, SIGNAL(needUpdate(int, int, int, int)), - SLOT(update(int, int, int, int))); + connect(newItem, SIGNAL(needUpdate(int,int,int,int)), + SLOT(update(int,int,int,int))); connect(newItem, SIGNAL(needPlacement()), ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -123,16 +123,16 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1258,7 +1274,7 @@ Type: enum - Grub/BO_GRUB: Grub boot manager +@@ -1259,7 +1275,7 @@ Type: enum Grub2/BO_GRUB2: Grub2 boot manager + Burg/BO_BURG: Burg boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) -Default: None +Default: Grub User: core User: greeter Instance: #Grub -@@ -1360,7 +1376,7 @@ Type: string +@@ -1361,7 +1377,7 @@ Type: string Default: DEF_SERVER_CMD DDefault: - User: core @@ -141,7 +141,7 @@ Update: upd_servercmd Comment: The command line to start the &X-Server;, without display number and VT spec. -@@ -1373,13 +1389,13 @@ Description: +@@ -1374,13 +1390,13 @@ Description: This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -157,7 +157,7 @@ Comment: & Description: Additional arguments for the &X-Server;s for local sessions. -@@ -1478,6 +1494,8 @@ Type: bool +@@ -1479,6 +1495,8 @@ Type: bool Default: false User: core Instance: #:*/! @@ -166,7 +166,7 @@ Merge: xdm Comment: Restart instead of resetting the local &X-Server; after session exit. -@@ -1552,11 +1570,10 @@ Description: +@@ -1553,11 +1571,10 @@ Description: Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -180,7 +180,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1584,12 +1601,11 @@ Description: +@@ -1585,12 +1602,11 @@ Description: Key: Setup Type: string @@ -195,7 +195,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1605,12 +1621,11 @@ Description: +@@ -1606,12 +1622,11 @@ Description: Key: Startup Type: string @@ -210,7 +210,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1623,12 +1638,11 @@ Description: +@@ -1624,12 +1639,11 @@ Description: Key: Reset Type: string @@ -225,7 +225,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1641,12 +1655,12 @@ Description: +@@ -1642,12 +1656,12 @@ Description: Key: Session Type: string @@ -240,7 +240,7 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1758,10 +1772,11 @@ Description: +@@ -1759,10 +1773,11 @@ Description: Key: AllowRootLogin Type: bool @@ -254,7 +254,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1776,6 +1791,7 @@ User: core +@@ -1777,6 +1792,7 @@ User: core # sensible? Instance: */false Instance: :*/true @@ -262,7 +262,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1787,12 +1803,13 @@ Type: enum +@@ -1788,12 +1804,13 @@ Type: enum None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down All/SHUT_ALL: everybody can shut down the machine @@ -279,7 +279,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1882,6 +1899,7 @@ Type: bool +@@ -1883,6 +1900,7 @@ Type: bool Default: false User: dep Instance: #:0/true @@ -287,7 +287,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1915,7 +1933,7 @@ Default: "" +@@ -1916,7 +1934,7 @@ Default: "" PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -296,7 +296,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1946,10 +1964,10 @@ Description: +@@ -1947,10 +1965,10 @@ Description: Key: SessionsDirs Type: list @@ -309,7 +309,7 @@ Update: upd_sessionsdirs Comment: The directories containing session type definitions in .desktop format, -@@ -2018,7 +2036,7 @@ Description: +@@ -2019,7 +2037,7 @@ Description: Key: UseSessReg Type: bool @@ -318,7 +318,7 @@ User: core Instance: #*/! Comment: -@@ -2064,7 +2082,8 @@ Type: enum +@@ -2065,7 +2083,8 @@ Type: enum Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -328,7 +328,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2280,7 +2299,7 @@ Description: +@@ -2281,7 +2300,7 @@ Description: Key: HiddenUsers Type: list @@ -337,7 +337,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2426,7 +2445,7 @@ Description: +@@ -2427,7 +2446,7 @@ Description: Key: UseBackground Type: bool @@ -346,7 +346,7 @@ User: greeter Instance: #*/! Comment: -@@ -2586,6 +2605,7 @@ Type: bool +@@ -2587,6 +2606,7 @@ Type: bool Default: false User: greeter Instance: :0/true @@ -354,7 +354,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2674,9 +2694,9 @@ Description: +@@ -2675,9 +2695,9 @@ Description: Key: Preloader Type: string @@ -366,7 +366,7 @@ Update: upd_preloader Comment: & Description: -@@ -2686,7 +2706,7 @@ Description: +@@ -2687,7 +2707,7 @@ Description: Key: UseTheme Type: bool @@ -374,15 +374,15 @@ +Default: true User: greeter Instance: */true - Comment: & -@@ -2695,9 +2715,10 @@ Description: + Comment: +@@ -2700,9 +2720,10 @@ Description: Key: Theme Type: string -Default: "" +Default: KDMDATA "/themes/SUSE" User: greeter --Instance: */KDMDATA "/themes/horos" +-Instance: */KDMDATA "/themes/ariya" +Instance: */"" +Update: reset_sec_0_1 Comment: & ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,7 +1,7 @@ Index: plasma/desktop/applets/kickoff/applet/applet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/applet/applet.cpp.orig -+++ plasma/desktop/applets/kickoff/applet/applet.cpp +--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig 2010-11-05 11:47:50.000000000 +0100 ++++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010-11-21 20:47:03.734717865 +0100 @@ -27,6 +27,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QLabel> @@ -10,7 +10,7 @@ // KDE #include <KAuthorized> -@@ -191,7 +192,10 @@ void LauncherApplet::toolTipAboutToShow( +@@ -188,7 +189,10 @@ void LauncherApplet::toolTipAboutToShow( void LauncherApplet::configChanged() { KConfigGroup cg = config(); @@ -22,7 +22,7 @@ constraintsEvent(Plasma::ImmutableConstraint); if (d->launcher) { -@@ -210,7 +214,12 @@ void LauncherApplet::configAccepted() +@@ -207,7 +211,12 @@ void LauncherApplet::configAccepted() d->createLauncher(); KConfigGroup cg = config(); @@ -38,8 +38,8 @@ Index: plasma/desktop/applets/kickoff/core/favoritesmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig -+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp +--- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig 2010-05-27 19:23:43.000000000 +0200 ++++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010-11-21 20:47:03.735718347 +0100 @@ -167,6 +167,11 @@ FavoritesModel::~FavoritesModel() void FavoritesModel::add(const QString& url) @@ -54,8 +54,8 @@ Index: plasma/desktop/applets/kickoff/core/models.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/models.cpp.orig -+++ plasma/desktop/applets/kickoff/core/models.cpp +--- plasma/desktop/applets/kickoff/core/models.cpp.orig 2009-10-15 18:33:38.000000000 +0200 ++++ plasma/desktop/applets/kickoff/core/models.cpp 2010-11-21 20:47:03.735718347 +0100 @@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -79,11 +79,11 @@ } Index: plasma/desktop/applets/kickoff/core/systemmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig -+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp +--- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig 2010-04-15 10:59:33.000000000 +0200 ++++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010-11-21 20:47:03.736717501 +0100 @@ -81,7 +81,7 @@ public: - connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), - q, SLOT(sourceRowsRemoved(QModelIndex, int, int))); + connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), + q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); - topLevelSections << i18n("Applications") + topLevelSections << i18n("Administration") @@ -139,8 +139,8 @@ if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) { Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig -+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig 2010-11-19 11:51:20.000000000 +0100 ++++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-11-21 20:47:03.737717526 +0100 @@ -36,6 +36,7 @@ #include <QtGui/QSpacerItem> #include <QtGui/QListWidget> ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,8 +1,6 @@ -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/applet.cpp -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/applet/applet.cpp -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/applet.cpp -@@ -165,6 +165,8 @@ void LauncherApplet::createConfiguration +--- plasma/desktop/applets/kickoff/applet/applet.cpp ++++ plasma/desktop/applets/kickoff/applet/applet.cpp +@@ -165,6 +165,8 @@ d->ui.iconButton->setIcon(popupIcon()); d->ui.switchOnHoverCheckBox->setChecked(d->launcher->switchTabsOnHover()); d->ui.appsByNameCheckBox->setChecked(d->launcher->showAppsByName()); @@ -11,7 +9,7 @@ connect(d->ui.iconButton, SIGNAL(iconChanged(QString)), parent, SLOT(settingsModified())); connect(d->ui.switchOnHoverCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(d->ui.appsByNameCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); -@@ -204,6 +206,9 @@ void LauncherApplet::configAccepted() +@@ -204,6 +206,9 @@ bool switchTabsOnHover = d->ui.switchOnHoverCheckBox->isChecked(); bool showAppsByName = d->ui.appsByNameCheckBox->isChecked(); @@ -21,7 +19,7 @@ const QString iconname = d->ui.iconButton->icon(); // TODO: should this be moved into Launcher as well? perhaps even the config itself? -@@ -223,6 +228,9 @@ void LauncherApplet::configAccepted() +@@ -223,6 +228,9 @@ d->launcher->setSwitchTabsOnHover(switchTabsOnHover); d->launcher->setShowAppsByName(showAppsByName); @@ -31,10 +29,8 @@ } QList<QAction*> LauncherApplet::contextualActions() -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui +--- plasma/desktop/applets/kickoff/applet/kickoffConfig.ui ++++ plasma/desktop/applets/kickoff/applet/kickoffConfig.ui @@ -54,7 +54,7 @@ </property> </spacer> @@ -91,12 +87,10 @@ </layout> </widget> <customwidgets> -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.cpp -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.cpp -@@ -109,7 +109,10 @@ public: - systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy), +--- plasma/desktop/applets/kickoff/core/applicationmodel.cpp ++++ plasma/desktop/applets/kickoff/core/applicationmodel.cpp +@@ -109,7 +109,10 @@ + systemApplicationPolicy(ApplicationModel::ShowApplicationAndSystemPolicy), primaryNamePolicy(ApplicationModel::GenericNamePrimary), displayOrder(NameAfterDescription), - allowSeparators(_allowSeparators) @@ -107,7 +101,7 @@ { systemApplications = Kickoff::systemApplicationList(); reloadTimer = new QTimer(qq); -@@ -123,6 +126,8 @@ public: +@@ -123,6 +126,8 @@ } void fillNode(const QString &relPath, AppNode *node); @@ -116,7 +110,7 @@ static QHash<QString, QString> iconNameMap(); ApplicationModel *q; -@@ -133,78 +138,117 @@ public: +@@ -133,78 +138,117 @@ QStringList systemApplications; DisplayOrder displayOrder; bool allowSeparators; @@ -280,7 +274,7 @@ } if (systemApplicationPolicy == ApplicationModel::ShowSystemOnlyPolicy && -@@ -214,9 +258,40 @@ void ApplicationModelPrivate::fillNode(c +@@ -214,9 +258,40 @@ continue; } @@ -323,7 +317,7 @@ if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { continue; -@@ -225,41 +300,42 @@ void ApplicationModelPrivate::fillNode(c +@@ -225,41 +300,42 @@ kDebug(250) << "Service group" << serviceGroup->entryPath() << serviceGroup->icon() << serviceGroup->relPath() << serviceGroup->directoryEntryPath(); @@ -381,7 +375,7 @@ } // set the subTitleMandatory field for nodes that do not provide a unique generic -@@ -274,6 +350,20 @@ void ApplicationModelPrivate::fillNode(c +@@ -274,6 +350,20 @@ } } @@ -402,7 +396,7 @@ ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators) : KickoffAbstractModel(parent), d(new ApplicationModelPrivate(this, allowSeparators)) -@@ -283,6 +373,7 @@ ApplicationModel::ApplicationModel(QObje +@@ -283,6 +373,7 @@ QDBusConnection::sessionBus().registerObject("/kickoff", this); dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this, SLOT(reloadMenu())); connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(checkSycocaChange(QStringList))); @@ -410,7 +404,7 @@ } ApplicationModel::~ApplicationModel() -@@ -309,6 +400,32 @@ DisplayOrder ApplicationModel::nameDispl +@@ -309,6 +400,32 @@ return d->displayOrder; } @@ -443,7 +437,7 @@ int ApplicationModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent) -@@ -516,8 +633,9 @@ void ApplicationModel::reloadMenu() +@@ -516,8 +633,9 @@ { delete d->root; d->root = new AppNode(); @@ -454,7 +448,7 @@ } void ApplicationModel::checkSycocaChange(const QStringList &changes) -@@ -537,6 +655,104 @@ ApplicationModel::SystemApplicationPolic +@@ -537,6 +655,104 @@ return d->systemApplicationPolicy; } @@ -559,11 +553,9 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.h -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.h -@@ -114,10 +114,19 @@ public: +--- plasma/desktop/applets/kickoff/core/applicationmodel.h ++++ plasma/desktop/applets/kickoff/core/applicationmodel.h +@@ -114,10 +114,19 @@ virtual QModelIndex parent(const QModelIndex &index) const; virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -583,7 +575,7 @@ private: bool nameAfterDescription(const QModelIndex &index) const; -@@ -125,6 +134,8 @@ private: +@@ -125,6 +134,8 @@ friend class ApplicationModelPrivate; ApplicationModelPrivate *const d; @@ -592,11 +584,9 @@ Q_DISABLE_COPY(ApplicationModel) }; -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp -@@ -114,12 +114,17 @@ public: +--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp ++++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +@@ -114,12 +114,17 @@ MenuLauncherApplet::FormatType formattype; int maxRecentApps; bool showMenuTitles; @@ -614,7 +604,7 @@ QList<QAction*> actions; QAction* switcher; -@@ -137,6 +142,8 @@ public: +@@ -137,6 +142,8 @@ iconButton(0), formatComboBox(0), showMenuTitlesCheckBox(0), @@ -623,7 +613,7 @@ switcher(0), contextMenuFactory(0) {} -@@ -485,7 +492,19 @@ void MenuLauncherApplet::createConfigura +@@ -485,7 +492,19 @@ d->showMenuTitlesCheckBox->setChecked(d->showMenuTitles); grid->addWidget(d->showMenuTitlesCheckBox, 3, 1); @@ -644,7 +634,7 @@ parent->addPage(p, i18n("Options"), "configure"); connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted())); -@@ -551,6 +570,19 @@ void MenuLauncherApplet::configAccepted( +@@ -551,6 +570,19 @@ d->showMenuTitles = showMenuTitles; cg.writeEntry("showMenuTitles", showMenuTitles); } @@ -664,7 +654,7 @@ if (needssaving) { d->updateTooltip(); -@@ -618,6 +650,9 @@ void MenuLauncherApplet::showMenu(bool p +@@ -618,6 +650,9 @@ } appModel->setSystemApplicationPolicy(Kickoff::ApplicationModel::ShowApplicationAndSystemPolicy); @@ -674,7 +664,7 @@ menuview->addModel(appModel, Kickoff::MenuView::None, d->relativePath); if (d->relativePath.isEmpty()) { -@@ -873,6 +908,8 @@ void MenuLauncherApplet::configChanged() +@@ -873,6 +908,8 @@ d->setMaxRecentApps(cg.readEntry("maxRecentApps", qMin(5, Kickoff::RecentApplications::self()->maximum()))); d->showMenuTitles = cg.readEntry("showMenuTitles", false); @@ -683,11 +673,9 @@ d->icon->setIcon(KIcon(cg.readEntry("icon", d->iconname))); -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.cpp -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.cpp -@@ -680,6 +680,30 @@ void Launcher::setShowAppsByName(bool sh +--- plasma/desktop/applets/kickoff/ui/launcher.cpp ++++ plasma/desktop/applets/kickoff/ui/launcher.cpp +@@ -680,6 +680,30 @@ } } @@ -718,7 +706,7 @@ bool Launcher::switchTabsOnHover() const { return d->contentSwitcher->switchTabsOnHover(); -@@ -690,6 +714,16 @@ bool Launcher::showAppsByName() const +@@ -690,6 +714,16 @@ return d->applicationModel->nameDisplayOrder() == Kickoff::NameBeforeDescription; } @@ -735,7 +723,7 @@ void Launcher::setVisibleItemCount(int count) { d->visibleItemCount = count; -@@ -708,6 +742,9 @@ void Launcher::setApplet(Plasma::Applet +@@ -708,6 +742,9 @@ cg = applet->config(); setShowAppsByName(cg.readEntry("ShowAppsByName", showAppsByName())); setVisibleItemCount(cg.readEntry("VisibleItemsCount", visibleItemCount())); @@ -745,11 +733,9 @@ d->applet = applet; d->contextMenuFactory->setApplet(applet); -Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.h -=================================================================== ---- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/ui/launcher.h -+++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.h -@@ -78,6 +78,14 @@ public: +--- plasma/desktop/applets/kickoff/ui/launcher.h ++++ plasma/desktop/applets/kickoff/ui/launcher.h +@@ -78,6 +78,14 @@ we don't display old searches and switch back to the favorite-view. */ void reset(); ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100 @@ -1,28 +1,34 @@ -Index: systemsettings/app/systemsettings.desktop -=================================================================== ---- systemsettings/app/systemsettings.desktop.orig -+++ systemsettings/app/systemsettings.desktop -@@ -5,7 +5,7 @@ Type=Application - X-DocPath=systemsettings/index.html +--- systemsettings/app/systemsettings.desktop 2011-10-20 22:52:49.000000000 +0200 ++++ systemsettings/app/systemsettings.desktop 2011-10-25 18:16:59.288042602 +0200 +@@ -6,7 +6,7 @@ X-KDE-StartupNotify=true + OnlyShowIn=KDE; -GenericName=System Settings +GenericName=Configure Desktop GenericName[ar]=إعدادات النظام GenericName[ast]=Preferencies del sistema GenericName[be@latin]=Systemnyja nałady -@@ -87,7 +87,7 @@ GenericName[x-test]=xxSystem Settingsxx +@@ -88,7 +88,7 @@ GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 -Name=System Settings -+Name=Personal Settings ++Name=Configure Desktop Name[ar]=إعدادات النظام Name[ast]=Preferencies del sistema Name[be]=Сістэмныя настаўленні -@@ -174,4 +174,4 @@ Name[zh_CN]=系统设置 +@@ -175,4 +175,4 @@ Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique -Categories=Qt;KDE;Settings; ++Categories=Qt;KDE;Settings;X-SuSE-core;Qt;Core; +--- systemsettings/app/kdesystemsettings.desktop 2011-10-21 08:08:27.000000000 +0200 ++++ systemsettings/app/kdesystemsettings.desktop 2011-10-21 20:15:04.235935203 +0200 +@@ -45,4 +45,4 @@ + Name[zh_TW]=KDE 系統設定 + + X-DBUS-StartupType=Unique +-Categories=Qt;KDE;Settings; +Categories=Qt;KDE;Settings;X-SuSE-core;Qt;Core; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2012-01-31 10:20:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-runtime", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2012-01-27 15:20:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2012-01-31 10:20:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 30 10:26:20 UTC 2012 - toddrme2178(a)gmail.com + +- Added libqca2-devel buildrequires to allow for remote plasma widgets + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.av7dpZ/_old 2012-01-31 10:20:58.000000000 +0100 +++ /var/tmp/diff_new_pack.av7dpZ/_new 2012-01-31 10:20:58.000000000 +0100 @@ -51,6 +51,7 @@ #!BuildIgnore: kdebase4-runtime BuildRequires: libksuseinstall-devel BuildRequires: libpulse-devel +BuildRequires: libqca2-devel BuildRequires: libqimageblitz-devel BuildRequires: libsmbclient-devel BuildRequires: libssh-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeartwork4 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package kdeartwork4 for openSUSE:Factory checked in at 2012-01-31 10:20:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeartwork4 (Old) and /work/SRC/openSUSE:Factory/.kdeartwork4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdeartwork4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeartwork4/kdeartwork4.changes 2011-12-08 11:29:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeartwork4.new/kdeartwork4.changes 2012-01-31 10:20:52.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 21:03:49 CET 2012 - dmueller(a)suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 18:44:05 CET 2012 - dmueller(a)suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- kdeartwork-4.7.4.tar.bz2 New: ---- kdeartwork-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeartwork4.spec ++++++ --- /var/tmp/diff_new_pack.rj2VMR/_old 2012-01-31 10:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.rj2VMR/_new 2012-01-31 10:20:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdeartwork4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # - Name: kdeartwork4 BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -24,12 +23,12 @@ BuildRequires: libkexiv2-devel BuildRequires: xscreensaver BuildRequires: xscreensaver-data-extra +Summary: Base package for kdeartwork License: No license agreement found in package Group: System/GUI/KDE -Summary: Base package for kdeartwork Url: http://www.kde.org -Version: 4.7.4 -Release: 1 +Version: 4.8.0 +Release: 0 Source0: kdeartwork-%version.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,9 +64,9 @@ # --------- Arch-specific packages --------- # %package decorations +Summary: KDE window decorations License: No license agreement found in package Group: System/GUI/KDE -Summary: KDE window decorations %kde4_runtime_requires Obsoletes: kdeartwork4 < 4.7.1 Provides: kdeartwork4 = 4.7.1 @@ -77,9 +76,9 @@ kdeartwork module. %package screensaver +Summary: KDE screensaver package License: No license agreement found in package Group: System/GUI/KDE -Summary: KDE screensaver package Recommends: xscreensaver-data-extra %kde4_runtime_requires @@ -88,9 +87,9 @@ kdeartwork module. %package styles +Summary: KDE application styles License: No license agreement found in package Group: System/GUI/KDE -Summary: KDE application styles %kde4_runtime_requires %description styles @@ -100,8 +99,8 @@ # --------- NoArch packages --------- # %package -n kdeartwork4-colorschemes -License: GPLv2 ; GPLv2+ ; LGPLv2.1 ; LGPLv2.1+ Summary: KDE color schemes +License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1 ; LGPL-2.1+ Group: System/GUI/KDE BuildArch: noarch %kde4_runtime_requires @@ -110,8 +109,8 @@ This package contains color schemes for applications %package -n kdeartwork4-decorations-aurorae -License: GPLv2 ; GPLv2+ ; LGPLv2.1 ; LGPLv2.1+ Summary: Aurorae window decorations +License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1 ; LGPL-2.1+ Group: System/GUI/KDE BuildArch: noarch %kde4_runtime_requires @@ -120,8 +119,8 @@ This package contains window decorations using the aurorae window decorator %package -n kdeartwork4-desktopthemes -License: GPLv2 ; GPLv2+ ; LGPLv2.1 ; LGPLv2.1+ Summary: KDE desktop themes +License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1 ; LGPL-2.1+ Group: System/GUI/KDE BuildArch: noarch Provides: kde4-plasma-addons:/usr/share/kde4/apps/desktoptheme/Elegance/dialogs/background.svg @@ -132,8 +131,8 @@ module. %package -n kdeartwork4-emoticons -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: KDE emoticons package +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch @@ -141,8 +140,8 @@ This package contains pictures for usage in eg instant messengers. %package -n kdeartwork4-icons -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: KDE icon packages +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch @@ -151,8 +150,8 @@ kdeartwork module. %package -n kdeartwork4-icons-mono -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: Mono KDE icon packages +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch Obsoletes: kdeaccessibility4-icons < %{version} @@ -162,8 +161,8 @@ This package provides monochrome KDE icons for increased accessibility. %package -n kdeartwork4-sounds -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: KDE sound package +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch @@ -172,8 +171,8 @@ module. %package -n kdeartwork4-wallpapers -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: KDE wallpapers package +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch @@ -182,8 +181,8 @@ kdeartwork module. %package -n kdeartwork4-wallpapers-large -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: High-resolution KDE wallpapers package +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch Requires: kdeartwork4-wallpapers = %{version} @@ -193,8 +192,8 @@ originate from the kdeartwork module. %package -n kdeartwork4-wallpapers-weather -License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: KDE weather wallpapers package +License: No license agreement found in package ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE Supplements: plasma-addons BuildArch: noarch @@ -208,8 +207,8 @@ wallpaper plugin. %package -n plasma-theme-aya -License: GPLv2 ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Summary: Theme for Plasma +License: GPL-2.0 ; GPLv2+, LGPLv2+, LGPLv3, BSD3 aggregation Group: System/GUI/KDE BuildArch: noarch ++++++ kdeartwork-4.7.4.tar.bz2 -> kdeartwork-4.8.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kdeartwork4/kdeartwork-4.7.4.tar.bz2 /work/SRC/openSUSE:Factory/.kdeartwork4.new/kdeartwork-4.8.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kalzium for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '12

31 Jan '12

Hello community, here is the log from the commit of package kalzium for openSUSE:Factory checked in at 2012-01-31 10:20:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalzium (Old) and /work/SRC/openSUSE:Factory/.kalzium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kalzium", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kalzium/kalzium.changes 2011-12-08 11:56:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kalzium.new/kalzium.changes 2012-01-31 10:20:42.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 20:56:19 CET 2012 - dmueller(a)suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:31:56 CET 2012 - dmueller(a)suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- kalzium-4.7.4.tar.bz2 New: ---- kalzium-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalzium.spec ++++++ --- /var/tmp/diff_new_pack.D2ZUb7/_old 2012-01-31 10:20:43.000000000 +0100 +++ /var/tmp/diff_new_pack.D2ZUb7/_new 2012-01-31 10:20:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kalzium # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,7 +45,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Periodic Table of Elements License: GPL-2.0+ ++++++ kalzium-4.7.4.tar.bz2 -> kalzium-4.8.0.tar.bz2 ++++++ ++++ 2625 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0