November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libktorrent for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libktorrent for openSUSE:Factory checked in at Mon Nov 22 23:47:58 CET 2010. -------- --- libktorrent/libktorrent.changes 2010-10-18 21:35:13.000000000 +0200 +++ libktorrent/libktorrent.changes 2010-11-22 10:39:14.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 22 09:37:42 UTC 2010 - tittiatcoke(a)gmail.com + +- Update to the latest git snapshot to build KGet with torrent + support in KDE 4.6 Beta 1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libktorrent-1.0.4.tar.bz2 New: ---- libktorrent-git20101122.tar.bz2 libktorrent-po.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libktorrent.spec ++++++ --- /var/tmp/diff_new_pack.TGo5Ks/_old 2010-11-22 23:47:13.000000000 +0100 +++ /var/tmp/diff_new_pack.TGo5Ks/_new 2010-11-22 23:47:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libktorrent (Version 1.0.4) +# spec file for package libktorrent (Version 1.0.60git20101122) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,6 +16,7 @@ # +%define gitver git20101122 Name: libktorrent BuildRequires: fdupes gmp-devel kdebase4-workspace-devel libkdepimlibs4-devel libqca2-devel taglib-devel @@ -23,10 +24,11 @@ License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KTorrent Downloading Library -Version: 1.0.4 +Version: 1.0.60%{gitver} Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{gitver}.tar.bz2 +Source1: %{name}-po.tar.bz2 %description Torrent is a BitTorrent program for KDE. Its main features are: * @@ -47,7 +49,7 @@ License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client Build Environment -Requires: libktorrent2 = %{version} +Requires: libktorrent3 = %{version} %description devel This package includes the necessary files to build KTorrent plugins. @@ -58,13 +60,13 @@ -------- Jois Guisson <jrois.guisson(a)gmail.com> -%package -n libktorrent2 +%package -n libktorrent3 License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client Build Environment Recommends: libktorrent2-lang = %{version} -%description -n libktorrent2 +%description -n libktorrent3 This package includes the ktorrent donwloading library @@ -74,9 +76,12 @@ Jois Guisson <jrois.guisson(a)gmail.com> -%lang_package -n libktorrent2 +%lang_package -n libktorrent3 %prep -%setup -q -n %name-%{version} +%setup -q -n %name -a 1 +echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt +echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt +echo "add_subdirectory( po ) " >> CMakeLists.txt %build %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=true @@ -92,20 +97,20 @@ %kde_post_install %find_lang %name -%pre -n libktorrent2 -p /sbin/ldconfig +%pre -n libktorrent3 -p /sbin/ldconfig -%post -n libktorrent2 -p /sbin/ldconfig +%post -n libktorrent3 -p /sbin/ldconfig -%postun -n libktorrent2 -p /sbin/ldconfig +%postun -n libktorrent3 -p /sbin/ldconfig -%files -n libktorrent2-lang -f build/%name.lang +%files -n libktorrent3-lang -f build/%name.lang %defattr(-,root,root) %dir /usr/share/locale/sr@ijekavian %dir /usr/share/locale/sr@ijekavian/LC_MESSAGES %dir /usr/share/locale/sr@ijekavianlatin %dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES -%files -n libktorrent2 +%files -n libktorrent3 %defattr(-,root,root) %_libdir/libktorrent.so.* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcfitsio0 for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libcfitsio0 for openSUSE:Factory checked in at Mon Nov 22 23:46:54 CET 2010. -------- --- libcfitsio0/libcfitsio0.changes 2010-05-19 15:52:36.000000000 +0200 +++ libcfitsio0/libcfitsio0.changes 2010-05-20 21:59:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 20 19:58:39 UTC 2010 - tittiatcoke(a)gmail.com + +- update to version 3.23.0, see full changelog : + http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/changes.txt + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cfitsio3181.tar.bz2 New: ---- cfitsio3230.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcfitsio0.spec ++++++ --- /var/tmp/diff_new_pack.ja2AMp/_old 2010-11-22 23:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.ja2AMp/_new 2010-11-22 23:44:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libcfitsio0 (Version 3.18.1) +# spec file for package libcfitsio0 (Version 3.23.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,10 +24,10 @@ License: GPLv2 ; Other uncritical OpenSource License Group: Development/Libraries/Other AutoReqProv: on -Version: 3.18.1 -Release: 2 +Version: 3.23.0 +Release: 1 Summary: A FITS File Subroutine Library -Source: cfitsio3181.tar.bz2 +Source: cfitsio3230.tar.bz2 Patch1: cfitsio-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ cfitsio3181.tar.bz2 -> cfitsio3230.tar.bz2 ++++++ ++++ 25849 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Mon Nov 22 23:44:14 CET 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-11-16 14:07:26.000000000 +0100 +++ kdebase4/kdebase4.changes 2010-11-22 09:55:50.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 19 17:10:08 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. +- Removed patches: + * dolphin-search-toolbar-bnc537372.diff (fixed upstream) + * kdebase-4.5.3-konsole-crash.patch (upstream) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dolphin-search-toolbar-bnc537372.diff kdebase-4.5.3-konsole-crash.patch kdebase-4.5.3.tar.bz2 New: ---- kdebase-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.FLua3t/_old 2010-11-22 23:44:01.000000000 +0100 +++ /var/tmp/diff_new_pack.FLua3t/_new 2010-11-22 23:44:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.5.3) +# spec file for package kdebase4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.5.3 -Release: 2 +Version: 4.5.80 +Release: 1 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf Source2: rpmlintrc @@ -50,8 +50,6 @@ Patch: 4_5_BRANCH.diff Patch7: dolphin-go_up.diff Patch8: plasma-new-default-panel.diff -Patch10: dolphin-search-toolbar-bnc537372.diff -Patch11: kdebase-4.5.3-konsole-crash.patch %kde4_runtime_requires Suggests: konsole Suggests: dolphin @@ -83,8 +81,6 @@ %patch7 ###KDE44: rediff? #%patch8 -%patch10 -%patch11 %build %cmake_kde4 -d build ++++++ kdebase-4.5.3.tar.bz2 -> kdebase-4.5.80.tar.bz2 ++++++ ++++ 64533 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4 for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Mon Nov 22 23:42:46 CET 2010. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2010-10-28 22:12:09.000000000 +0200 +++ kdegraphics4/kdegraphics4.changes 2010-11-19 17:18:36.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 19 17:18:32 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_5_BRANCH.diff kdegraphics-4.5.3.tar.bz2 New: ---- 4_6_BRANCH.diff kdegraphics-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.9YV7tY/_old 2010-11-22 23:42:11.000000000 +0100 +++ /var/tmp/diff_new_pack.9YV7tY/_new 2010-11-22 23:42:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.5.3) +# spec file for package kdegraphics4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,12 +36,12 @@ BuildRequires: libepub-devel libpoppler-qt4-devel libqca2-devel libsoprano-devel soprano-backend-redland License: LGPLv2.1+ Group: Productivity/Graphics/Other -Summary: kdegraphics base package +Summary: Base package for kdegraphics apps Url: http://www.kde.org -Version: 4.5.3 +Version: 4.5.80 Release: 1 Source0: kdegraphics-%version.tar.bz2 -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: libksane0 @@ -55,19 +55,13 @@ Suggests: kgamma Provides: kdegraphics4-devel = 3.95.1 Obsoletes: kdegraphics4-devel <= 3.95.1 -Requires: libkdcraw8 = %version -Requires: libkexiv2-8 = %version +Requires: libkdcraw9 = %version +Requires: libkexiv2-9 = %version %description This package suggests the packages which are built from the kdegraphics module. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %prep %setup -q -n kdegraphics-%version %patch0 @@ -117,13 +111,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf filelists -%package -n libkdcraw8 +%package -n libkdcraw9 License: LGPLv2.1+ Group: Development/Libraries/KDE Summary: Shared library interface around dcraw %requires_ge libqt4-x11 -%description -n libkdcraw8 +%description -n libkdcraw9 Libkdcraw is a C++ interface around dcraw binary program used to decode RAW picture files. The library documentation is available on header files. @@ -131,28 +125,21 @@ This library is used by kipi-plugins, digiKam and others kipi host programs. - - -Authors: --------- - Caulier Gilles <caulier dot gilles at gmail dot com> - Marcel Wiesweg <marcel dot wiesweg at gmx dot de> - -%files -n libkdcraw8 -f filelists/libkdcraw +%files -n libkdcraw9 -f filelists/libkdcraw %defattr(-,root,root) %dir %_kde4_appsdir/libkdcraw %dir %_kde4_appsdir/libkdcraw/profiles %exclude %_kde4_libdir/pkgconfig/libkdcraw.pc -%post -n libkdcraw8 -p /sbin/ldconfig +%post -n libkdcraw9 -p /sbin/ldconfig -%postun -n libkdcraw8 -p /sbin/ldconfig +%postun -n libkdcraw9 -p /sbin/ldconfig %package -n libkdcraw-devel License: LGPLv2.1+ Group: Development/Libraries/KDE Summary: Shared library interface around dcraw -Requires: libkdcraw8 = %version +Requires: libkdcraw9 = %version Requires: libkde4-devel %description -n libkdcraw-devel @@ -163,48 +150,32 @@ This library is used by kipi-plugins, digiKam and others kipi host programs. - - -Authors: --------- - Caulier Gilles <caulier dot gilles at gmail dot com> - Marcel Wiesweg <marcel dot wiesweg at gmx dot de> - %files -n libkdcraw-devel -f filelists/libkdcraw.devel %defattr(-,root,root) %doc COPYING COPYING.DOC README %dir /usr/include/libkdcraw %_kde4_libdir/pkgconfig/libkdcraw.pc -%package -n libkipi7 +%package -n libkipi8 License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) Group: Development/Libraries/KDE Summary: KDE Image Plug-In Interface %requires_ge libqt4-x11 -%description -n libkipi7 +%description -n libkipi8 This package provides a generic KDE image plug-in interface used by some KDE image applications. Plug-ins for this interface are in the kipi-plugins package. - - -Authors: --------- - Renchi Raju <renchi at pooh.tam.uiuc.edu> - Gilles Caulier <caulier dot gilles at free.fr> - Jesper K. Pedersen <blackie at kde.org> - Aurelien Gateau <aurelien dot gateau at free.fr> - -%files -n libkipi7 -f filelists/libkipi +%files -n libkipi8 -f filelists/libkipi %defattr(-,root,root) %dir %_kde4_appsdir/kipi %dir %_kde4_appsdir/kipi/data %exclude %_kde4_libdir/pkgconfig/libkipi.pc -%post -n libkipi7 -p /sbin/ldconfig +%post -n libkipi8 -p /sbin/ldconfig -%postun -n libkipi7 -p /sbin/ldconfig +%postun -n libkipi8 -p /sbin/ldconfig %package -n libkipi-devel License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) @@ -212,7 +183,7 @@ Summary: KDE Image Plugin Interface Provides: libkipi6-devel = %version Obsoletes: libkipi6-devel <= 4.1.87 -Requires: libkipi7 = %version +Requires: libkipi8 = %version Requires: libkde4-devel %description -n libkipi-devel @@ -220,38 +191,22 @@ some KDE image applications. Plug-ins for this interface are in the kipi-plugins package. - - -Authors: --------- - Renchi Raju <renchi at pooh.tam.uiuc.edu> - Gilles Caulier <caulier dot gilles at free.fr> - Jesper K. Pedersen <blackie at kde.org> - Aurelien Gateau <aurelien dot gateau at free.fr> - %files -n libkipi-devel -f filelists/libkipi.devel %defattr(-,root,root) %doc COPYING COPYING.DOC README %dir /usr/include/libkipi %_kde4_libdir/pkgconfig/libkipi.pc -%package -n libkexiv2-8 +%package -n libkexiv2-9 License: GPLv2+ Group: Development/Libraries/KDE Summary: Library to manipulate picture meta data -%description -n libkexiv2-8 +%description -n libkexiv2-9 Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata. - - -Authors: --------- - Caulier Gilles <caulier.gilles(a)gmail.com> - Marcel Wiesweg <marcel.wiesweg(a)gmx.de> - -%files -n libkexiv2-8 -f filelists/libkexiv2 +%files -n libkexiv2-9 -f filelists/libkexiv2 %defattr(-,root,root) %exclude %_kde4_libdir/pkgconfig/libkexiv2.pc %dir %_kde4_appsdir/libkexiv2 @@ -261,7 +216,7 @@ License: GPLv2+ Group: Development/Libraries/KDE Summary: Library to manipulate picture meta data -Requires: libkexiv2-8 = %version +Requires: libkexiv2-9 = %version Requires: libkde4-devel %requires_ge libqt4-x11 @@ -269,22 +224,15 @@ Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata. - - -Authors: --------- - Caulier Gilles <caulier.gilles(a)gmail.com> - Marcel Wiesweg <marcel.wiesweg(a)gmx.de> - %files -n libkexiv2-devel -f filelists/libkexiv2.devel %defattr(-,root,root) %doc COPYING COPYING.DOC README %dir /usr/include/libkexiv2 %_kde4_libdir/pkgconfig/libkexiv2.pc -%post -n libkexiv2-8 -p /sbin/ldconfig +%post -n libkexiv2-9 -p /sbin/ldconfig -%postun -n libkexiv2-8 -p /sbin/ldconfig +%postun -n libkexiv2-9 -p /sbin/ldconfig %package -n kcolorchooser License: GPLv2+ @@ -297,12 +245,6 @@ %description -n kcolorchooser This is an color chooser application for KDE. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n kcolorchooser -p /sbin/ldconfig %postun -n kcolorchooser -p /sbin/ldconfig @@ -324,12 +266,6 @@ This package contains a KDE system settings module to configure display gamma. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n kgamma -p /sbin/ldconfig %postun -n kgamma -p /sbin/ldconfig @@ -352,12 +288,6 @@ %description -n kio_kamera This package contains an KIO slave to access digital cameras. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n kio_kamera -p /sbin/ldconfig %postun -n kio_kamera -p /sbin/ldconfig @@ -381,12 +311,6 @@ %description -n kolourpaint Paint program for KDE - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n kolourpaint -p /sbin/ldconfig %postun -n kolourpaint -p /sbin/ldconfig @@ -406,12 +330,6 @@ %description -n kruler A screen ruler for the K Desktop Environment - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n kruler -p /sbin/ldconfig %postun -n kruler -p /sbin/ldconfig @@ -432,12 +350,6 @@ %description -n ksnapshot A screenshot utility for KDE - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n ksnapshot -p /sbin/ldconfig %postun -n ksnapshot -p /sbin/ldconfig @@ -458,12 +370,6 @@ This package contains a library to add scan support to KDE applications. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %post -n libksane0 -p /sbin/ldconfig %postun -n libksane0 -p /sbin/ldconfig @@ -528,6 +434,7 @@ %defattr(-,root,root) %doc COPYING COPYING.DOC README %_kde4_iconsdir/hicolor/*/apps/graphics-viewer-document.* +%exclude %_kde4_libdir/cmake/Okular/ %package -n okular-devel License: GPLv2+ @@ -542,19 +449,13 @@ %description -n okular-devel Document viewing program; supports document in various formats - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %files -n okular-devel -f filelists/okular.devel %defattr(-,root,root) %doc COPYING COPYING.DOC README %dir /usr/include/okular %dir /usr/include/okular/core %dir /usr/include/okular/interfaces - /usr/share/kde4/apps/cmake/modules/FindOkular.cmake +%_kde4_libdir/cmake/Okular/ %package -n gwenview License: GPLv2+ @@ -564,19 +465,13 @@ Obsoletes: kde4-gwenview <= 4.2.90 Recommends: kipi-plugins %kde4_runtime_requires -Requires: libkipi7 = %version +Requires: libkipi8 = %version %description -n gwenview Gwenview is a simple image viewer for KDE. It features a folder tree window and a file list window, providing easy navigation of your file hierarchy. - - -Authors: --------- - Aur�lien G�teau <aurelien.gateau(a)mail.dotcom.fr> - %post -n gwenview -p /sbin/ldconfig %postun -n gwenview -p /sbin/ldconfig ++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++ ++++++ kdegraphics-4.5.3.tar.bz2 -> kdegraphics-4.5.80.tar.bz2 ++++++ ++++ 26264 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package oxygen-icon-theme for openSUSE:Factory checked in at Mon Nov 22 23:41:37 CET 2010. -------- --- KDE/oxygen-icon-theme/oxygen-icon-theme.changes 2010-10-28 22:14:56.000000000 +0200 +++ oxygen-icon-theme/oxygen-icon-theme.changes 2010-11-19 17:20:46.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 19 17:20:40 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- oxygen-icons-4.5.3.tar.bz2 New: ---- oxygen-icons-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.RELVPT/_old 2010-11-22 23:41:15.000000000 +0100 +++ /var/tmp/diff_new_pack.RELVPT/_new 2010-11-22 23:41:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 4.5.3) +# spec file for package oxygen-icon-theme (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 4.5.3 +Version: 4.5.80 Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable ++++++ oxygen-icons-4.5.3.tar.bz2 -> oxygen-icons-4.5.80.tar.bz2 ++++++ KDE/oxygen-icon-theme/oxygen-icons-4.5.3.tar.bz2 oxygen-icon-theme/oxygen-icons-4.5.80.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Mon Nov 22 23:40:58 CET 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-11-15 15:33:07.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-11-22 23:39:02.868639000 +0100 @@ -1,0 +2,16 @@ +Sun Nov 21 20:41:50 UTC 2010 - coolo(a)novell.com + +- disable enable-final for the moment and sort buildrequires + +------------------------------------------------------------------- +Fri Nov 19 17:10:55 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + * Removed patches + kdebase-workspace-4.3.95-ck-shutdown.patch (upstream) + plasma-new-default-panel.diff (upstream) + plasma-plaindesktop.diff (no longer needed) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- 4_5_BRANCH.diff kdebase-workspace-4.3.95-ck-shutdown.patch kdebase-workspace-4.5.3.tar.bz2 plasma-new-default-panel.diff plasma-plaindesktop.diff New: ---- 4_6_BRANCH.diff kdebase-workspace-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.5.3) +# spec file for package kdebase4-wallpapers (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,20 +18,13 @@ Name: kdebase4-wallpapers -BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libknotificationitem-devel -BuildRequires: libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel -BuildRequires: libdbusmenu-qt-devel -%if %suse_version > 1020 -BuildRequires: libusb-devel -%else -BuildRequires: libusb -%endif +BuildRequires: libdbusmenu-qt-devel libkdepimlibs4-devel libqimageblitz-devel License: GPLv2+ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.5.3 -Release: 2 +Version: 4.5.80 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,8 +49,8 @@ %install cd build/wallpapers %makeinstall - %kde_post_install rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers/Air + %kde_post_install %clean rm -rf $RPM_BUILD_ROOT ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.5.3) +# spec file for package kdebase4-workspace (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,25 +18,49 @@ Name: kdebase4-workspace -BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel -BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel pciutils-devel -BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel soprano-backend-redland -BuildRequires: libdbusmenu-qt-devel libkdepimlibs4-devel -BuildRequires: libqalculate-devel +BuildRequires: ConsoleKit-devel +BuildRequires: NetworkManager-devel +BuildRequires: audit-devel +BuildRequires: bluez-devel +BuildRequires: fdupes BuildRequires: google-gadgets-devel -BuildRequires: ConsoleKit-devel fdupes gpsd-devel liblazy liblazy-devel +BuildRequires: gpsd-devel +BuildRequires: libQtWebKit-devel +BuildRequires: libdbusmenu-qt-devel +BuildRequires: libkde4-devel +BuildRequires: libkdepimlibs4-devel +BuildRequires: liblazy-devel +%if %suse_version < 1120 +BuildRequires: libpolkit-qt-devel +%else +BuildRequires: libpolkit-qt-1-devel +%endif +BuildRequires: libqalculate-devel +BuildRequires: libqimageblitz-devel +BuildRequires: libraw1394-devel +BuildRequires: libsmbclient-devel +BuildRequires: libsoprano-devel +BuildRequires: libusb-devel +BuildRequires: libusb-devel +BuildRequires: libxklavier-devel +BuildRequires: pam-devel +BuildRequires: pciutils-devel +BuildRequires: shared-desktop-ontologies-devel +BuildRequires: soprano-backend-redland %ifnarch s390 s390x BuildRequires: libsensors4-devel %endif -%if %suse_version > 1110 +%if %suse_version > 1130 +Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1 +%else Requires: polkit-kde-1 %endif License: GPLv2+ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.5.3 -Release: 2 +Version: 4.5.80 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -44,7 +68,7 @@ Source4: sysconfig.displaymanager-kdm Source91: kdebase4-workspace-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff Patch8: kwin-suse.diff Patch18: startkde.diff Patch60: kdm-audit-log.diff @@ -71,18 +95,14 @@ Patch99: kdm-long-xserver-timeout.diff Patch103: plasma-branding-defaults-corona.diff Patch104: plasma-branding-defaults-applets.diff -# slightly modified copy of standard desktop containment -Patch105: plasma-plaindesktop.diff Patch106: plasma-dashboard-leave.diff Patch107: plasma-kickoff-newly-collapsing.diff Patch108: plasma-panel-resize-hint.diff Patch109: plasma-wallpaper-description.diff -Patch111: plasma-new-default-panel.diff Patch123: kdm-fix-generic-greeter.diff Patch124: kdm-fix-labelcolors.diff Patch125: pam-translate.diff Patch201: plasma-notifications-kill-timer.diff -Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch Patch208: kdm-themer-wallpaper-sizes.diff Patch211: disable-python-support.diff Patch212: build-final.diff @@ -134,17 +154,6 @@ %prep %setup -q -n kdebase-workspace-%version %patch0 -###KDE44: still needed? -#%patch111 -# prepare a patched copy of the default containment -pushd plasma/desktop/containments -cp -a desktop plaindesktop -mv plaindesktop/plasma-containment-desktop.desktop plaindesktop/plasma-containment-plaindesktop.desktop -mv plaindesktop/plasma-containment-desktopdashboard.desktop plaindesktop/plasma-containment-plaindesktopdashboard.desktop -mv plaindesktop/plasma_desktop_containment.kwinrules plaindesktop/plasma_plaindesktop_containment.kwinrules -sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktop.desktop -sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktopdashboard.desktop -popd ###KDE44: rediff! #%patch8 %patch18 @@ -171,7 +180,6 @@ ###KDE45: rediff! #%patch103 %patch104 -%patch105 %patch106 ###KDE45: rediff! #%patch107 @@ -182,7 +190,6 @@ #%patch124 -p1 %patch125 %patch201 -p1 -%patch203 -p1 ###KDE45: rediff! #%patch208 %patch211 @@ -192,7 +199,6 @@ %build EXTRA_FLAGS="-DKDE4_COMMON_PAM_SERVICE=xdm \ -DKDE4_KCHECKPASS_PAM_SERVICE=xdm \ - -DKDE4_ENABLE_FINAL=1 \ -DSYSCONF_INSTALL_DIR=/etc" %cmake_kde4 -d build -- $EXTRA_FLAGS %make_jobs @@ -575,9 +581,6 @@ %_kde4_libdir/libplasmaclock.so %_kde4_libdir/libkephal.so %_kde4_libdir/libplasma-geolocation-interface.so -%if %suse_version < 1120 -%_kde4_libdir/libpolkitkdeprivate.so -%endif %_kde4_libdir/libplasmagenericshell.so %files -n kdm -f filelists/kdm @@ -614,7 +617,9 @@ #positives %doc COPYING COPYING.DOC README %doc %lang(en) %_kde4_htmldir/en/ +%_kde4_mandir/man1/plasmapkg.1.gz %_kde4_mandir/man1/plasmaengineexplorer.1.gz +%_kde4_mandir/man1/plasmoidviewer.1.gz %config %_kde4_sysconfdir/dbus-1/system.d/org.kde.* %_kde4_bindir/* %_kde4_libdir/kconf_update_bin/ @@ -634,18 +639,7 @@ %_datadir/kde4/services/ %_datadir/kde4/servicetypes/ %_datadir/autostart/ -%if %suse_version < 1120 -%_kde4_libdir/libpolkitkdeprivate.so.* -%_kde4_libexecdir/polkit-kde-manager -%_kde4_modulesdir/kcm_pkk_authorization.so -%_kde4_servicesdir/kcm_pkk_authorization.desktop -%lang(en) %doc %_datadir/doc/kde/HTML/en/PolicyKit-kde -%_datadir/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service -%_datadir/dbus-1/services/org.kde.PolicyKit.service -%_datadir/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy -%_datadir/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy -%_datadir/PolicyKit/policy/org.kde.fontinst.policy -%else +%if %suse_version > 1130 %_datadir/polkit-1/ %_datadir/polkit-1/actions/org.kde.fontinst.policy %_datadir/polkit-1/actions/org.kde.kcontrol.kcmclock.policy @@ -681,7 +675,6 @@ %exclude %_kde4_libdir/libprocessui.so %exclude %_kde4_libdir/libksgrd.so %exclude %_kde4_libdir/libkwineffects.so -%exclude %_kde4_libdir/libkwinnvidiahack.so %exclude %_kde4_libdir/libtaskmanager.so %exclude %_kde4_libdir/libweather_ion.so %exclude %_kde4_libdir/libkfontinst.so @@ -691,9 +684,6 @@ %exclude %_kde4_libdir/libplasma-geolocation-interface.so %exclude %_kde4_libdir/libksignalplotter.so %exclude %_kde4_libdir/liboxygenstyle.so -%if %suse_version < 1120 -%exclude %_kde4_libdir/libpolkitkdeprivate.so -%endif %exclude %_kde4_modulesdir/kcm_kdm.so %exclude %_kde4_servicesdir/kdm.desktop %exclude %_kde_config_dir/kdm.knsrc ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.5.3) +# spec file for package python-kdebase4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.5.3 -Release: 2 +Version: 4.5.80 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++ --- KDE/kdebase4-workspace/4_5_BRANCH.diff 2010-08-27 13:43:28.000000000 +0200 +++ kdebase4-workspace/4_6_BRANCH.diff 2010-11-21 20:48:51.000000000 +0100 @@ -1,7 +1,9 @@ package: kdebase-workspace-4.5.0.tar.bz2 kdemod: kdebase/workspace ---- BRANCH_STATUS -+++ BRANCH_STATUS +Index: BRANCH_STATUS +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ BRANCH_STATUS 2010-11-21 20:47:03.389842356 +0100 @@ -0,0 +1,2 @@ +current HEAD: 1163120 +svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace ++++++ build-final.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,8 +1,8 @@ Index: kcontrol/keyboard/xkb_rules.cpp =================================================================== ---- kcontrol/keyboard/xkb_rules.cpp (revision 1147030) -+++ kcontrol/keyboard/xkb_rules.cpp (working copy) -@@ -36,6 +36,7 @@ +--- kcontrol/keyboard/xkb_rules.cpp.orig 2010-08-25 09:44:36.000000000 +0200 ++++ kcontrol/keyboard/xkb_rules.cpp 2010-11-21 20:47:03.852717806 +0100 +@@ -37,6 +37,7 @@ #include <X11/Xatom.h> #include <X11/XKBlib.h> #include <X11/extensions/XKBrules.h> @@ -12,8 +12,8 @@ Index: kcontrol/keyboard/x11_helper.cpp =================================================================== ---- kcontrol/keyboard/x11_helper.cpp (revision 1147030) -+++ kcontrol/keyboard/x11_helper.cpp (working copy) +--- kcontrol/keyboard/x11_helper.cpp.orig 2010-11-05 11:47:09.000000000 +0100 ++++ kcontrol/keyboard/x11_helper.cpp 2010-11-21 20:47:03.852717806 +0100 @@ -27,7 +27,7 @@ #include <X11/Xatom.h> #include <X11/XKBlib.h> @@ -25,8 +25,8 @@ int X11Helper::MAX_GROUP_COUNT = 4; Index: kcontrol/keyboard/xinput_helper.cpp =================================================================== ---- kcontrol/keyboard/xinput_helper.cpp (revision 1147030) -+++ kcontrol/keyboard/xinput_helper.cpp (working copy) +--- kcontrol/keyboard/xinput_helper.cpp.orig 2010-09-01 15:36:50.000000000 +0200 ++++ kcontrol/keyboard/xinput_helper.cpp 2010-11-21 20:47:03.852717806 +0100 @@ -33,6 +33,7 @@ #include "x11_helper.h" ++++++ disable-python-support.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- /suse/dmueller/src/kde/4.4/kdebase/workspace/CMakeLists.txt -+++ CMakeLists.txt -@@ -60,7 +60,6 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig 2010-11-19 14:36:10.000000000 +0100 ++++ CMakeLists.txt 2010-11-21 20:47:03.838728014 +0100 +@@ -69,7 +69,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400") macro_optional_find_package(PyKDE4) ++++++ kde4-migrate.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,8 +1,8 @@ Index: startkde.cmake =================================================================== ---- startkde.cmake.orig -+++ startkde.cmake -@@ -88,6 +88,11 @@ fi +--- startkde.cmake.orig 2010-11-21 20:47:03.402842733 +0100 ++++ startkde.cmake 2010-11-21 20:47:03.667718141 +0100 +@@ -84,6 +84,11 @@ fi kdehome=$HOME/@KDE_DEFAULT_HOME@ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` ++++++ kdebase-workspace-4.5.3.tar.bz2 -> kdebase-workspace-4.5.80.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.5.3.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.80.tar.bz2 differ: char 11, line 1 ++++++ kdm-all-users-nopass.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/backend/client.c -+++ kdm/backend/client.c -@@ -522,6 +522,9 @@ +Index: kdm/backend/client.c +=================================================================== +--- kdm/backend/client.c.orig 2010-11-19 11:51:17.000000000 +0100 ++++ kdm/backend/client.c 2010-11-21 20:47:03.608717921 +0100 +@@ -462,6 +462,9 @@ isNoPassAllowed(struct passwd *pw) if (cursource != PWSRC_MANUAL) return True; @@ -10,9 +12,11 @@ #if defined(USE_PAM) || defined(_AIX) /* Give nss_ldap, etc. a chance to normalize (uppercase) the name. */ if (!(pw = getpwnam(un)) || ---- kdm/config.def -+++ kdm/config.def -@@ -1914,6 +1914,15 @@ +Index: kdm/config.def +=================================================================== +--- kdm/config.def.orig 2010-11-21 20:47:03.509842471 +0100 ++++ kdm/config.def 2010-11-21 20:47:28.785842630 +0100 +@@ -1890,6 +1890,15 @@ Description: (and any other user with UID = 0). <emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>. ++++++ kdm-cope-with-new-grub.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/backend/bootman.c -+++ kdm/backend/bootman.c -@@ -133,31 +133,10 @@ +Index: kdm/backend/bootman.c +=================================================================== +--- kdm/backend/bootman.c.orig 2010-07-06 08:54:30.000000000 +0200 ++++ kdm/backend/bootman.c 2010-11-21 20:47:03.434812097 +0100 +@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr) static void commitGrub(void) { ++++++ kdm-dont-grab-mouse.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/kfrontend/kdm_greet.c -+++ kdm/kfrontend/kdm_greet.c -@@ -458,7 +458,6 @@ +Index: kdm/kfrontend/kdm_greet.c +=================================================================== +--- kdm/kfrontend/kdm_greet.c.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/kdm_greet.c 2010-11-21 20:47:03.694718280 +0100 +@@ -458,7 +458,6 @@ secureInputs(Display *dpy) { debug("secureInputs %s\n", dname); secureKeyboard(dpy); @@ -8,7 +10,7 @@ XSetInputFocus(dpy, None, None, CurrentTime); debug("secureInputs %s done\n", dname); } -@@ -469,7 +468,6 @@ +@@ -469,7 +468,6 @@ unsecureInputs(Display *dpy) debug("unsecureInputs %s\n", dname); XSetInputFocus(dpy, PointerRoot, PointerRoot, CurrentTime); XUngrabKeyboard(dpy, CurrentTime); ++++++ kdm-kdmconf.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/kfrontend/genkdmconf.c -+++ kdm/kfrontend/genkdmconf.c -@@ -1029,6 +1029,26 @@ +Index: kdm/kfrontend/genkdmconf.c +=================================================================== +--- kdm/kfrontend/genkdmconf.c.orig 2010-11-21 20:47:03.510842495 +0100 ++++ kdm/kfrontend/genkdmconf.c 2010-11-21 20:47:03.623718730 +0100 +@@ -1036,6 +1036,26 @@ copyFile(Entry *ce, int mode, int (*proc } static void @@ -27,7 +29,7 @@ doLinkFile(const char *name) { File file; -@@ -1067,9 +1087,10 @@ +@@ -1074,9 +1094,10 @@ writeFile(const char *tname, int mode, c fputs_(cont, f); fclose_(f); addedFile(tname); @@ -39,7 +41,7 @@ static void handleBgCfg(Entry *ce, Section *cs) { -@@ -3136,9 +3157,6 @@ +@@ -3166,9 +3187,6 @@ int main(int argc, char **argv) memcmp(oldkde + olen - sizeof(SHR_CONF) + 1, SHR_CONF, sizeof(SHR_CONF))) { @@ -49,7 +51,7 @@ oldkdepfx = oldkde; } else ASPrintf((char **)&oldkdepfx, -@@ -3250,6 +3268,8 @@ +@@ -3280,6 +3298,8 @@ int main(int argc, char **argv) f = createFile("kdmrc", kdmrcmode); writeKdmrc(f); fclose_(f); @@ -58,7 +60,7 @@ f = createFile("README", 0644); fprintf_(f, -@@ -3298,6 +3318,8 @@ +@@ -3328,6 +3348,8 @@ int main(int argc, char **argv) "\nTry 'genkdmconf --help' if you want to generate another configuration.\n" "\nYou may delete this README.\n"); fclose_(f); ++++++ kdm-long-xserver-timeout.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -7,9 +7,9 @@ Index: kdm/config.def =================================================================== ---- kdm/config.def.orig -+++ kdm/config.def -@@ -1346,7 +1346,7 @@ Description: +--- kdm/config.def.orig 2010-11-21 20:47:03.609717629 +0100 ++++ kdm/config.def 2010-11-21 20:47:03.708718667 +0100 +@@ -1359,7 +1359,7 @@ Description: Key: ServerTimeout Type: int ++++++ kdm-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/kfrontend/kgreeter.cpp -+++ kdm/kfrontend/kgreeter.cpp -@@ -67,20 +67,20 @@ +Index: kdm/kfrontend/kgreeter.cpp +=================================================================== +--- kdm/kfrontend/kgreeter.cpp.orig 2010-08-05 18:55:46.000000000 +0200 ++++ kdm/kfrontend/kgreeter.cpp 2010-11-21 20:47:03.567842759 +0100 +@@ -68,20 +68,20 @@ Foundation, Inc., 51 Franklin Street, Fi class UserListView : public QListWidget { public: @@ -24,7 +26,7 @@ virtual QSize sizeHint() const { if (!cachedSizeHint.isValid()) { -@@ -148,6 +148,7 @@ +@@ -149,6 +149,7 @@ class UserListView : public QListWidget private: bool m_suppressClick; @@ -32,7 +34,7 @@ }; class UserListViewItem : public QListWidgetItem { -@@ -184,7 +185,7 @@ +@@ -185,7 +186,7 @@ KGreeter::KGreeter(bool framed) "PrevUser"); if (_userList) { @@ -41,7 +43,7 @@ connect(userView, SIGNAL(itemClicked(QListWidgetItem *)), SLOT(slotUserClicked(QListWidgetItem *))); connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), -@@ -192,8 +193,6 @@ +@@ -193,8 +194,6 @@ KGreeter::KGreeter(bool framed) } if (_userCompletion) userList = new QStringList; @@ -50,7 +52,7 @@ sessMenu = new QMenu(this); connect(sessMenu, SIGNAL(triggered(QAction *)), -@@ -364,8 +363,11 @@ +@@ -365,8 +364,11 @@ UserList::UserList(char **in) } } @@ -63,7 +65,7 @@ { struct passwd *ps; -@@ -391,6 +393,9 @@ +@@ -392,6 +394,9 @@ KGreeter::insertUsers() if (_showUsers == SHOW_ALL) { UserList noUsers(_noUsers); QSet<QString> dupes; @@ -73,7 +75,7 @@ for (setpwent(); (ps = getpwent()) != 0;) { if (*ps->pw_dir && *ps->pw_shell && (ps->pw_uid >= (unsigned)_lowUserId || -@@ -402,10 +407,55 @@ +@@ -403,10 +408,55 @@ KGreeter::insertUsers() QString username(QFile::decodeName(ps->pw_name)); if (!dupes.contains(username)) { dupes.insert(username); @@ -130,7 +132,7 @@ } else { UserList users(_users); if (users.hasGroups()) { -@@ -782,6 +832,9 @@ +@@ -783,6 +833,9 @@ KStdGreeter::KStdGreeter() break; } } @@ -140,7 +142,7 @@ if (userView) { if (clock) inner_box->addWidget(clock, 0, Qt::AlignCenter); -@@ -894,6 +947,7 @@ +@@ -895,6 +948,7 @@ KThemedGreeter::KThemedGreeter(KdmThemer setMouseTracking(true); adjustGeometry(); @@ -148,7 +150,7 @@ themer->setWidget(this); -@@ -982,6 +1036,13 @@ +@@ -983,6 +1037,13 @@ KThemedGreeter::KThemedGreeter(KdmThemer completeMenu(); #endif @@ -162,7 +164,7 @@ if ((system_button = themer->findNode("system_button"))) { if (optMenu) addAction(optMenu->menuAction()); -@@ -1020,6 +1081,8 @@ +@@ -1021,6 +1082,8 @@ KThemedGreeter::pluginSetup() inherited::pluginSetup(); if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_node) { @@ -171,9 +173,11 @@ userlist_node->setWidget(userView); userlist_rect->setVisible(true); } else { ---- kdm/kfrontend/kgreeter.h -+++ kdm/kfrontend/kgreeter.h -@@ -70,7 +70,7 @@ +Index: kdm/kfrontend/kgreeter.h +=================================================================== +--- kdm/kfrontend/kgreeter.h.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/kgreeter.h 2010-11-21 20:47:03.567842759 +0100 +@@ -70,7 +70,7 @@ class KGreeter : public KGDialog, public protected: void insertUser(const QImage &, const QString &, struct passwd *); @@ -182,9 +186,11 @@ void putSession(const QString &, const QString &, bool, const char *); void insertSessions(); virtual void pluginSetup(); ---- kdm/kfrontend/themer/kdmitem.cpp -+++ kdm/kfrontend/themer/kdmitem.cpp -@@ -65,7 +65,6 @@ +Index: kdm/kfrontend/themer/kdmitem.cpp +=================================================================== +--- kdm/kfrontend/themer/kdmitem.cpp.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/themer/kdmitem.cpp 2010-11-21 20:47:03.567842759 +0100 +@@ -65,7 +65,6 @@ KdmItem::KdmItem(QObject *parent, const !modes.split(",", QString::SkipEmptyParts).contains("console")))) { m_visible = false; @@ -192,7 +198,7 @@ } m_showType = sel.attribute("type"); -@@ -78,7 +77,6 @@ +@@ -78,7 +77,6 @@ KdmItem::KdmItem(QObject *parent, const themer()->typeVisible(m_showType) == m_showTypeInvert) { m_visible = false; @@ -200,9 +206,11 @@ } } ---- kdm/kfrontend/themer/kdmlist.cpp -+++ kdm/kfrontend/themer/kdmlist.cpp -@@ -29,8 +29,6 @@ +Index: kdm/kfrontend/themer/kdmlist.cpp +=================================================================== +--- kdm/kfrontend/themer/kdmlist.cpp.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/themer/kdmlist.cpp 2010-11-21 20:47:03.568842387 +0100 +@@ -29,8 +29,6 @@ KdmList::KdmList(QObject *parent, const : KdmItem(parent, node) { itemType = "list"; @@ -211,9 +219,11 @@ // Read RECT TAGS QDomNodeList childList = node.childNodes(); ---- kdm/kfrontend/themer/kdmthemer.cpp -+++ kdm/kfrontend/themer/kdmthemer.cpp -@@ -224,10 +224,6 @@ +Index: kdm/kfrontend/themer/kdmthemer.cpp +=================================================================== +--- kdm/kfrontend/themer/kdmthemer.cpp.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/themer/kdmthemer.cpp 2010-11-21 20:47:03.568842387 +0100 +@@ -224,10 +224,6 @@ KdmThemer::generateItems(KdmItem *parent } else { continue; } ++++++ kdm-relaxed-auth.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/backend/auth.c -+++ kdm/backend/auth.c -@@ -610,6 +610,7 @@ +Index: kdm/backend/auth.c +=================================================================== +--- kdm/backend/auth.c.orig 2010-07-06 08:54:30.000000000 +0200 ++++ kdm/backend/auth.c 2010-11-21 20:47:03.478727336 +0100 +@@ -610,6 +610,7 @@ defineLocal(FILE *file, Xauth *auth, int writeAddr(FamilyLocal, strlen(name.nodename), (CARD8 *)name.nodename, file, auth, ok); #endif @@ -8,7 +10,7 @@ /* * For HP-UX, HP's Xlib expects a fully-qualified domain name, which -@@ -1277,6 +1278,9 @@ +@@ -1277,6 +1278,9 @@ setUserAuthorization(struct display *d) userEnviron = setEnv(userEnviron, "XAUTHORITY", envname); systemEnviron = setEnv(systemEnviron, "XAUTHORITY", envname); } ++++++ kdm-remove-duplicated-sessions.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,16 +1,8 @@ Index: kdm/kfrontend/sessions/CMakeLists.txt =================================================================== ---- kdm/kfrontend/sessions/CMakeLists.txt.orig -+++ kdm/kfrontend/sessions/CMakeLists.txt -@@ -2,7 +2,6 @@ configure_file(kde.desktop.cmake ${CMAKE - configure_file(kde-safe.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop) - - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/kde.desktop - ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop - gnome.desktop - 9wm.desktop -@@ -12,19 +11,14 @@ install(FILES +--- kdm/kfrontend/sessions/CMakeLists.txt.orig 2010-11-05 11:47:45.000000000 +0100 ++++ kdm/kfrontend/sessions/CMakeLists.txt 2010-11-21 20:47:03.551842096 +0100 +@@ -12,19 +12,14 @@ install(FILES amaterus.desktop amiwm.desktop asclassic.desktop @@ -30,7 +22,7 @@ ion.desktop larswm.desktop lwm.desktop -@@ -47,9 +41,6 @@ install(FILES +@@ -47,9 +42,6 @@ install(FILES w9wm.desktop waimea.desktop wm2.desktop ++++++ kdm-suspend-hal.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/backend/ctrl.c -+++ kdm/backend/ctrl.c -@@ -499,6 +499,10 @@ +Index: kdm/backend/ctrl.c +=================================================================== +--- kdm/backend/ctrl.c.orig 2010-08-05 18:55:40.000000000 +0200 ++++ kdm/backend/ctrl.c 2010-11-21 20:47:03.492842634 +0100 +@@ -499,6 +499,10 @@ processCtrl(const char *string, int len, Reply("nuke\t"); } } @@ -11,9 +13,11 @@ if ((d->displayType & d_location) == dLocal && anyReserveDisplays()) { ---- kdm/backend/greet.h -+++ kdm/backend/greet.h -@@ -150,6 +150,7 @@ +Index: kdm/backend/greet.h +=================================================================== +--- kdm/backend/greet.h.orig 2010-07-06 08:54:30.000000000 +0200 ++++ kdm/backend/greet.h 2010-11-21 20:47:03.492842634 +0100 +@@ -150,6 +150,7 @@ from the copyright holder. # define SHUT_REBOOT 1 /* how */ # define SHUT_HALT 2 # define SHUT_CONSOLE -1 /* pseudo-code */ @@ -21,9 +25,11 @@ # define SHUT_SCHEDULE 0 /* when; config only */ # define SHUT_TRYNOW 1 # define SHUT_FORCENOW 2 ---- kdm/config.def -+++ kdm/config.def -@@ -1818,6 +1818,19 @@ +Index: kdm/config.def +=================================================================== +--- kdm/config.def.orig 2010-10-12 15:07:22.000000000 +0200 ++++ kdm/config.def 2010-11-21 20:47:31.380718279 +0100 +@@ -1794,6 +1794,19 @@ Description: Who is allowed to shut down the system. This applies both to the greeter and to the command sockets. @@ -43,9 +49,11 @@ Key: AllowSdForceNow Type: enum None: no forced shutdown is allowed at all ---- kdm/kfrontend/CMakeLists.txt -+++ kdm/kfrontend/CMakeLists.txt -@@ -6,10 +6,14 @@ +Index: kdm/kfrontend/CMakeLists.txt +=================================================================== +--- kdm/kfrontend/CMakeLists.txt.orig 2010-10-27 21:55:03.000000000 +0200 ++++ kdm/kfrontend/CMakeLists.txt 2010-11-21 20:47:31.380718279 +0100 +@@ -4,10 +4,14 @@ add_subdirectory( themes ) add_subdirectory( pics ) add_subdirectory( sessions ) @@ -53,14 +61,14 @@ +PKG_CHECK_MODULES(LAZY lazy) + include_directories( - ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background + ${CMAKE_CURRENT_SOURCE_DIR}/../kcm/background ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm ${QIMAGEBLITZ_INCLUDES} + ${LAZY_INCLUDE_DIRS} ) set(kdmthemer_SRCS -@@ -72,7 +76,7 @@ +@@ -70,7 +74,7 @@ endif (WITH_KDM_XCONSOLE) macro_add_file_dependencies(kdm_greet.h ${confci}) kde4_add_executable(kdm_greet ${kdm_greet_SRCS}) @@ -69,9 +77,11 @@ if (X11_XTest_FOUND) target_link_libraries(kdm_greet ${X11_XTest_LIB}) endif (X11_XTest_FOUND) ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp -@@ -22,6 +22,7 @@ +Index: kdm/kfrontend/kdmshutdown.cpp +=================================================================== +--- kdm/kfrontend/kdmshutdown.cpp.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/kdmshutdown.cpp 2010-11-21 20:47:03.494842502 +0100 +@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi */ @@ -79,7 +89,7 @@ #include "kdmshutdown.h" #include "kdm_greet.h" #include "utils.h" -@@ -33,6 +34,7 @@ +@@ -33,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <kstandarddirs.h> #include <KStandardGuiItem> #include <kuser.h> @@ -87,7 +97,7 @@ #include <QAction> #include <QApplication> -@@ -55,6 +57,10 @@ +@@ -55,6 +57,10 @@ Foundation, Inc., 51 Franklin Street, Fi int KDMShutdownBase::curPlugin = -1; PluginList KDMShutdownBase::pluginList; @@ -98,7 +108,7 @@ KDMShutdownBase::KDMShutdownBase(int _uid, QWidget *_parent) : inherited(_parent) , box(new QVBoxLayout(this)) -@@ -65,6 +71,7 @@ +@@ -65,6 +71,7 @@ KDMShutdownBase::KDMShutdownBase(int _ui , doesNuke(false) , mayOk(true) , maySched(false) @@ -106,7 +116,7 @@ , rootlab(0) , verify(0) , needRoot(-1) -@@ -85,6 +92,7 @@ +@@ -85,6 +92,7 @@ KDMShutdownBase::complete(QWidget *prevW if (uid && ((willShut && _allowShutdown == SHUT_ROOT) || @@ -114,7 +124,7 @@ (mayNuke && _allowNuke == SHUT_ROOT))) { rootlab = new QLabel(i18n("Root authorization required."), this); -@@ -171,6 +179,7 @@ +@@ -171,6 +179,7 @@ KDMShutdownBase::updateNeedRoot() { int nNeedRoot = uid && (((willShut && _allowShutdown == SHUT_ROOT) || @@ -122,7 +132,7 @@ (_allowNuke == SHUT_ROOT && doesNuke))); if (verify && nNeedRoot != needRoot) { if (needRoot == 1) -@@ -488,6 +497,63 @@ +@@ -488,6 +497,63 @@ KDMSlimShutdown::KDMSlimShutdown(QWidget buttonlay->addWidget(btnReboot); connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot())); @@ -186,7 +196,7 @@ int dummy, cur; if (getBootOptions(&targetList, &dummy, &cur)) { QMenu *targets = new QMenu(this); -@@ -523,6 +589,65 @@ +@@ -523,6 +589,65 @@ KDMSlimShutdown::KDMSlimShutdown(QWidget buttonlay->addSpacing(KDialog::spacingHint()); } @@ -252,9 +262,11 @@ void KDMSlimShutdown::slotSched() { ---- kdm/kfrontend/kdmshutdown.h -+++ kdm/kfrontend/kdmshutdown.h -@@ -67,7 +67,7 @@ +Index: kdm/kfrontend/kdmshutdown.h +=================================================================== +--- kdm/kfrontend/kdmshutdown.h.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/kdmshutdown.h 2010-11-21 20:47:03.494842502 +0100 +@@ -67,7 +67,7 @@ class KDMShutdownBase : public FDialog, #else static const bool willShut = true; #endif @@ -263,7 +275,7 @@ private Q_SLOTS: void slotSched(); -@@ -118,7 +118,6 @@ +@@ -118,7 +118,6 @@ class KDMShutdown : public KDMShutdownBa QComboBox *targets; int oldTarget; int sch_st, sch_to; @@ -271,7 +283,7 @@ }; class KDMRadioButton : public QRadioButton { -@@ -161,11 +160,15 @@ +@@ -161,11 +160,15 @@ class KDMSlimShutdown : public FDialog { void slotReboot(); void slotReboot(QAction *); void slotSched(); ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/config.def.sav 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2010-08-31 14:24:02.948540554 +0200 -@@ -166,6 +166,9 @@ +Index: kdm/config.def +=================================================================== +--- kdm/config.def.orig 2010-11-21 20:47:03.493842572 +0100 ++++ kdm/config.def 2010-11-21 20:47:30.377718076 +0100 +@@ -168,6 +168,9 @@ Core config for 1st local display [X-:0-Core] @@ -69,7 +71,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_list) -@@ -1062,9 +1080,10 @@ Description: +@@ -1073,9 +1091,10 @@ Description: Key: Enable Type: bool @@ -81,7 +83,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1085,7 +1104,7 @@ Description: +@@ -1096,7 +1115,7 @@ Description: Key: KeyFile Type: string @@ -90,7 +92,7 @@ User: core Instance: #KDMCONF "/kdmkeys" Update: cp_keyfile -@@ -1101,11 +1120,10 @@ Description: +@@ -1112,11 +1131,10 @@ Description: Key: Xaccess Type: string # differs from xdm @@ -105,7 +107,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1163,13 +1181,11 @@ Description: +@@ -1174,13 +1192,11 @@ Description: Key: Willing Type: string @@ -121,7 +123,7 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1243,7 +1259,7 @@ Type: enum +@@ -1254,7 +1270,7 @@ Type: enum None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -130,7 +132,7 @@ User: core User: greeter Instance: #Grub -@@ -1345,7 +1361,7 @@ Type: string +@@ -1356,7 +1372,7 @@ Type: string Default: DEF_SERVER_CMD DDefault: - User: core @@ -139,7 +141,7 @@ Update: upd_servercmd Comment: The command line to start the &X-Server;, without display number and VT spec. -@@ -1355,13 +1371,13 @@ Description: +@@ -1369,13 +1385,13 @@ Description: This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -155,7 +157,7 @@ Comment: & Description: Additional arguments for the &X-Server;s for local sessions. -@@ -1451,6 +1467,8 @@ Type: bool +@@ -1474,6 +1490,8 @@ Type: bool Default: false User: core Instance: #:*/! @@ -164,7 +166,7 @@ Merge: xdm Comment: Restart instead of resetting the local &X-Server; after session exit. -@@ -1549,11 +1567,10 @@ Description: +@@ -1548,11 +1566,10 @@ Description: Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -178,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 -@@ -1581,12 +1598,11 @@ Description: +@@ -1580,12 +1597,11 @@ Description: Key: Setup Type: string @@ -193,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. -@@ -1602,12 +1618,11 @@ Description: +@@ -1601,12 +1617,11 @@ Description: Key: Startup Type: string @@ -208,7 +210,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1620,12 +1635,11 @@ Description: +@@ -1619,12 +1634,11 @@ Description: Key: Reset Type: string @@ -223,7 +225,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1638,12 +1652,12 @@ Description: +@@ -1637,12 +1651,12 @@ Description: Key: Session Type: string @@ -238,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 -@@ -1755,10 +1769,11 @@ Description: +@@ -1754,10 +1768,11 @@ Description: Key: AllowRootLogin Type: bool @@ -252,7 +254,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1773,6 +1788,7 @@ User: core +@@ -1772,6 +1787,7 @@ User: core # sensible? Instance: */false Instance: :*/true @@ -260,7 +262,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1784,12 +1800,13 @@ Type: enum +@@ -1783,12 +1799,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 @@ -277,7 +279,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1866,6 +1883,7 @@ Type: bool +@@ -1878,6 +1895,7 @@ Type: bool Default: false User: dep Instance: #:0/true @@ -285,7 +287,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1899,7 +1917,7 @@ Default: "" +@@ -1911,7 +1929,7 @@ Default: "" PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -294,7 +296,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1930,10 +1948,10 @@ Description: +@@ -1942,10 +1960,10 @@ Description: Key: SessionsDirs Type: list @@ -307,7 +309,7 @@ Update: upd_sessionsdirs Comment: The directories containing session type definitions in .desktop format, -@@ -2002,7 +2020,7 @@ Description: +@@ -2014,7 +2032,7 @@ Description: Key: UseSessReg Type: bool @@ -316,7 +318,7 @@ User: core Instance: #*/! Comment: -@@ -2048,7 +2066,8 @@ Type: enum +@@ -2060,7 +2078,8 @@ Type: enum Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -326,7 +328,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2264,7 +2283,7 @@ Description: +@@ -2276,7 +2295,7 @@ Description: Key: HiddenUsers Type: list @@ -335,7 +337,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2408,7 +2427,7 @@ Description: +@@ -2422,7 +2441,7 @@ Description: Key: UseBackground Type: bool @@ -344,7 +346,7 @@ User: greeter Instance: #*/! Comment: -@@ -2546,6 +2565,7 @@ Type: bool +@@ -2582,6 +2601,7 @@ Type: bool Default: false User: greeter Instance: :0/true @@ -352,7 +354,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2634,9 +2654,9 @@ Description: +@@ -2670,9 +2690,9 @@ Description: Key: Preloader Type: string @@ -364,7 +366,7 @@ Update: upd_preloader Comment: & Description: -@@ -2646,7 +2666,7 @@ Description: +@@ -2682,7 +2702,7 @@ Description: Key: UseTheme Type: bool @@ -373,7 +375,7 @@ User: greeter Instance: */true Comment: & -@@ -2655,9 +2675,10 @@ Description: +@@ -2691,9 +2711,10 @@ Description: Key: Theme Type: string @@ -386,17 +388,21 @@ Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML ---- kdm/kfrontend/CMakeLists.txt -+++ kdm/kfrontend/CMakeLists.txt -@@ -120,3 +120,5 @@ +Index: kdm/kfrontend/CMakeLists.txt +=================================================================== +--- kdm/kfrontend/CMakeLists.txt.orig 2010-11-21 20:47:03.493842572 +0100 ++++ kdm/kfrontend/CMakeLists.txt 2010-11-21 20:47:03.509842471 +0100 +@@ -118,3 +118,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS install(CODE " exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ") + +install( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/read_sysconfig.sh DESTINATION ${DATA_INSTALL_DIR}/kdm ) ---- kdm/kfrontend/genkdmconf.c -+++ kdm/kfrontend/genkdmconf.c -@@ -53,6 +53,7 @@ +Index: kdm/kfrontend/genkdmconf.c +=================================================================== +--- kdm/kfrontend/genkdmconf.c.orig 2010-11-05 11:47:46.000000000 +0100 ++++ kdm/kfrontend/genkdmconf.c 2010-11-21 20:47:30.144717941 +0100 +@@ -53,6 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <config.ci> #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) @@ -404,7 +410,7 @@ static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -60,7 +61,7 @@ +@@ -60,7 +61,7 @@ static const char *newdir = KDMCONF, *fa *oldxdm, *oldkde, *oldkdepfx; static int oldver; @@ -413,7 +419,7 @@ typedef struct StrList { struct StrList *next; -@@ -542,6 +543,7 @@ +@@ -542,6 +543,7 @@ writeKdmrc(FILE *f) const char *cmt; putFqVal("General", "ConfigVersion", RCVERSTR); @@ -421,7 +427,7 @@ for (cs = config; cs; cs = cs->next) { fprintf_(f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name); -@@ -1628,6 +1630,26 @@ +@@ -1633,6 +1635,26 @@ upd_servercmd(Entry *ce, Section *cs ATT ce->written = True; } @@ -448,7 +454,7 @@ #ifdef XDMCP static void cp_keyfile(Entry *ce, Section *cs ATTR_UNUSED) -@@ -2620,7 +2642,7 @@ +@@ -2625,7 +2647,7 @@ static int mergeKdmRcNewer(const char *path, int obsRet) { char *p; @@ -457,7 +463,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j, ma, mi; -@@ -2646,6 +2668,9 @@ +@@ -2651,6 +2673,9 @@ mergeKdmRcNewer(const char *path, int ob p, ma, mi); free(p); @@ -467,7 +473,7 @@ for (cs = rootsect; cs; cs = cs->next) { cp = strrchr(cs->name, '-'); if (!cp) -@@ -2691,7 +2716,7 @@ +@@ -2696,7 +2721,7 @@ mergeKdmRcNewer(const char *path, int ob ; } @@ -476,9 +482,11 @@ return True; } ---- kdm/kfrontend/kdm_config.c -+++ kdm/kfrontend/kdm_config.c -@@ -396,7 +396,7 @@ +Index: kdm/kfrontend/kdm_config.c +=================================================================== +--- kdm/kfrontend/kdm_config.c.orig 2010-07-06 08:54:31.000000000 +0200 ++++ kdm/kfrontend/kdm_config.c 2010-11-21 20:47:03.511842363 +0100 +@@ -396,7 +396,7 @@ static const char *kdmrc = KDMCONF "/kdm static Section *rootsec; static void @@ -487,7 +495,7 @@ { const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass; char *s, *e, *st, *en, *ek, *sl, *pt; -@@ -406,14 +406,9 @@ +@@ -406,14 +406,9 @@ readConfig() int nlen, dlen, clen, dhostl, dnuml, dclassl; int i, line, sectmoan, restl; File file; @@ -504,7 +512,7 @@ return; for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { -@@ -439,7 +434,7 @@ +@@ -439,7 +434,7 @@ readConfig() e--; if (*e != ']') { cursec = 0; @@ -513,7 +521,7 @@ continue; } nstr = sl + 1; -@@ -449,7 +444,7 @@ +@@ -449,7 +444,7 @@ readConfig() !memcmp(nstr, cursec->name, nlen)) { logInfo("Multiple occurrences of section [%.*s] in %s. " @@ -522,7 +530,7 @@ goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { -@@ -505,7 +500,7 @@ +@@ -505,7 +500,7 @@ readConfig() illsec: cursec = 0; logError("Unrecognized section name [%.*s] at %s:%d\n", @@ -531,7 +539,7 @@ continue; newsec: if (!(cursec = Malloc(sizeof(*cursec)))) -@@ -533,7 +528,7 @@ +@@ -533,7 +528,7 @@ readConfig() if (!cursec) { if (sectmoan) { sectmoan = False; @@ -540,7 +548,7 @@ } goto sktoeol; } -@@ -541,13 +536,13 @@ +@@ -541,13 +536,13 @@ readConfig() for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; @@ -556,7 +564,7 @@ goto sktoeol; } if (!isspace(*ek)) -@@ -561,7 +556,7 @@ +@@ -561,7 +556,7 @@ readConfig() if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { @@ -565,7 +573,7 @@ break; } switch (*s) { -@@ -590,13 +585,13 @@ +@@ -590,13 +585,13 @@ readConfig() goto keyok; } logError("Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", @@ -581,7 +589,7 @@ goto keyfnd; } if (!(curent = Malloc(sizeof(*curent)))) -@@ -612,6 +607,20 @@ +@@ -612,6 +607,20 @@ readConfig() } } @@ -602,8 +610,10 @@ static Entry * findGEnt(int id) { ---- kdm/kfrontend/read_sysconfig.sh.sav 2010-08-31 14:24:02.949538639 +0200 -+++ kdm/kfrontend/read_sysconfig.sh 2010-08-31 17:32:11.866195161 +0200 +Index: kdm/kfrontend/read_sysconfig.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kdm/kfrontend/read_sysconfig.sh 2010-11-21 20:47:03.511842363 +0100 @@ -0,0 +1,160 @@ +#!/bin/bash +# ++++++ kdm-wordbreak.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- kdm/kfrontend/kfdialog.cpp -+++ kdm/kfrontend/kfdialog.cpp -@@ -28,6 +28,7 @@ +Index: kdm/kfrontend/kfdialog.cpp +=================================================================== +--- kdm/kfrontend/kfdialog.cpp.orig 2010-08-05 18:55:46.000000000 +0200 ++++ kdm/kfrontend/kfdialog.cpp 2010-11-21 20:47:03.524842955 +0100 +@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <KGuiItem> #include <KPushButton> @@ -8,7 +10,7 @@ #include <QApplication> #include <QDesktopWidget> -@@ -171,6 +172,9 @@ +@@ -172,6 +173,9 @@ KFMsgBox::KFMsgBox(QWidget *parent, QMes QLabel *label1 = new QLabel(this); label1->setPixmap(QMessageBox::standardIcon(type)); QLabel *label2 = new QLabel(text, this); ++++++ pam-translate.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- libs/kdm/kgreet_generic.cpp -+++ libs/kdm/kgreet_generic.cpp -@@ -141,7 +141,9 @@ +Index: libs/kdm/kgreet_generic.cpp +=================================================================== +--- libs/kdm/kgreet_generic.cpp.orig 2010-07-06 08:54:28.000000000 +0200 ++++ libs/kdm/kgreet_generic.cpp 2010-11-21 20:47:03.809718230 +0100 +@@ -141,7 +141,9 @@ KGenericGreeter::textMessage(const char if (m_infoMsgs.isEmpty()) revive(); @@ -11,7 +13,7 @@ m_infoMsgs.append(qtext); QLabel *label = new QLabel(qtext, m_parentWidget); m_grid->addWidget(label, m_line++, 0, 1, 2); -@@ -169,7 +171,10 @@ +@@ -169,7 +171,10 @@ KGenericGreeter::textPrompt(const char * else m_infoMsgs.clear(); ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,5 +1,7 @@ ---- plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:46:44 +Index: 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> @@ -7,8 +9,8 @@ +#include <QFile> // KDE - #include <KIcon> -@@ -187,7 +188,10 @@ + #include <KAuthorized> +@@ -188,7 +189,10 @@ void LauncherApplet::toolTipAboutToShow( void LauncherApplet::configChanged() { KConfigGroup cg = config(); @@ -18,9 +20,9 @@ + else + setPopupIcon(cg.readEntry("icon", "start-here-kde")); constraintsEvent(Plasma::ImmutableConstraint); - } -@@ -202,7 +206,12 @@ + if (d->launcher) { +@@ -207,7 +211,12 @@ void LauncherApplet::configAccepted() d->createLauncher(); KConfigGroup cg = config(); @@ -34,9 +36,11 @@ if (!iconname.isEmpty() && iconname != oldIcon) { cg.writeEntry("icon", iconname); ---- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:42 -@@ -167,6 +167,11 @@ +Index: 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) { @@ -48,9 +52,11 @@ Private::globalFavoriteList << url; Private::globalFavoriteSet << url; ---- plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:42 -@@ -177,7 +177,19 @@ +Index: 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"); QStringList apps; @@ -71,9 +77,11 @@ apps = appsGroup.readEntry("DesktopFiles", apps); return apps; } ---- plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:42 -@@ -81,7 +81,7 @@ +Index: 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))); @@ -82,7 +90,7 @@ << i18n("Places") << i18n("Removable Storage") << i18n("Storage"); -@@ -225,19 +225,33 @@ +@@ -225,19 +225,33 @@ QVariant SystemModel::data(const QModelI } KService::Ptr service = d->appsList[index.row()]; @@ -129,8 +137,10 @@ } if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) { ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:49:52 +Index: 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> @@ -139,7 +149,7 @@ // KDE Libs #include <KActionCollection> -@@ -305,7 +306,10 @@ +@@ -305,7 +306,10 @@ MenuLauncherApplet::MenuLauncherApplet(Q d->viewtypes << "RunCommand"; } d->viewtypes << "Leave"; @@ -151,9 +161,11 @@ } } d->formattype = NameDescription; ---- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:18 1.1 -+++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:42 -@@ -69,7 +69,10 @@ +Index: plasma/desktop/applets/kickoff/ui/brandingbutton.cpp +=================================================================== +--- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp.orig 2009-09-16 13:40:52.000000000 +0200 ++++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010-11-21 20:47:03.737717526 +0100 +@@ -69,7 +69,10 @@ void BrandingButton::checkBranding() void BrandingButton::openHomepage() { //FIXME: 4.3 .. add a brandingConfig to Theme ++++++ plasma-dashboard-leave.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- plasma/desktop/shell/dashboardview.cpp.orig -+++ plasma/desktop/shell/dashboardview.cpp -@@ -219,6 +219,15 @@ bool DashboardView::eventFilter(QObject +Index: plasma/desktop/shell/dashboardview.cpp +=================================================================== +--- plasma/desktop/shell/dashboardview.cpp.orig 2010-07-24 11:43:13.000000000 +0200 ++++ plasma/desktop/shell/dashboardview.cpp 2010-11-21 20:47:03.765718635 +0100 +@@ -225,6 +225,15 @@ bool DashboardView::eventFilter(QObject widgetExplorer->setPos(0, containment()->geometry().height() - widgetExplorer->geometry().height()); } ++++++ plasma-notifications-kill-timer.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,8 +1,8 @@ -diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp b/plasma/generic/dataengines/notifications/notificationsengine.cpp -index 898b4f6..b75f2bd 100644 ---- a/plasma/generic/dataengines/notifications/notificationsengine.cpp -+++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp -@@ -211,6 +211,7 @@ +Index: kdebase-workspace-4.5.80/plasma/generic/dataengines/notifications/notificationsengine.cpp +=================================================================== +--- kdebase-workspace-4.5.80.orig/plasma/generic/dataengines/notifications/notificationsengine.cpp 2010-11-11 15:41:03.000000000 +0100 ++++ kdebase-workspace-4.5.80/plasma/generic/dataengines/notifications/notificationsengine.cpp 2010-11-21 20:47:03.824759539 +0100 +@@ -217,6 +217,7 @@ void NotificationsEngine::timerEvent(QTi killTimer(event->timerId()); m_sourceTimers.remove(source); m_timeouts.remove(event->timerId()); ++++++ plasma-panel-resize-hint.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- plasma/desktop/shell/panelcontroller.cpp -+++ plasma/desktop/shell/panelcontroller.cpp -@@ -605,6 +605,8 @@ +Index: plasma/desktop/shell/panelcontroller.cpp +=================================================================== +--- plasma/desktop/shell/panelcontroller.cpp.orig 2010-10-05 13:39:06.000000000 +0200 ++++ plasma/desktop/shell/panelcontroller.cpp 2010-11-21 20:47:03.782718456 +0100 +@@ -627,6 +627,8 @@ void PanelController::mouseMoveFilter(QM newX = qMin(newX, screenGeom.left() + screenGeom.width()/3); move(newX, pos().y()); resizeFrameHeight(geometry().left() - screenGeom.left()); @@ -9,7 +11,7 @@ break; } case Plasma::RightEdge: { -@@ -613,6 +615,8 @@ +@@ -635,6 +637,8 @@ void PanelController::mouseMoveFilter(QM newX = qMax(newX, screenGeom.left() + 2*(screenGeom.width()/3) - width()); move(newX, pos().y()); resizeFrameHeight(screenGeom.right() - geometry().right()); @@ -18,7 +20,7 @@ break; } case Plasma::TopEdge: { -@@ -621,6 +625,9 @@ +@@ -643,6 +647,9 @@ void PanelController::mouseMoveFilter(QM newY = qMin(newY, screenGeom.top() + screenGeom.height()/3); move(pos().x(), newY); resizeFrameHeight(geometry().top() - screenGeom.top()); @@ -28,7 +30,7 @@ break; } case Plasma::BottomEdge: -@@ -630,6 +637,8 @@ +@@ -652,6 +659,8 @@ void PanelController::mouseMoveFilter(QM newY = qMax(newY, screenGeom.top() + 2*(screenGeom.height()/3) - height()); move(pos().x(), newY); resizeFrameHeight(screenGeom.bottom() - geometry().bottom()); ++++++ plasma-wallpaper-description.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- plasma/generic/wallpapers/image/backgroundlistmodel.cpp.sav 2009-09-16 13:40:55.000000000 +0200 -+++ plasma/generic/wallpapers/image/backgroundlistmodel.cpp 2010-05-11 14:21:34.442041261 +0200 -@@ -18,6 +18,7 @@ +Index: plasma/generic/wallpapers/image/backgroundlistmodel.cpp +=================================================================== +--- plasma/generic/wallpapers/image/backgroundlistmodel.cpp.orig 2010-08-19 10:51:52.000000000 +0200 ++++ plasma/generic/wallpapers/image/backgroundlistmodel.cpp 2010-11-21 20:47:03.796739854 +0100 +@@ -19,6 +19,7 @@ #include <KIO/PreviewJob> #include <KProgressDialog> #include <KStandardDirs> @@ -8,7 +10,7 @@ #include <Plasma/Package> #include <Plasma/PackageStructure> -@@ -347,6 +348,13 @@ void BackgroundFinder::start() +@@ -375,6 +376,13 @@ void BackgroundFinder::start() m_paths.append(wp.filePath()); } } else if (suffixes.contains(wp.suffix().toLower()) && (!m_container || !m_container->contains(wp.filePath()))) { @@ -22,7 +24,7 @@ //kDebug() << "adding" << wp.filePath() << setLabel; if (setLabel) { progress->setLabelText(i18n("Finding images for the wallpaper slideshow.") + "\n\n" + -@@ -356,6 +364,7 @@ void BackgroundFinder::start() +@@ -384,6 +392,7 @@ void BackgroundFinder::start() //kDebug() << " adding image file" << wp.filePath(); ++count; m_papersFound << wp.filePath(); ++++++ rotate-wacom-pointers.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,8 +1,8 @@ Index: kcontrol/randr/randrscreen.cpp =================================================================== ---- kcontrol/randr/randrscreen.cpp.orig -+++ kcontrol/randr/randrscreen.cpp -@@ -490,6 +490,8 @@ bool RandRScreen::applyProposed(bool con +--- kcontrol/randr/randrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200 ++++ kcontrol/randr/randrscreen.cpp 2010-11-21 20:47:03.651718637 +0100 +@@ -538,6 +538,8 @@ bool RandRScreen::applyProposed(bool con if (succeed && confirm) succeed = RandR::confirm(r); @@ -13,9 +13,9 @@ if (succeed) Index: kcontrol/randr/randr.h =================================================================== ---- kcontrol/randr/randr.h.orig -+++ kcontrol/randr/randr.h -@@ -103,6 +103,7 @@ public: +--- kcontrol/randr/randr.h.orig 2010-08-11 12:08:09.000000000 +0200 ++++ kcontrol/randr/randr.h 2010-11-21 20:47:03.651718637 +0100 +@@ -104,6 +104,7 @@ public: static bool confirm(const QRect &rect = QRect()); static SizeList sortSizes(const SizeList &sizes); @@ -25,8 +25,8 @@ #endif Index: kcontrol/randr/legacyrandrscreen.cpp =================================================================== ---- kcontrol/randr/legacyrandrscreen.cpp.orig -+++ kcontrol/randr/legacyrandrscreen.cpp +--- kcontrol/randr/legacyrandrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200 ++++ kcontrol/randr/legacyrandrscreen.cpp 2010-11-21 20:47:03.653717490 +0100 @@ -104,6 +104,7 @@ bool LegacyRandRScreen::applyProposed() m_currentSize = m_proposedSize; m_currentRotation = m_proposedRotation; @@ -37,8 +37,8 @@ Index: kcontrol/randr/randrcrtc.cpp =================================================================== ---- kcontrol/randr/randrcrtc.cpp.orig -+++ kcontrol/randr/randrcrtc.cpp +--- kcontrol/randr/randrcrtc.cpp.orig 2008-11-19 11:17:57.000000000 +0100 ++++ kcontrol/randr/randrcrtc.cpp 2010-11-21 20:47:03.653717490 +0100 @@ -317,6 +317,7 @@ bool RandRCrtc::applyProposed() m_currentRect = m_proposedRect; m_currentRate = mode.refreshRate(); @@ -49,8 +49,8 @@ else Index: kcontrol/randr/randr.cpp =================================================================== ---- kcontrol/randr/randr.cpp.orig -+++ kcontrol/randr/randr.cpp +--- kcontrol/randr/randr.cpp.orig 2010-08-11 12:08:09.000000000 +0200 ++++ kcontrol/randr/randr.cpp 2010-11-21 20:47:03.653717490 +0100 @@ -19,6 +19,8 @@ #include "randr.h" @@ -59,8 +59,8 @@ +#include <qprocess.h> bool RandR::has_1_2 = false; - Time RandR::timestamp = 0; -@@ -176,5 +178,40 @@ SizeList RandR::sortSizes(const SizeList + bool RandR::has_1_3 = false; +@@ -177,5 +179,40 @@ SizeList RandR::sortSizes(const SizeList return sorted; } ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,8 +1,8 @@ Index: startkde.cmake =================================================================== ---- startkde.cmake.orig -+++ startkde.cmake -@@ -92,6 +92,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD +--- startkde.cmake.orig 2010-10-27 21:55:06.000000000 +0200 ++++ startkde.cmake 2010-11-21 20:47:29.435718302 +0100 +@@ -88,6 +88,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD mkdir -m 700 -p $kdehome mkdir -m 700 -p $kdehome/share mkdir -m 700 -p $kdehome/share/config @@ -12,7 +12,7 @@ cat >$kdehome/share/config/startupconfigkeys <<EOF kcminputrc Mouse cursorTheme 'Oxygen_Black' kcminputrc Mouse cursorSize '' -@@ -105,6 +108,7 @@ kcmrandrrc [Screen3] +@@ -102,6 +105,7 @@ krandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF @@ -20,7 +20,7 @@ kstartupconfig4 returncode=$? if test $returncode -ne 0; then -@@ -226,7 +230,7 @@ fi +@@ -181,7 +185,7 @@ fi libpath=`kde4-config --path lib | tr : '\n'` ++++++ suspend-lock.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -9,8 +9,8 @@ Index: ksmserver/shutdowndlg.cpp =================================================================== ---- ksmserver/shutdowndlg.cpp.orig -+++ ksmserver/shutdowndlg.cpp +--- ksmserver/shutdowndlg.cpp.orig 2010-08-25 09:44:36.000000000 +0200 ++++ ksmserver/shutdowndlg.cpp 2010-11-21 20:47:03.680717968 +0100 @@ -43,6 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include <kiconloader.h> #include <klocale.h> @@ -19,7 +19,7 @@ #include <solid/control/powermanager.h> #include <kwindowsystem.h> #include <netwm.h> -@@ -648,9 +649,16 @@ void KSMShutdownDlg::slotSuspend(QAction +@@ -666,9 +667,16 @@ void KSMShutdownDlg::slotSuspend(QAction { m_bootOption.clear(); Solid::Control::PowerManager::SuspendMethod spdMethod = action->data().value<Solid::Control::PowerManager::SuspendMethod>(); ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100 @@ -1,7 +1,7 @@ Index: systemsettings/app/systemsettings.desktop =================================================================== ---- systemsettings/app/systemsettings.desktop.orig -+++ systemsettings/app/systemsettings.desktop +--- systemsettings/app/systemsettings.desktop.orig 2010-11-05 11:47:11.000000000 +0100 ++++ systemsettings/app/systemsettings.desktop 2010-11-21 20:47:03.637718287 +0100 @@ -5,7 +5,7 @@ Type=Application X-DocPath=systemsettings/index.html X-KDE-StartupNotify=true @@ -9,18 +9,18 @@ -GenericName=System Settings +GenericName=Configure Desktop GenericName[ar]=إعدادات النظام + GenericName[ast]=Preferencies del sistema GenericName[be@latin]=Systemnyja nałady - GenericName[bg]=Системни настройки -@@ -81,7 +81,7 @@ GenericName[x-test]=xxSystem Settingsxx +@@ -85,7 +85,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 -Name=System Settings +Name=Personal Settings Name[ar]=إعدادات النظام + Name[ast]=Preferencies del sistema Name[be]=Сістэмныя настаўленні - Name[be@latin]=Systemnyja nałady -@@ -162,4 +162,4 @@ Name[zh_CN]=系统设置 +@@ -170,4 +170,4 @@ Name[zh_CN]=系统设置 Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Mon Nov 22 23:38:41 CET 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-10-28 22:13:24.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-11-19 17:13:46.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 19 17:13:40 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_5_BRANCH.diff kdepimlibs-4.5.3.tar.bz2 New: ---- 4_6_BRANCH.diff kdepimlibs-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.ubAQJV/_old 2010-11-22 23:37:38.000000000 +0100 +++ /var/tmp/diff_new_pack.ubAQJV/_new 2010-11-22 23:37:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.5.3) +# spec file for package kdepimlibs4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,10 +23,10 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.5.3 +Version: 4.5.80 Release: 1 Source0: kdepimlibs-%version.tar.bz2 -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkdepimlibs4 = %version Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`) @@ -100,6 +100,9 @@ %_kde4_libdir/libmailtransport.so.* %_kde4_libdir/libgpgme++.so.* %_kde4_libdir/libgpgme++-pthread.so.* +%_kde4_libdir/libkcalcore.so.* +%_kde4_libdir/libkcalutils.so.* +%_kde4_libdir/libkmbox.so.* %if %suse_version > 1020 %_kde4_libdir/libgpgme++-pth.so.* %endif @@ -139,6 +142,7 @@ %_kde4_libdir/libakonadi-kabc.so* %_kde4_libdir/libakonadi-contact.so* %_kde4_libdir/libakonadi-kcal.so* +%_kde4_libdir/libakonadi-calendar.so* %package -n libkdepimlibs4-devel License: LGPLv2.1+ @@ -193,6 +197,9 @@ %_kde4_libdir/gpgmepp/GpgmeppConfig.cmake %_kde4_libdir/gpgmepp/GpgmeppLibraryDepends.cmake %_kde4_libdir/libkontactinterface.so +%_kde4_libdir/libkcalcore.so +%_kde4_libdir/libkcalutils.so +%_kde4_libdir/libkmbox.so %files %defattr(-,root,root) @@ -205,6 +212,7 @@ /usr/share/dbus-1/*/* %_kde_share_dir/services %_kde_share_dir/servicetypes +%_kde_share_dir/config.kcfg/resourcebase.kcfg %_kde_share_dir/config.kcfg/mailtransport.kcfg %_kde_share_dir/config.kcfg/recentcontactscollections.kcfg %_kde_share_dir/config.kcfg/specialmailcollections.kcfg ++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++ ++++++ kdepimlibs-4.5.3.tar.bz2 -> kdepimlibs-4.5.80.tar.bz2 ++++++ ++++ 164770 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Mon Nov 22 23:37:25 CET 2010. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2010-10-25 09:26:17.000000000 +0200 +++ akonadi-runtime/akonadi-runtime.changes 2010-11-21 18:39:52.000000000 +0100 @@ -1,0 +2,27 @@ +Sun Nov 21 18:39:07 CET 2010 - dmueller(a)suse.de + +- update to 1.4.80: + - Experimental support for MeeGo. + - Return changed revision numbers in STORE response. + - Fix Nepomuk searches mixing up items and email attachments. + - Experimental Strigi search backend. + - Compensate for Nepomuk D-Bus API breakage. + - Fix parsing of serialization format version. + - Optimize collection statistics queries. + - Optimize protocol output generation. + - Optimize protocol parsing. + - Build-time configurable default database backend. + - Fix ancestor chain quoting. + - Fix finding of components on Windows in install location. + - New subscription interface for change notifications. + - Support for in-process agents and agent server. + - Support for Sqlite. + - Experimental support for ODBC-based database backends. + - Support Windows CE. + +------------------------------------------------------------------- +Fri Nov 19 21:05:31 UTC 2010 - wstephenson(a)novell.com + +- update to 1.4.53 snapshot + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.4.1.tar.bz2 New: ---- akonadi-1.4.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.gMKFb0/_old 2010-11-22 23:35:56.000000000 +0100 +++ /var/tmp/diff_new_pack.gMKFb0/_new 2010-11-22 23:35:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.4.1) +# spec file for package akonadi-runtime (Version 1.4.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,10 +20,8 @@ Name: akonadi-runtime BuildRequires: cmake kde4-filesystem libmysqlclient-devel BuildRequires: automoc4 boost-devel libsoprano-devel libxslt mysql shared-mime-info -%if %suse_version > 1020 BuildRequires: fdupes -%endif -Version: 1.4.1 +Version: 1.4.80 Release: 1 %define rversion %version License: LGPLv2.1+ @@ -33,13 +31,10 @@ Summary: PIM Storage Service # http://download.akonadi-project.org Source0: akonadi-%rversion.tar.bz2 +# The private lib contains exit calls in the function for commandline interface calls. Source1: akonadi-runtime-rpmlintrc Patch0: 1_4_BRANCH.diff -%if %suse_version > 1010 Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4) -%else -Requires: qt >= %(echo `rpm -q --queryformat '%{VERSION}' qt`) -%endif # rename from 10.3, which had 4.x version Provides: akonadi = %version Obsoletes: akonadi < 4.1 @@ -104,7 +99,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n akonadi-%version +%setup -q -n akonadi-%rversion #%patch0 %build @@ -134,11 +129,12 @@ /usr/bin/akonadi_control /usr/bin/akonadictl /usr/bin/akonadi_rds +/usr/bin/akonadi_agent_server +/usr/bin/akonadi_agent_launcher /usr/bin/akonadiserver %dir /etc/akonadi %config /etc/akonadi/mysql-global.conf %config /etc/akonadi/mysql-global-mobile.conf -%_libdir/libakonadiprivate.so.1* /usr/share/mime/packages/akonadi-mime.xml /usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service @@ -154,7 +150,6 @@ /usr/include/akonadi/private /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %_libdir/libakonadiprotocolinternals.so -%_libdir/libakonadiprivate.so %_libdir/pkgconfig/akonadi.pc %files -n libakonadiprotocolinternals1 ++++++ akonadi-1.4.1.tar.bz2 -> akonadi-1.4.80.tar.bz2 ++++++ ++++ 12222 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Mon Nov 22 23:35:39 CET 2010. -------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2010-11-18 16:08:07.000000000 +0100 +++ kdelibs4/kdelibs4-apidocs.changes 2010-11-22 23:32:37.541813000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 19 17:13:14 CET 2010 - dmueller(a)suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 Old: ---- 4_5_BRANCH.diff kdelibs-4.5.3-bko246652.patch kdelibs-4.5.3.tar.bz2 nepomuk-final.diff New: ---- 4_6_BRANCH.diff enable-final-fixes.diff kdelibs-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4-apidocs (Version 4.5.3) +# spec file for package kdelibs4-apidocs (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,15 +25,15 @@ Group: System/GUI/KDE Summary: KDE 4 API documentation Url: http://www.kde.org -Version: 4.5.3 -Release: 3 +Version: 4.5.80 +Release: 1 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 Source1: baselibs.conf Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.5.3) +# spec file for package kdelibs4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,14 +21,14 @@ BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme BuildRequires: libQtWebKit-devel libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip BuildRequires: bison flex libqca2-devel libsoprano-devel pcre-devel phonon-devel shared-mime-info -BuildRequires: kde4-filesystem pkg-config strigi strigi-devel update-desktop-files +BuildRequires: grantlee-devel kde4-filesystem pkg-config strigi strigi-devel update-desktop-files BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel -BuildRequires: libattica-devel shared-desktop-ontologies-devel soprano-backend-redland +BuildRequires: libattica-devel shared-desktop-ontologies-devel BuildRequires: docbook-xsl-stylesheets docbook_4 libdbusmenu-qt-devel BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel BuildRequires: libgssglue-devel %if 0%{?suse_version} > 1110 -BuildRequires: xz-devel +BuildRequires: libudev-devel xz-devel BuildRequires: libpolkit-qt-1-devel %else BuildRequires: lzma-devel @@ -43,8 +43,8 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.5.3 -Release: 3 +Version: 4.5.80 +Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -57,7 +57,7 @@ Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -73,8 +73,7 @@ Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff Patch25: ksuseinstall_11.2.diff -Patch26: nepomuk-final.diff -Patch27: kdelibs-4.5.3-bko246652.patch +Patch26: enable-final-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %if 0%{?opensuse_bs} @@ -86,9 +85,12 @@ %if %suse_version == 1120 Requires: %{name}-branding = 11.2 %endif -%if %suse_version > 1120 +%if %suse_version == 1130 Requires: %{name}-branding = 11.3 %endif +%if %suse_version > 1130 +Requires: %{name}-branding = 11.4 +%endif %description This package contains the basic packages of the K Desktop Environment. @@ -112,9 +114,13 @@ %if %suse_version == 1120 Provides: %{name}-branding = 11.2 %endif -%if %suse_version > 1120 +%if %suse_version == 1130 Provides: %{name}-branding = 11.3 %endif +%if %suse_version > 1130 +Provides: %{name}-branding = 11.4 +%endif + Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdelibs4:branding-upstream) @@ -149,7 +155,6 @@ %patch25 %endif %patch26 -%patch27 # # define KDE version exactly # @@ -181,7 +186,8 @@ %create_exclude_filelist install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4 + mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu \ + $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4 rm $RPM_BUILD_ROOT/usr/share/man/man1/checkXML.1 mv $RPM_BUILD_ROOT/usr/share/man/man7/kdeoptions.7 \ $RPM_BUILD_ROOT/usr/share/man/man7/kde4options.7 @@ -265,6 +271,7 @@ Summary: KDE Base Libraries Requires: kde4-filesystem >= %_kde_platform_version Requires: libkdecore4 = %version +%requires_ge libpolkit-qt-1-0 %description -n kdelibs4-core This package contains the basic packages of the K Desktop Environment. @@ -286,6 +293,7 @@ %exclude %_kde4_libdir/libkdefakes.so.* %exclude %_kde4_libdir/libkpty.so.* %exclude %_kde4_bindir/kconfig_compiler +%exclude /usr/share/locale/all_languages %dir %_kde4_libdir/kde4 %dir %_kde4_sharedir/servicetypes %config %_kde_config_dir/kdebug.areas @@ -322,7 +330,6 @@ Group: System/GUI/KDE Summary: KDE Base Libraries %requires_ge libqt4-x11 -Requires: hal %description -n libkde4 This package contains the basic packages of the K Desktop Environment. @@ -355,7 +362,6 @@ %_kde4_libdir/libkdewebkit.so.* %_kde4_libdir/libkdnssd.so.* %_kde4_libdir/libkfile.so.* -%_kde4_libdir/libkfile.so.* %_kde4_libdir/libkhtml.so.* %_kde4_libdir/libkimproxy.so.* %_kde4_libdir/libkio.so.* @@ -376,6 +382,7 @@ %_kde4_libdir/libkutils.so.* %_kde4_libdir/libnepomukquery.so.* %_kde4_libdir/libnepomuk.so.* +%_kde4_libdir/libnepomukutils.so.* %_kde4_libdir/libplasma.so.* %_kde4_libdir/libsolid.so.* %_kde4_libdir/libthreadweaver.so.* @@ -384,6 +391,7 @@ %_kde4_libdir/libkemoticons.so.* %_kde4_libdir/libkidletime.so.* %_kde4_libdir/libkprintutils.so.* +/usr/share/locale/all_languages %package -n libkde4-devel License: LGPLv2.1+ @@ -474,6 +482,8 @@ %_kde4_mandir/man*/* /usr/share/mime/packages/kde.xml %exclude %_kde4_libdir/kde4/plugins/script/libkrossqtsplugin.so +%_kde4_applicationsdir/kmailservice.desktop +%_kde4_applicationsdir/ktelnetservice.desktop # IMPORTANT: When this is obsolete, do not just remove this, but create # a separate package (for backwards compatibility). ++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++ --- KDE/kdelibs4/4_5_BRANCH.diff 2010-11-11 16:26:25.000000000 +0100 +++ kdelibs4/4_6_BRANCH.diff 2010-11-22 21:46:28.000000000 +0100 @@ -1,25 +1,8 @@ +package: kdelibs-4.5.80.tar.bz2 +kdemod: kdelibs --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1185156 -+svn di between //tags/KDE/4.5.2/kdelibs and //branches/KDE/4.5/kdelibs - -Index: doc/kded4/man-kded4.8.docbook ------------------------------------------------------------------------- -r1195598 | mueller | 2010-11-11 16:24:29 +0100 (Do, 11. Nov 2010) | 2 Zeilen - -gcc 4.6 build fix - ------------------------------------------------------------------------- -Index: kjs/collector.h -=================================================================== ---- kjs/collector.h (Revision 1195597) -+++ kjs/collector.h (Revision 1195598) -@@ -27,6 +27,7 @@ - - #include <wtf/HashCountedSet.h> - #include <cstring> -+#include <cstddef> - - #define KJS_MEM_LIMIT 500000 - ++current HEAD: 1199829 ++svn di between //trunk/KDE/kdelibs@1149349 and //trunk/KDE/kdelibs + string(REGEX REPLACE "POLKITQT_VERSION_STRING \" ++++++ add-suse-translations.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,12 +1,14 @@ ---- kdecore/localization/klocale.cpp -+++ kdecore/localization/klocale.cpp -@@ -360,6 +360,9 @@ - catalogNames.append(KCatalogName("kdeqt")); - catalogNames.append(KCatalogName("solid_qt")); - catalogNames.append(KCatalogName("kdecalendarsystems")); -+ catalogNames.append(KCatalogName("desktop_translations")); -+ catalogNames.append(KCatalogName("kde4-openSUSE")); -+ catalogNames.append(KCatalogName("kde4-SLE")); - numberOfSysCatalogs = catalogNames.size() - numberOfCatalogs; +Index: kdecore/localization/klocale_kde.cpp +=================================================================== +--- kdecore/localization/klocale_kde.cpp.orig ++++ kdecore/localization/klocale_kde.cpp +@@ -257,6 +257,9 @@ void KLocalePrivate::initMainCatalogs() + m_catalogNames.append(KCatalogName(QString::fromLatin1("kdeqt"))); + m_catalogNames.append(KCatalogName(QString::fromLatin1("solid_qt"))); + m_catalogNames.append(KCatalogName(QString::fromLatin1("kdecalendarsystems"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("desktop_translations"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("kde4-openSUSE"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("kde4-SLE"))); + m_numberOfSysCatalogs = m_catalogNames.size() - numberOfCatalogs; updateCatalogs(); // evaluate this for all languages ++++++ clever-menu.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,18 +1,22 @@ +Index: kdecore/services/kservice.cpp +=================================================================== --- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -702,6 +702,12 @@ QString KService::untranslatedGenericNam +@@ -717,6 +717,12 @@ QString KService::untranslatedGenericNam return v.isValid() ? v.toString() : QString(); } + +bool KService::SuSEunimportant() const { -+ QVariant v = property("X-SuSE-Unimportant", QVariant::Bool); ++ QVariant v = property(QString::fromLatin1("X-SuSE-Unimportant"), QVariant::Bool); + return v.isValid() && v.toBool(); +} + QString KService::parentApp() const { Q_D(const KService); - QMap<QString,QVariant>::ConstIterator it = d->m_mapProps.find( "X-KDE-ParentApp" ); + QMap<QString,QVariant>::ConstIterator it = d->m_mapProps.find(QLatin1String("X-KDE-ParentApp")); +Index: kdecore/services/kservicegroup.cpp +=================================================================== --- kdecore/services/kservicegroup.cpp.orig +++ kdecore/services/kservicegroup.cpp @@ -29,7 +29,7 @@ @@ -31,8 +35,8 @@ + if (directoryEntryPath.startsWith(QDir::homePath())) + m_bShortMenu = false; + else -+ m_bShortMenu = config.readEntry( "X-SuSE-AutoShortMenu", true ); -+ m_bGeneralDescription = config.readEntry( "X-SuSE-GeneralDescription", false ); ++ m_bShortMenu = config.readEntry( QString::fromLatin1("X-SuSE-AutoShortMenu"), true ); ++ m_bGeneralDescription = config.readEntry( QString::fromLatin1("X-SuSE-GeneralDescription"), false ); m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); suppressGenericNames = config.readEntry( "X-KDE-SuppressGenericNames", QStringList() ); // d->sortOrder = config.readEntry("SortOrder", QStringList()); @@ -40,9 +44,9 @@ { if (m_childCount == -1) { -+ KConfig cfg("kdeglobals"); -+ KConfigGroup global = cfg.group("KDE"); -+ bool showUnimportant = global.readEntry("showUnimportant", false); ++ KConfig cfg(QString::fromLatin1("kdeglobals")); ++ KConfigGroup global = cfg.group(QString::fromLatin1("KDE")); ++ bool showUnimportant = global.readEntry(QString::fromLatin1("showUnimportant"), false); + m_childCount = 0; @@ -183,6 +187,8 @@ const KService::Ptr service = KService::Ptr::staticCast( (*it2).value() ); if (service->menuId() == item) { +Index: kdecore/services/kservicegroup.h +=================================================================== --- kdecore/services/kservicegroup.h.orig +++ kdecore/services/kservicegroup.h @@ -22,6 +22,7 @@ @@ -219,6 +225,8 @@ * options for groupEntries and serviceEntries */ enum EntriesOption +Index: kdecore/services/kservicegroup_p.h +=================================================================== --- kdecore/services/kservicegroup_p.h.orig +++ kdecore/services/kservicegroup_p.h @@ -31,7 +31,8 @@ public: @@ -254,6 +262,8 @@ bool m_bShowEmptyMenu : 1; bool m_bShowInlineHeader : 1; bool m_bInlineAlias : 1; +Index: kdecore/services/kservice.h +=================================================================== --- kdecore/services/kservice.h.orig +++ kdecore/services/kservice.h @@ -333,6 +333,12 @@ public: ++++++ default-useragent.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,13 +1,11 @@ -Index: kio/kio/kprotocolmanager.cpp -=================================================================== ---- kio/kio/kprotocolmanager.cpp.orig +--- kio/kio/kprotocolmanager.cpp +++ kio/kio/kprotocolmanager.cpp -@@ -77,7 +77,7 @@ KProtocolManagerPrivate::~KProtocolManag - - // DEFAULT USERAGENT STRING - #define CFG_DEFAULT_UAGENT(X) \ --QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ -+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) SUSE") \ - .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE) +@@ -87,7 +87,7 @@ + QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \ + X % QL1S(") KHTML/") % \ + QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \ +-QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko)") ++QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko) SUSE") #define PRIVATE_DATA \ + KProtocolManagerPrivate *d = kProtocolManagerPrivate ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,25 +1,26 @@ -Index: kdecore/config/kconfig.cpp +Subject: Read .desktop file translations from .mo files if not present +From: Lubos Lunak +Fate: #300461 +Patch-upstream: no +Relates: kdelibs3/desktop-translations.diff + +Index: kdecore/services/kservicegroup.cpp =================================================================== ---- kdecore/config/kconfig.cpp.orig -+++ kdecore/config/kconfig.cpp -@@ -754,6 +754,17 @@ QString KConfigPrivate::lookupData(const - return entryMap.getEntry(group, key, QString(), flags, expand); - } +--- kdecore/services/kservicegroup.cpp.orig ++++ kdecore/services/kservicegroup.cpp +@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS -+QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key, -+ KEntryMap::SearchFlags flags) const -+{ -+ if (bReadDefaults) -+ flags |= KEntryMap::SearchDefaults; -+ const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); -+ if (it == entryMap.constEnd()) -+ return QByteArray(); -+ return it->mValue; -+} -+ - void KConfig::virtual_hook(int /*id*/, void* /*data*/) - { - /* nothing */ + const KConfigGroup config = desktopFile.desktopGroup(); + +- m_strCaption = config.readEntry( "Name" ); +- m_strIcon = config.readEntry( "Icon" ); +- m_strComment = config.readEntry( "Comment" ); ++ m_strCaption = desktopFile.readName(); ++ m_strIcon = desktopFile.readIcon(); ++ m_strComment = desktopFile.readComment(); + deleted = config.readEntry("Hidden", false ); + m_bNoDisplay = desktopFile.noDisplay(); + if (directoryEntryPath.startsWith(QDir::homePath())) Index: kdecore/config/kconfigdata.h =================================================================== --- kdecore/config/kconfigdata.h.orig @@ -44,55 +45,6 @@ Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(), SearchFlags flags = SearchFlags()) { -Index: kdecore/config/kconfiggroup.cpp -=================================================================== ---- kdecore/config/kconfiggroup.cpp.orig -+++ kdecore/config/kconfiggroup.cpp -@@ -1238,6 +1238,16 @@ bool KConfigGroup::hasKey(const char *ke - return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); - } - -+bool KConfigGroup::hasTranslatedKey(const char* key) const -+{ -+ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); -+ -+ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; -+ if ( config()->readDefaults() ) -+ flags |= KEntryMap::SearchDefaults; -+ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); -+} -+ - bool KConfigGroup::hasKey(const QString &key) const - { - return hasKey(key.toUtf8().constData()); -Index: kdecore/config/kconfiggroup.h -=================================================================== ---- kdecore/config/kconfiggroup.h.orig -+++ kdecore/config/kconfiggroup.h -@@ -617,6 +617,11 @@ public: - */ - QMap<QString, QString> entryMap() const; - -+ /** -+ * @internal -+ */ -+ bool hasTranslatedKey( const char *pKey ) const; -+ - protected: - bool hasGroupImpl(const QByteArray &group) const; - KConfigGroup groupImpl(const QByteArray &b); -Index: kdecore/config/kconfig_p.h -=================================================================== ---- kdecore/config/kconfig_p.h.orig -+++ kdecore/config/kconfig_p.h -@@ -53,6 +53,7 @@ public: - QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, - bool* expand) const; - QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; -+ QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; - - void putData(const QByteArray& group, const char* key, const QByteArray& value, - KConfigBase::WriteConfigFlags flags, bool expand=false); Index: kdecore/config/kdesktopfile.cpp =================================================================== --- kdecore/config/kdesktopfile.cpp.orig @@ -106,26 +58,21 @@ class KDesktopFilePrivate : public KConfigPrivate { -@@ -176,6 +178,34 @@ bool KDesktopFile::isAuthorizedDesktopFi +@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } +QString KDesktopFile::translatedEntry(const char* key) const +{ + Q_D(const KDesktopFile); -+ return translatedEntry( d->desktopGroup, key ); -+} -+ -+QString KDesktopFile::translatedEntry(const KConfigGroup& group, const char* key) const -+{ -+ if (group.hasTranslatedKey(key)) -+ return group.readEntry(key); ++ if (d->desktopGroup.hasTranslatedKey(key)) ++ return d->desktopGroup.readEntry(key); + -+ if (group.hasKey(key)) { -+ QString value = group.readEntryUntranslated(key); ++ if (d->desktopGroup.hasKey(key)) { ++ QString value = d->desktopGroup.readEntryUntranslated(key); + QString fName = fileName(); -+ fName = fName.mid(fName.lastIndexOf('/')+1); -+ QString po_lookup_key = QString::fromLatin1(key) + "(" + fName + "): " + value; ++ fName = fName.mid(fName.lastIndexOf(QLatin1Char('/'))+1); ++ QString po_lookup_key = QString::fromLatin1(key) + QString::fromLatin1("(") + fName + QString::fromLatin1("): ") + value; + QString po_value; + KGlobal::locale()->translateRaw(po_lookup_key.toUtf8().data(), NULL, &po_value); + @@ -141,7 +88,7 @@ QString KDesktopFile::readType() const { Q_D(const KDesktopFile); -@@ -190,20 +220,17 @@ QString KDesktopFile::readIcon() const +@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { @@ -169,19 +116,7 @@ =================================================================== --- kdecore/config/kdesktopfile.h.orig +++ kdecore/config/kdesktopfile.h -@@ -243,6 +243,11 @@ public: - - const char *resource() const; - -+ /** -+ * @internal SUSE addition -+ */ -+ QString translatedEntry(const KConfigGroup& group, const char*) const; -+ - protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. -@@ -250,6 +255,8 @@ protected: +@@ -250,6 +250,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: @@ -190,33 +125,74 @@ Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile) -Index: kdecore/services/kservice.cpp +Index: kdecore/config/kconfiggroup.h =================================================================== ---- kdecore/services/kservice.cpp.orig -+++ kdecore/services/kservice.cpp -@@ -330,7 +330,7 @@ void KServicePrivate::parseActions(const - << "has no Name or no Exec key"; - } else { - m_actions.append(KServiceAction(group, -- cg.readEntry("Name"), -+ config->translatedEntry(cg,"Name"), - cg.readEntry("Icon"), - cg.readEntry("Exec"), - cg.readEntry("NoDisplay", false))); -Index: kdecore/services/kservicegroup.cpp +--- kdecore/config/kconfiggroup.h.orig ++++ kdecore/config/kconfiggroup.h +@@ -617,6 +617,11 @@ public: + */ + QMap<QString, QString> entryMap() const; + ++ /** ++ * @internal ++ */ ++ bool hasTranslatedKey( const char *pKey ) const; ++ + protected: + bool hasGroupImpl(const QByteArray &group) const; + KConfigGroup groupImpl(const QByteArray &b); +Index: kdecore/config/kconfig.cpp =================================================================== ---- kdecore/services/kservicegroup.cpp.orig -+++ kdecore/services/kservicegroup.cpp -@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS +--- kdecore/config/kconfig.cpp.orig ++++ kdecore/config/kconfig.cpp +@@ -749,6 +749,17 @@ QString KConfigPrivate::lookupData(const + return entryMap.getEntry(group, key, QString(), flags, expand); + } - const KConfigGroup config = desktopFile.desktopGroup(); ++QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key, ++ KEntryMap::SearchFlags flags) const ++{ ++ if (bReadDefaults) ++ flags |= KEntryMap::SearchDefaults; ++ const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); ++ if (it == entryMap.constEnd()) ++ return QByteArray(); ++ return it->mValue; ++} ++ + void KConfig::virtual_hook(int /*id*/, void* /*data*/) + { + /* nothing */ +Index: kdecore/config/kconfig_p.h +=================================================================== +--- kdecore/config/kconfig_p.h.orig ++++ kdecore/config/kconfig_p.h +@@ -53,6 +53,7 @@ public: + QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, + bool* expand) const; + QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; ++ QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; -- m_strCaption = config.readEntry( "Name" ); -- m_strIcon = config.readEntry( "Icon" ); -- m_strComment = config.readEntry( "Comment" ); -+ m_strCaption = desktopFile.readName(); -+ m_strIcon = desktopFile.readIcon(); -+ m_strComment = desktopFile.readComment(); - deleted = config.readEntry("Hidden", false ); - m_bNoDisplay = desktopFile.noDisplay(); - if (directoryEntryPath.startsWith(QDir::homePath())) + void putData(const QByteArray& group, const char* key, const QByteArray& value, + KConfigBase::WriteConfigFlags flags, bool expand=false); +Index: kdecore/config/kconfiggroup.cpp +=================================================================== +--- kdecore/config/kconfiggroup.cpp.orig ++++ kdecore/config/kconfiggroup.cpp +@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke + return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); + } + ++bool KConfigGroup::hasTranslatedKey(const char* key) const ++{ ++ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); ++ ++ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; ++ if ( config()->readDefaults() ) ++ flags |= KEntryMap::SearchDefaults; ++ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); ++} ++ + bool KConfigGroup::hasKey(const QString &key) const + { + return hasKey(key.toUtf8().constData()); ++++++ enable-final-fixes.diff ++++++ Index: kio/kssl/kcm/displaycertdialog_p.h =================================================================== --- kio/kssl/kcm/displaycertdialog_p.h (revision 1198898) +++ kio/kssl/kcm/displaycertdialog_p.h (working copy) @@ -17,6 +17,9 @@ 02110-1301, USA. */ +#ifndef DISPLAYCERTDIALOG_P_H +#define DISPLAYCERTDIALOG_P_H + #include "ui_displaycert.h" #include <QtNetwork/QSslCertificate> @@ -36,4 +39,5 @@ Ui::DisplayCert m_ui; QList<QSslCertificate> m_certs; int m_index; -}; \ No newline at end of file +}; +#endif // DISPLAYCERTDIALOG_P_H ++++++ flash-player-non-oss.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,15 +1,8 @@ ---- khtml/html/html_objectimpl.cpp.sav 2010-06-08 14:22:55.000000000 +0200 -+++ khtml/html/html_objectimpl.cpp 2010-06-11 14:47:25.829189290 +0200 -@@ -38,6 +38,8 @@ - #include <kmessagebox.h> - #include <kmimetype.h> - -+#include <ksuseinstall.h> -+#include <ktoolinvocation.h> - - #include "xml/dom_docimpl.h" - #include "css/cssstyleselector.h" -@@ -601,14 +603,33 @@ void HTMLObjectBaseElementImpl::slotPart +Index: khtml/html/html_objectimpl.cpp +=================================================================== +--- khtml/html/html_objectimpl.cpp.orig ++++ khtml/html/html_objectimpl.cpp +@@ -590,14 +590,32 @@ void HTMLObjectBaseElementImpl::slotPart // Prepare the URL to show in the question (host only if http, to make it short) KUrl pluginPageURL(embed->pluginPage); QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl(); @@ -17,7 +10,7 @@ - i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL), + + int res; -+ if (mime->name() == "application/x-shockwave-flash") ++ if (mimeName.startsWith("Shockwave Flash", Qt::CaseInsensitive)) + { + res = KMessageBox::questionYesNo( part->view(), + i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, "openSUSE"), @@ -25,10 +18,9 @@ - if (res == KMessageBox::Yes) + if (res == KMessageBox::Yes) + { -+ if( KSUSEInstall::installCapabilities( QStringList() << "flash-player", KSUSEInstall::FullInstallRequired, part->view())) -+ { -+ KToolInvocation::kdeinitExecWait("nspluginscan"); -+ } ++ // Open YMP file ++ KUrl ymp_flash("http://download.opensuse.org/YaST/flash-player.ymp"); ++ ext->openUrlRequest(ymp_flash); + return; + } + } @@ -49,23 +41,3 @@ } } } ---- khtml/CMakeLists.txt.sav 2010-06-08 14:23:04.000000000 +0200 -+++ khtml/CMakeLists.txt 2010-06-11 13:39:05.035122837 +0200 -@@ -441,6 +441,8 @@ include_directories( ${KDE4_PHONON_INCLU - include_directories( ${CMAKE_BINARY_DIR}/kio/kssl ) - include_directories( ${KDE4_KJS_INCLUDES} ${CMAKE_SOURCE_DIR}/kimgio ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor) - -+include_directories( ${CMAKE_SOURCE_DIR}/suseinstall ) -+ - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/misc - ${CMAKE_CURRENT_SOURCE_DIR}/dom -@@ -537,6 +539,8 @@ kde4_add_library(khtml SHARED ${khtml_LI - target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES}) - target_link_libraries(khtml LINK_INTERFACE_LIBRARIES kparts kjs kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) - -+target_link_libraries(khtml ksuseinstall) -+ - set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} - SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} - ) ++++++ hotplug-kde3.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,13 +1,13 @@ Index: kdecore/services/kservice.cpp =================================================================== ---- kdecore/services/kservice.cpp.orig -+++ kdecore/services/kservice.cpp -@@ -104,6 +104,8 @@ void KServicePrivate::init( const KDeskt +--- kdecore/services/kservice.cpp 2010-11-19 22:23:06.671000015 +0100 ++++ kdecore/services/kservice.cpp 2010-11-19 22:25:37.760000017 +0100 +@@ -106,6 +106,8 @@ m_bValid = false; return;*/ - m_strType = "Application"; -+ if( entryPath.contains( "/konqueror/servicemenus" )) -+ m_strType = "Service"; // workaround for bnc#378338, KDE3 entries there miss Type= - } else if ( m_strType != "Application" && m_strType != "Service" ) - { + m_strType = QString::fromLatin1("Application"); ++ if( entryPath.contains( QLatin1String("/konqueror/servicemenus") )) ++ m_strType = QLatin1String("Service"); // workaround for bnc#378338, KDE3 entries there miss Type= + } else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")) { kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath + << " has Type=" << m_strType ++++++ kde3-applications.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,31 +1,31 @@ ---- kdecore/services/kservice.cpp -+++ kdecore/services/kservice.cpp -@@ -62,6 +62,8 @@ +--- kdecore/services/kservice.cpp 2010-11-05 11:48:29.000000000 +0100 ++++ kdecore/services/kservice.cpp 2010-11-19 22:21:52.252000017 +0100 +@@ -64,6 +64,8 @@ { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); -+ bool kde3application = config->fileName().startsWith("/opt/kde3/share/applications/kde/") -+ || config->fileName().startsWith("/opt/kde3/share/autostart/"); ++ bool kde3application = config->fileName().startsWith(QLatin1String("/opt/kde3/share/applications/kde/")) ++ || config->fileName().startsWith(QLatin1String("/opt/kde3/share/autostart/")); // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); -@@ -89,6 +91,8 @@ +@@ -91,6 +93,8 @@ if (i != -1) m_strName = m_strName.left(i); } + if (kde3application) -+ m_strName += "/KDE3"; ++ m_strName += QLatin1String("/KDE3"); m_strType = config->readType(); - entryMap.remove("Type"); -@@ -112,6 +116,18 @@ + entryMap.remove(QLatin1String("Type")); +@@ -113,6 +117,18 @@ // NOT readPathEntry, it is not XDG-compliant. Path entries written by // KDE4 will be still treated as such, though. m_strExec = desktopGroup.readEntry( "Exec", QString() ); -+ if (kde3application && !m_strExec.startsWith("/")) -+ m_strExec = "/opt/kde3/bin/"+m_strExec; -+ else if (desktopGroup.readEntry("X-KDE-SubstituteUID"), false) { -+ int space = m_strExec.indexOf(" "); ++ if (kde3application && !m_strExec.startsWith(QLatin1String("/"))) ++ m_strExec = QLatin1String("/opt/kde3/bin/")+m_strExec; ++ else if (desktopGroup.readEntry(QLatin1String("X-KDE-SubstituteUID")), false) { ++ int space = m_strExec.indexOf(QLatin1String(" ")); + if (space==-1) + m_strExec = KStandardDirs::findExe(m_strExec); + else { @@ -34,36 +34,35 @@ + } + } + - entryMap.remove("Exec"); + entryMap.remove(QLatin1String("Exec")); - if ( m_strType == "Application" ) { -@@ -215,6 +231,9 @@ - m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); - entryMap.remove("InitialPreference"); + if (m_strType == QLatin1String("Application")) { +@@ -215,6 +231,8 @@ + m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); + entryMap.remove(QLatin1String("InitialPreference")); + if (kde3application) + m_initialPreference = 1; -+ + // Assign the "initial preference" to each mimetype/servicetype // (and to set such preferences in memory from kbuildsycoca) - m_serviceTypes.reserve(lstServiceTypes.size()); -@@ -255,6 +274,8 @@ +@@ -256,6 +274,8 @@ m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); + if (kde3application) -+ m_strDesktopEntryName = "kde-" + m_strDesktopEntryName; ++ m_strDesktopEntryName = QLatin1String("kde-") + m_strDesktopEntryName; m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); - entryMap.remove("AllowDefault"); -@@ -274,7 +295,9 @@ + entryMap.remove(QLatin1String("AllowDefault")); +@@ -275,7 +295,9 @@ // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.constBegin(); for( ; it != entryMap.constEnd();++it) { - const QString key = it.key(); + QString key = it.key(); -+ if (kde3application && key=="OnlyShowIn" && QVariant(*it)=="KDE;") -+ key = "NotShowIn"; ++ if (kde3application && key==QLatin1String("OnlyShowIn") && QVariant(*it)==QLatin1String("KDE;")) ++ key = QLatin1String("NotShowIn"); // do not store other translations like Name[fr]; kbuildsycoca will rerun if we change languages anyway - if (!key.contains('[')) { + if (!key.contains(QLatin1Char('['))) { //kDebug(servicesDebugArea()) << " Key =" << key << " Data =" << *it; ++++++ kdelibs-4.5.3.tar.bz2 -> kdelibs-4.5.80.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.5.3.tar.bz2 kdelibs4/kdelibs-4.5.80.tar.bz2 differ: char 11, line 1 ++++++ ksuseinstall.diff ++++++ ++++ 1885 lines (skipped) ++++ between KDE/kdelibs4/ksuseinstall.diff ++++ and kdelibs4/ksuseinstall.diff ++++++ ksuseinstall_11.2.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,11 +1,13 @@ ---- suseinstall/ksuseinstall.cpp.v1 2010-06-01 14:49:29.000000000 +0200 -+++ suseinstall/ksuseinstall.cpp 2010-06-01 14:52:40.000000000 +0200 +Index: suseinstall/ksuseinstall.cpp +=================================================================== +--- suseinstall/ksuseinstall.cpp.orig ++++ suseinstall/ksuseinstall.cpp @@ -329,7 +329,7 @@ bool KSUSEInstall::tryAddRepositories( b - proc << "--attach" << QString::number( parent->window()->winId()); - proc << "--" << "yast2" << "repositories"; - // Only 11.3 and newer have the extra argument that makes all enabled repos also be refreshed (bnc#608562) --#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED -+//#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED - #ifdef HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED - proc << "refresh-enabled"; - #endif + proc << "--attach" << QString::number( parent->window()->winId()); + proc << "--" << "yast2" << "repositories"; + // Only 11.3 and newer have the extra argument that makes all enabled repos also be refreshed (bnc#608562) +-#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED ++//#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED + #ifdef HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED + proc << "refresh-enabled"; + #endif ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -32,9 +32,9 @@ /** --- plasma/corona.cpp +++ plasma/corona.cpp -@@ -192,7 +192,9 @@ +@@ -195,7 +195,9 @@ - if (pluginName.isEmpty()) { + if (pluginName.isEmpty() || pluginName == "default") { // default to the desktop containment - pluginName = "desktop"; + KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); @@ -45,7 +45,7 @@ bool loadingNull = pluginName == "null"; --- plasma/private/containment_p.h +++ plasma/private/containment_p.h -@@ -53,6 +53,7 @@ +@@ -60,6 +60,7 @@ type(Containment::NoContainmentType), showDropZoneDelayTimer(0), drawWallpaper(true), @@ -53,14 +53,14 @@ dropZoneStarted(false) { } -@@ -164,6 +165,7 @@ +@@ -183,6 +184,7 @@ QHash<KJob*, KMenu*> dropMenus; QTimer *showDropZoneDelayTimer; bool drawWallpaper : 1; + bool showToolBox : 1; bool dropZoneStarted : 1; - }; - + + enum ContainmentActionsSource { --- plasma/theme.cpp +++ plasma/theme.cpp @@ -60,7 +60,6 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit soprano for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package soprano for openSUSE:Factory checked in at Mon Nov 22 23:29:35 CET 2010. -------- --- soprano/soprano-backend-sesame.changes 2010-10-06 09:57:11.000000000 +0200 +++ soprano/soprano-backend-sesame.changes 2010-11-19 22:33:04.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 19 21:28:01 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 2.5.63 + * onto2vocabularyclass now extracts the nrl graph + * Fixed default for ServerThreads parameter to match the docu + * Additional settings to limit query time of Virtuoso + +------------------------------------------------------------------- soprano-backend-virtuoso.changes: same change soprano.changes: same change calling whatdependson for head-i586 Old: ---- soprano-2.5.0.tar.bz2 New: ---- soprano-2.5.63.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano-backend-sesame.spec ++++++ --- /var/tmp/diff_new_pack.GpCyE2/_old 2010-11-22 23:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.GpCyE2/_new 2010-11-22 23:28:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package soprano-backend-sesame (Version 2.5.0) +# spec file for package soprano-backend-sesame (Version 2.5.63) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel -BuildRequires: clucene-core-devel doxygen raptor -Version: 2.5.0 +BuildRequires: boost-devel clucene-core-devel doxygen raptor +Version: 2.5.63 Release: 1 Source: soprano-%{version}.tar.bz2 Source2: baselibs.conf soprano-backend-virtuoso.spec: same change ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.GpCyE2/_old 2010-11-22 23:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.GpCyE2/_new 2010-11-22 23:28:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package soprano (Version 2.5.0) +# spec file for package soprano (Version 2.5.63) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Summary: C++/Qt based interface library for RDF # COMMON1-BEGIN BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel -BuildRequires: clucene-core-devel doxygen raptor -Version: 2.5.0 +BuildRequires: boost-devel clucene-core-devel doxygen raptor +Version: 2.5.63 Release: 1 Source: soprano-%{version}.tar.bz2 Source2: baselibs.conf ++++++ soprano-2.5.0.tar.bz2 -> soprano-2.5.63.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/CMakeLists.txt new/soprano-2.5.63/CMakeLists.txt --- old/soprano-2.5.0/CMakeLists.txt 2010-08-06 15:11:29.000000000 +0200 +++ new/soprano-2.5.63/CMakeLists.txt 2010-09-14 14:54:33.000000000 +0200 @@ -7,7 +7,7 @@ ################## Soprano version ################################ set(CMAKE_SOPRANO_VERSION_MAJOR 2) set(CMAKE_SOPRANO_VERSION_MINOR 5) -set(CMAKE_SOPRANO_VERSION_RELEASE 0) +set(CMAKE_SOPRANO_VERSION_RELEASE 63) set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}") @@ -163,6 +163,13 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -Wpointer-arith -Wformat-security -fno-check-new -fno-common") endif(MINGW) +if(WINCE) + set(LIBRARY_TYPE STATIC) + add_definitions(-DSOPRANO_STATIC_LIBS) +else(WINCE) + set(LIBRARY_TYPE SHARED) +endif(WINCE) + ################## add subdirectories ################################ if(BUILD_CLUCENE_INDEX) @@ -201,24 +208,50 @@ ################## apidox ################################ -if(SOPRANO_BUILD_API_DOCS) - find_package(Doxygen) - - if(DOXYGEN_EXECUTABLE) - configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile) +find_package(Doxygen) - if(EXISTS ${QT_DOC_DIR}/html) - set(QTDOCS "${QT_DOC_DIR}/html") - else(EXISTS ${QT_DOC_DIR}/html) - set(QTDOCS "http://doc.trolltech.com/4.3/") - endif(EXISTS ${QT_DOC_DIR}/html) +if(DOXYGEN_EXECUTABLE) + configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile) + set(QTDOCS_ONLINE "http://doc.qt.nokia.com/latest/") + + if(EXISTS ${QT_DOC_DIR}/html) + set(QTDOCS "${QT_DOC_DIR}/html") + else(EXISTS ${QT_DOC_DIR}/html) + set(QTDOCS ${QTDOCS_ONLINE}) + endif(EXISTS ${QT_DOC_DIR}/html) + if(SOPRANO_BUILD_API_DOCS) add_custom_target( apidox ALL COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile - COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html) - endif(DOXYGEN_EXECUTABLE) -endif(SOPRANO_BUILD_API_DOCS) + COMMAND docs/html/installdox -q -l qt4.tag@${QTDOCS} docs/html/*.html + COMMENT "Building Soprano API docs...") + else(SOPRANO_BUILD_API_DOCS) + add_custom_target( + apidox + COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile + COMMAND docs/html/installdox -q -l qt4.tag@${QTDOCS} docs/html/*.html + COMMENT "Building Soprano API docs...") + endif(SOPRANO_BUILD_API_DOCS) + + add_custom_target( + onlineapidox + COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile + COMMAND docs/html/installdox -q -l qt4.tag@${QTDOCS_ONLINE} docs/html/*.html + COMMENT "Building Soprano API docs...") + + add_custom_target( + stabledox + COMMAND rsync -zrtq docs/html/ $ENV{USER},soprano@web.sf.net:/home/groups/s/so/soprano/htdocs/apidox/stable + DEPENDS onlineapidox + COMMENT "Uploading stable API docs to Sourceforge...") + + add_custom_target( + trunkdox + COMMAND rsync -zrtq docs/html/ $ENV{USER},soprano@web.sf.net:/home/groups/s/so/soprano/htdocs/apidox/trunk + DEPENDS onlineapidox + COMMENT "Uploading trunk API docs to Sourceforge...") +endif(DOXYGEN_EXECUTABLE) ################## status messages ################################ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/ChangeLog new/soprano-2.5.63/ChangeLog --- old/soprano-2.5.0/ChangeLog 2010-07-26 13:51:14.000000000 +0200 +++ new/soprano-2.5.63/ChangeLog 2010-08-27 18:30:39.000000000 +0200 @@ -1,3 +1,7 @@ +2.6.0 + * Fixed handling of xsd:boolean in SPARQL queries in the Virtuoso backend + * Added new parameter for the Virtuoso backend: QueryTimeout allows to set a maximum query exeution time. + 2.5.0 * New public qHash method for Statement * New Node::fromN3 method and operator>> which allows to parse nodes from N3 encoding. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/Doxyfile.cmake new/soprano-2.5.63/Doxyfile.cmake --- old/soprano-2.5.0/Doxyfile.cmake 2010-05-24 19:23:57.000000000 +0200 +++ new/soprano-2.5.63/Doxyfile.cmake 2010-08-18 16:29:59.000000000 +0200 @@ -31,7 +31,6 @@ JAVADOC_AUTOBRIEF = NO QT_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 4 @@ -75,7 +74,7 @@ #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -QUIET = NO +QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/sesame2/sesame2backend.cpp new/soprano-2.5.63/backends/sesame2/sesame2backend.cpp --- old/soprano-2.5.0/backends/sesame2/sesame2backend.cpp 2008-08-13 19:06:47.000000000 +0200 +++ new/soprano-2.5.63/backends/sesame2/sesame2backend.cpp 2010-09-03 23:01:48.000000000 +0200 @@ -84,7 +84,7 @@ // FIXME: support inference option - Q_FOREACH( BackendSetting s, settings ) { + Q_FOREACH( const BackendSetting& s, settings ) { if ( s.option() == BackendOptionUser ) { // no user options ATM qDebug() << "(Soprano::Sesame2::BackendPlugin) no user options supported."; @@ -138,7 +138,7 @@ bool Soprano::Sesame2::BackendPlugin::deleteModelData( const BackendSettings& settings ) const { QString path; - Q_FOREACH( BackendSetting s, settings ) { + Q_FOREACH( const BackendSetting& s, settings ) { if ( s.option() == BackendOptionStorageDir ) { path = s.value().toString(); break; @@ -153,7 +153,7 @@ // FIXME: is there a way to get the actual list of files QDir dir( path ); QStringList files = dir.entryList( QStringList() << "triples*" << "namespaces*" << "values*", QDir::Files ); - foreach( QString file, files ) { + foreach( const QString& file, files ) { if ( !dir.remove( file ) ) { setError( "Failed to remove file '" + dir.filePath( file ), Error::ErrorUnknown ); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/Virtuoso.dox new/soprano-2.5.63/backends/virtuoso/Virtuoso.dox --- old/soprano-2.5.0/backends/virtuoso/Virtuoso.dox 2010-02-11 12:02:36.000000000 +0100 +++ new/soprano-2.5.63/backends/virtuoso/Virtuoso.dox 2010-08-27 18:30:39.000000000 +0200 @@ -33,6 +33,8 @@ * - \c forcedstart - A boolean property which when set will result in the backend killing any Virtuoso instance accessing the * data in the storage dir before starting its own instance. This option is ignored when connecting to an already * running Virtuoso server. + * - \c QueryTimeout - The maximum time any query may take in milliseconds. See <a href="http://docs.openlinksw.com/virtuoso/anytimequeries.html"> + * Virtuoso Anytime Queries</a> for details. * * The settings above are user settings and have to be provided using Soprano::BackendOptionUser: * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool.cpp new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool.cpp --- old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool.cpp 2010-04-12 13:52:55.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool.cpp 2010-08-27 18:30:39.000000000 +0200 @@ -81,17 +81,30 @@ conn->d->m_env = env; conn->d->m_hdbc = hdbc; conn->d->m_pool = this; + + // run the setup commands + Q_FOREACH( const QString& command, m_connectionSetupCommands ) { + if ( conn->executeCommand( command ) != Error::ErrorNone ) { + setError( conn->lastError() ); + delete conn; + return 0; + } + } + return conn; } -Soprano::ODBC::ConnectionPool::ConnectionPool( const QString& odbcConnectString, QObject* parent ) +Soprano::ODBC::ConnectionPool::ConnectionPool( const QString& odbcConnectString, + const QStringList& connectionSetupCommands, + QObject* parent ) : QObject( parent ), d( new ConnectionPoolPrivate() ) { qDebug() << Q_FUNC_INFO << odbcConnectString; d->m_odbcConnectString = odbcConnectString; + d->m_connectionSetupCommands = connectionSetupCommands; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool.h new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool.h --- old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool.h 2009-11-21 13:47:29.000000000 +0100 +++ new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool.h 2010-08-27 18:30:39.000000000 +0200 @@ -1,7 +1,7 @@ /* * This file is part of Soprano Project * - * Copyright (C) 2009 Sebastian Trueg <trueg(a)kde.org> + * Copyright (C) 2009-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,6 +26,8 @@ #include "error.h" +class QStringList; + namespace Soprano { namespace ODBC { @@ -37,7 +39,9 @@ Q_OBJECT public: - ConnectionPool( const QString& odbcConnectString, QObject* parent = 0 ); + ConnectionPool( const QString& odbcConnectString, + const QStringList& connectionSetupCommands, + QObject* parent = 0 ); ~ConnectionPool(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool_p.h new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool_p.h --- old/soprano-2.5.0/backends/virtuoso/odbcconnectionpool_p.h 2009-10-09 17:51:53.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/odbcconnectionpool_p.h 2010-08-27 18:30:39.000000000 +0200 @@ -1,7 +1,7 @@ /* * This file is part of Soprano Project * - * Copyright (C) 2009 Sebastian Trueg <trueg(a)kde.org> + * Copyright (C) 2009-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,6 +26,7 @@ #include <QtCore/QHash> #include <QtCore/QMutex> +#include <QtCore/QStringList> class QThread; @@ -39,6 +40,7 @@ { public: QString m_odbcConnectString; + QStringList m_connectionSetupCommands; QHash<QThread*, Connection*> m_openConnections; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/odbcqueryresult.cpp new/soprano-2.5.63/backends/virtuoso/odbcqueryresult.cpp --- old/soprano-2.5.0/backends/virtuoso/odbcqueryresult.cpp 2010-05-28 20:28:45.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/odbcqueryresult.cpp 2010-09-04 01:46:42.000000000 +0200 @@ -334,7 +334,7 @@ } } else { - setError( Virtuoso::convertSqlError( SQL_HANDLE_STMT, d->m_hstmt, QLatin1String( "SQLGetData for data lenght failed" ) ) ); + setError( Virtuoso::convertSqlError( SQL_HANDLE_STMT, d->m_hstmt, QLatin1String( "SQLGetData for data length failed" ) ) ); return false; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosobackend.cpp new/soprano-2.5.63/backends/virtuoso/virtuosobackend.cpp --- old/soprano-2.5.0/backends/virtuoso/virtuosobackend.cpp 2010-08-02 16:05:34.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosobackend.cpp 2010-08-27 18:30:39.000000000 +0200 @@ -1,7 +1,7 @@ /* * This file is part of Soprano Project * - * Copyright (C) 2008-2009 Sebastian Trueg <trueg(a)kde.org> + * Copyright (C) 2008-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -55,6 +55,7 @@ QString pwd = valueInSettings( settings, BackendOptionPassword ).toString(); QString path = valueInSettings( settings, BackendOptionStorageDir ).toString(); bool debugMode = valueInSettings( settings, BackendOptionUser, QLatin1String( "debugmode" ) ).toBool(); + int queryTimeout = valueInSettings( settings, QLatin1String( "QueryTimeout" ), 0 ).toInt(); VirtuosoController* controller = 0; if ( host.isEmpty() && @@ -80,20 +81,24 @@ pwd = "dba"; } - QString driverPath = findVirtuosoDriver(); - if ( driverPath.isEmpty() ) { +#ifdef Q_OS_WIN + const QString odbcDriver = QLatin1String( "{Virtuoso (Open Source)}" ); +#else + const QString odbcDriver = findVirtuosoDriver(); + if ( odbcDriver.isEmpty() ) { setError( "Could not find Virtuoso ODBC driver" ); return 0; } - -#ifdef Q_OS_WIN - QString connectString = QString( "driver={Virtuoso (Open Source)};host=%1:%2;uid=%3;pwd=%4" ) - .arg( host, QString::number( port ), uid, pwd ); -#else - QString connectString = QString( "host=%1:%2;uid=%3;pwd=%4;driver=%5" ) - .arg( host, QString::number( port ), uid, pwd, driverPath ); #endif - ODBC::ConnectionPool* connectionPool = new ODBC::ConnectionPool( connectString ); + + const QString connectString = QString( "host=%1:%2;uid=%3;pwd=%4;driver=%5" ) + .arg( host, QString::number( port ), uid, pwd, odbcDriver ); + QStringList connectionSetupCommands; + if ( queryTimeout > 1000 ) { + connectionSetupCommands << QString::fromLatin1( "set result_timeout=%1" ).arg( queryTimeout ); + } + + ODBC::ConnectionPool* connectionPool = new ODBC::ConnectionPool( connectString, connectionSetupCommands ); // FIXME: should configuration only be allowed on spawned servers? if ( ODBC::Connection* conn = connectionPool->connection() ) { @@ -183,10 +188,12 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const { +#ifndef Q_OS_WIN if ( findVirtuosoDriver().isEmpty() ) { qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; return false; } +#endif QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); if ( virtuosoBin.isEmpty() ) { @@ -209,19 +216,11 @@ } +#ifndef Q_OS_WIN QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const { -#ifdef Q_OS_WIN - QStringList virtuosoDirs; - const QString virtuosoHome = QDir::fromNativeSeparators( qgetenv("VIRTUOSO_HOME") ); - if ( !virtuosoHome.isEmpty() ) { - virtuosoDirs << virtuosoHome + QLatin1String("/bin") - << virtuosoHome + QLatin1String("/lib"); - } - return Soprano::findLibraryPath( "virtodbc", virtuosoDirs ); -#else return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); -#endif } +#endif #include "virtuosobackend.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosobackend.h new/soprano-2.5.63/backends/virtuoso/virtuosobackend.h --- old/soprano-2.5.0/backends/virtuoso/virtuosobackend.h 2009-10-09 17:51:53.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosobackend.h 2010-08-19 10:09:36.000000000 +0200 @@ -48,8 +48,10 @@ BackendFeatures supportedFeatures() const; bool isAvailable() const; +#ifndef Q_OS_WIN private: QString findVirtuosoDriver() const; +#endif }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosocontroller.cpp new/soprano-2.5.63/backends/virtuoso/virtuosocontroller.cpp --- old/soprano-2.5.0/backends/virtuoso/virtuosocontroller.cpp 2010-06-10 15:02:52.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosocontroller.cpp 2010-09-14 14:56:53.000000000 +0200 @@ -138,6 +138,9 @@ #endif qDebug() << "Starting Virtuoso server:" << virtuosoExe << args; + // We need to set the working directory cause virtuoso creates a temp checkpoint_in_progress file + // in the directory it was started. + m_virtuosoProcess.setWorkingDirectory( storageDir ); m_virtuosoProcess.start( virtuosoExe, args, QIODevice::ReadOnly ); m_virtuosoProcess.setReadChannel( QProcess::StandardError ); m_virtuosoProcess.closeReadChannel( QProcess::StandardOutput ); @@ -274,10 +277,11 @@ // backwards compatibility int numberOfBuffers = valueInSettings( settings, "buffers", 2000 ).toInt(); - int numberOfThreads = valueInSettings( settings, "threads", 10 ).toInt(); + int numberOfThreads = valueInSettings( settings, "threads", 100 ).toInt(); numberOfBuffers = valueInSettings( settings, "NumberOfBuffers", numberOfBuffers ).toInt(); numberOfThreads = valueInSettings( settings, "ServerThreads", numberOfThreads ).toInt(); + int maxDirtyBuffers = valueInSettings( settings, "MaxDirtyBuffers", numberOfBuffers*2/3 ).toInt(); int checkpointInterval = valueInSettings( settings, "CheckpointInterval", -1 ).toInt(); int minAutoCheckpointSize = valueInSettings( settings, "MinAutoCheckpointSize", -1 ).toInt(); @@ -328,7 +332,7 @@ cfs.setValue( "NumberOfBuffers", numberOfBuffers ); // down from 1200 - cfs.setValue( "MaxDirtyBuffers", "50" ); + cfs.setValue( "MaxDirtyBuffers", maxDirtyBuffers ); // down from 10 cfs.setValue( "SchedulerInterval", "5" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosomodel.cpp new/soprano-2.5.63/backends/virtuoso/virtuosomodel.cpp --- old/soprano-2.5.0/backends/virtuoso/virtuosomodel.cpp 2010-07-22 10:44:33.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosomodel.cpp 2010-08-31 15:55:01.000000000 +0200 @@ -106,10 +106,45 @@ } +Soprano::QueryResultIterator Soprano::VirtuosoModelPrivate::sparqlQuery( const QString& query ) +{ + QString finalQuery( query ); + finalQuery.prepend( QLatin1String( s_queryPrefix ) + ' ' ); + +// qDebug() << Q_FUNC_INFO << finalQuery; + + if ( ODBC::Connection* conn = connectionPool->connection() ) { + ODBC::QueryResult* result = conn->executeQuery( finalQuery ); + if ( result ) { + q->clearError(); + Virtuoso::QueryResultIteratorBackend* backend = new Virtuoso::QueryResultIteratorBackend( this, result ); + return backend; + } + else { + qDebug() << "Query failed:" << finalQuery; + q->setError( conn->lastError() ); + return 0; + } + } + else { + q->setError( connectionPool->lastError() ); + return 0; + } +} + + +QString Soprano::VirtuosoModelPrivate::replaceFakeTypesInQuery( const QString& query ) +{ + QMutexLocker lock( &m_fakeBooleanRegExpMutex ); + return QString(query).replace( m_fakeBooleanRegExp, QString::fromLatin1("'\\2'^^<%1>").arg( Virtuoso::fakeBooleanTypeString() ) ); +} + + Soprano::VirtuosoModel::VirtuosoModel( ODBC::ConnectionPool* connectionPool, const Backend* b ) : StorageModel(b), d( new VirtuosoModelPrivate() ) { + d->q = this; d->connectionPool = connectionPool; } @@ -176,11 +211,11 @@ { // qDebug() << Q_FUNC_INFO; - return executeQuery( QString::fromLatin1( "select distinct ?g where { " - "graph ?g { ?s ?p ?o . } . " - "FILTER(?g != <%1> && ?g != <%2>) . }" ) - .arg( QLatin1String( Virtuoso::defaultGraphString() ), - QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ) + return d->sparqlQuery( QString::fromLatin1( "select distinct ?g where { " + "graph ?g { ?s ?p ?o . } . " + "FILTER(?g != <%1> && ?g != <%2>) . }" ) + .arg( QLatin1String( Virtuoso::defaultGraphString() ), + QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ) .iterateBindings( 0 ); } @@ -217,7 +252,7 @@ // return b; // } // return false; - return executeQuery( query, Query::QueryLanguageSparql ).boolValue(); + return d->sparqlQuery( query ).boolValue(); } @@ -235,7 +270,7 @@ .arg( statementToConstructGraphPattern( partial, true ), QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ); // qDebug() << "List Statements Query" << query; - return executeQuery( query, Query::QueryLanguageSparql ) + return d->sparqlQuery( query ) .iterateStatementsFromBindings( partial.subject().isValid() ? QString() : QString( 's' ), partial.predicate().isValid() ? QString() : QString( 'p' ), partial.object().isValid() ? QString() : QString( 'o' ), @@ -321,9 +356,9 @@ } else { // FIXME: do this in a fancy way, maybe an inner sql query or something - QList<Node> allContexts = executeQuery( QString::fromLatin1( "select distinct ?g where { %1 . FILTER(?g != <%2>) . }" ) - .arg( statementToConstructGraphPattern( statement, true ), - QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ) + QList<Node> allContexts = d->sparqlQuery( QString::fromLatin1( "select distinct ?g where { %1 . FILTER(?g != <%2>) . }" ) + .arg( statementToConstructGraphPattern( statement, true ), + QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ) .iterateBindings( 0 ).allNodes(); foreach( const Node& node, allContexts ) { Statement s( statement ); @@ -378,10 +413,10 @@ { // qDebug() << Q_FUNC_INFO; - QueryResultIterator it = executeQuery( QString::fromLatin1( "select count(*) where { " - "graph ?g { ?s ?p ?o . } . " - "FILTER(?g != <%1>) . }" ) - .arg( QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ); + QueryResultIterator it = d->sparqlQuery( QString::fromLatin1( "select count(*) where { " + "graph ?g { ?s ?p ?o . } . " + "FILTER(?g != <%1>) . }" ) + .arg( QLatin1String( Virtuoso::openlinkVirtualGraphString() ) ) ); if ( it.isValid() && it.next() ) { return it.binding( 0 ).literal().toInt(); } @@ -402,37 +437,13 @@ Query::QueryLanguage language, const QString& userQueryLanguage ) const { -// qDebug() << Q_FUNC_INFO << query; - - QString finalQuery( query ); - if ( language != Soprano::Query::QueryLanguageSparql ) { setError( Error::Error( QString::fromLatin1( "Unsupported query language %1." ) .arg( Query::queryLanguageToString( language, userQueryLanguage ) ) ) ); return QueryResultIterator(); } - finalQuery.prepend( QLatin1String( s_queryPrefix ) + ' ' ); - -// qDebug() << Q_FUNC_INFO << finalQuery; - - if ( ODBC::Connection* conn = d->connectionPool->connection() ) { - ODBC::QueryResult* result = conn->executeQuery( finalQuery ); - if ( result ) { - clearError(); - Virtuoso::QueryResultIteratorBackend* backend = new Virtuoso::QueryResultIteratorBackend( d, result ); - return backend; - } - else { - qDebug() << "Query failed:" << finalQuery; - setError( conn->lastError() ); - return 0; - } - } - else { - setError( d->connectionPool->lastError() ); - return 0; - } + return d->sparqlQuery( d->replaceFakeTypesInQuery( query ) ); } #include "virtuosomodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosomodel.h new/soprano-2.5.63/backends/virtuoso/virtuosomodel.h --- old/soprano-2.5.0/backends/virtuoso/virtuosomodel.h 2009-10-09 17:51:53.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosomodel.h 2010-08-31 15:55:01.000000000 +0200 @@ -1,7 +1,7 @@ /* * This file is part of Soprano Project * - * Copyright (C) 2008 Sebastian Trueg <trueg(a)kde.org> + * Copyright (C) 2008-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -57,6 +57,8 @@ private: VirtuosoModelPrivate* const d; + + friend class VirtuosoModelPrivate; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/backends/virtuoso/virtuosomodel_p.h new/soprano-2.5.63/backends/virtuoso/virtuosomodel_p.h --- old/soprano-2.5.0/backends/virtuoso/virtuosomodel_p.h 2010-07-22 10:44:33.000000000 +0200 +++ new/soprano-2.5.63/backends/virtuoso/virtuosomodel_p.h 2010-08-31 15:55:01.000000000 +0200 @@ -23,6 +23,7 @@ #define _SOPRANO_IODBC_MODEL_P_H_ #include <QtCore/QMutex> +#include <QtCore/QRegExp> #include "virtuosoqueryresultiteratorbackend.h" @@ -32,11 +33,16 @@ class ConnectionPool; } + class VirtuosoModel; + class VirtuosoModelPrivate { public: VirtuosoModelPrivate() : connectionPool( 0 ), + m_fakeBooleanRegExp( QLatin1String("([\"'])(true|false)\\1\\^\\^(<http\\://www\\.w3\\.org/2001/XMLSchema#boolean>|\\w+\\:boolean)"), + Qt::CaseInsensitive, + QRegExp::RegExp2 ), m_openIteratorMutex( QMutex::Recursive ) { } @@ -59,10 +65,19 @@ m_openIteratorMutex.unlock(); } + QueryResultIterator sparqlQuery( const QString& query ); + + QString replaceFakeTypesInQuery( const QString& query ); + ODBC::ConnectionPool* connectionPool; QList<Virtuoso::QueryResultIteratorBackend*> m_openIterators; + VirtuosoModel* q; + private: + QRegExp m_fakeBooleanRegExp; + QMutex m_fakeBooleanRegExpMutex; + QMutex m_openIteratorMutex; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/client/CMakeLists.txt new/soprano-2.5.63/client/CMakeLists.txt --- old/soprano-2.5.0/client/CMakeLists.txt 2010-08-05 19:43:46.000000000 +0200 +++ new/soprano-2.5.63/client/CMakeLists.txt 2010-08-17 17:43:38.000000000 +0200 @@ -59,7 +59,7 @@ qt4_automoc(${soprano_client_SRC}) -add_library(sopranoclient SHARED ${soprano_client_SRC}) +add_library(sopranoclient ${LIBRARY_TYPE} ${soprano_client_SRC}) set_target_properties(sopranoclient PROPERTIES VERSION 1.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/client/localsocketclient.cpp new/soprano-2.5.63/client/localsocketclient.cpp --- old/soprano-2.5.0/client/localsocketclient.cpp 2010-07-19 17:57:41.000000000 +0200 +++ new/soprano-2.5.63/client/localsocketclient.cpp 2010-09-09 17:47:55.000000000 +0200 @@ -162,7 +162,7 @@ void Soprano::Client::LocalSocketClient::disconnect() { - delete d->connection; + d->connection->deleteLater(); d->connection = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/server/CMakeLists.txt new/soprano-2.5.63/server/CMakeLists.txt --- old/soprano-2.5.0/server/CMakeLists.txt 2010-04-28 09:00:41.000000000 +0200 +++ new/soprano-2.5.63/server/CMakeLists.txt 2010-08-17 17:43:38.000000000 +0200 @@ -50,7 +50,7 @@ #qt4_automoc(${soprano_serverbackend_SRC}) -add_library(sopranoserver SHARED ${soprano_server_SRC}) +add_library(sopranoserver ${LIBRARY_TYPE} ${soprano_server_SRC}) #add_library(soprano_serverclientbackend SHARED ${soprano_serverbackend_SRC}) qt4_automoc(sopranodcore.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/server/datastream.cpp new/soprano-2.5.63/server/datastream.cpp --- old/soprano-2.5.0/server/datastream.cpp 2009-05-06 13:14:09.000000000 +0200 +++ new/soprano-2.5.63/server/datastream.cpp 2010-08-13 17:29:40.000000000 +0200 @@ -82,7 +82,7 @@ bool Soprano::DataStream::writeUnsignedInt8( quint8 v ) { - if ( m_device->write( (char*)&v, 1 ) != 1 ) { + if ( !m_device || m_device->write( (char*)&v, 1 ) != 1 ) { setError( "Failed to write unsigned int8." ); return false; } @@ -92,7 +92,7 @@ bool Soprano::DataStream::writeUnsignedInt16( quint16 v ) { - if ( m_device->write( (char*)&v, 2 ) != 2 ) { + if ( !m_device || m_device->write( (char*)&v, 2 ) != 2 ) { setError( "Failed to write unsigned int32." ); return false; } @@ -102,7 +102,7 @@ bool Soprano::DataStream::writeUnsignedInt32( quint32 v ) { - if ( m_device->write( (char*)&v, sizeof( quint32 ) ) != sizeof( quint32 ) ) { + if ( !m_device || m_device->write( (char*)&v, sizeof( quint32 ) ) != sizeof( quint32 ) ) { setError( "Failed to write unsigned int32." ); return false; } @@ -112,7 +112,7 @@ bool Soprano::DataStream::writeInt32( qint32 v ) { - if ( m_device->write( (char*)&v, sizeof( qint32 ) ) != sizeof( qint32 ) ) { + if ( !m_device || m_device->write( (char*)&v, sizeof( qint32 ) ) != sizeof( qint32 ) ) { setError( "Failed to write int32." ); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/soprano/CMakeLists.txt new/soprano-2.5.63/soprano/CMakeLists.txt --- old/soprano-2.5.0/soprano/CMakeLists.txt 2010-07-26 13:45:10.000000000 +0200 +++ new/soprano-2.5.63/soprano/CMakeLists.txt 2010-08-17 17:43:38.000000000 +0200 @@ -100,7 +100,7 @@ qt4_automoc(${soprano_SRCS}) -add_library(soprano SHARED ${soprano_SRCS}) +add_library(soprano ${LIBRARY_TYPE} ${soprano_SRCS}) target_link_libraries(soprano ${QT_QTCORE_LIBRARY}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/soprano/soprano_export.h new/soprano-2.5.63/soprano/soprano_export.h --- old/soprano-2.5.0/soprano/soprano_export.h 2007-09-29 02:06:37.000000000 +0200 +++ new/soprano-2.5.63/soprano/soprano_export.h 2010-08-17 17:43:38.000000000 +0200 @@ -26,7 +26,10 @@ #include <QtCore/QtGlobal> #ifndef SOPRANO_EXPORT -# if defined(MAKE_SOPRANO_LIB) +# if defined(SOPRANO_STATIC_LIBS) + /* No export/import for static libraries */ +# define SOPRANO_EXPORT +# elif defined(MAKE_SOPRANO_LIB) /* We are building this library */ # define SOPRANO_EXPORT Q_DECL_EXPORT # else @@ -36,7 +39,10 @@ #endif #ifndef SOPRANO_SERVER_EXPORT -# if defined(MAKE_SOPRANO_SERVER_LIB) +# if defined(SOPRANO_STATIC_LIBS) + /* No export/import for static libraries */ +# define SOPRANO_SERVER_EXPORT +# elif defined(MAKE_SOPRANO_SERVER_LIB) /* We are building this library */ # define SOPRANO_SERVER_EXPORT Q_DECL_EXPORT # else @@ -46,7 +52,10 @@ #endif #ifndef SOPRANO_CLIENT_EXPORT -# if defined(MAKE_SOPRANO_CLIENT_LIB) +# if defined(SOPRANO_STATIC_LIBS) + /* No export/import for static libraries */ +# define SOPRANO_CLIENT_EXPORT +# elif defined(MAKE_SOPRANO_CLIENT_LIB) /* We are building this library */ # define SOPRANO_CLIENT_EXPORT Q_DECL_EXPORT # else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/soprano/statement.h new/soprano-2.5.63/soprano/statement.h --- old/soprano-2.5.0/soprano/statement.h 2010-06-13 17:42:17.000000000 +0200 +++ new/soprano-2.5.63/soprano/statement.h 2010-08-18 16:29:30.000000000 +0200 @@ -163,6 +163,10 @@ class Private; QSharedDataPointer<Private> d; }; + + /** + * \relates Soprano::Statement + */ SOPRANO_EXPORT uint qHash( const Statement& s ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/soprano/vocabulary/nao.cpp new/soprano-2.5.63/soprano/vocabulary/nao.cpp --- old/soprano-2.5.0/soprano/vocabulary/nao.cpp 2009-01-19 17:12:25.000000000 +0100 +++ new/soprano-2.5.63/soprano/vocabulary/nao.cpp 2010-08-18 16:22:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file has been generated by the onto2vocabularyclass tool - * copyright (C) 2007-2008 Sebastian Trueg <trueg(a)kde.org> + * copyright (C) 2007-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -35,6 +35,7 @@ nao_contributor( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#contributor", QUrl::StrictMode ) ), nao_created( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#created", QUrl::StrictMode ) ), nao_creator( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#creator", QUrl::StrictMode ) ), + nao_deprecated( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#deprecated", QUrl::StrictMode ) ), nao_description( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#description", QUrl::StrictMode ) ), nao_engineeringTool( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#engineeringTool", QUrl::StrictMode ) ), nao_hasDefaultNamespace( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#hasDefaultNamespace", QUrl::StrictMode ) ), @@ -46,6 +47,7 @@ nao_hasTopic( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#hasTopic", QUrl::StrictMode ) ), nao_iconName( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#iconName", QUrl::StrictMode ) ), nao_identifier( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#identifier", QUrl::StrictMode ) ), + nao_isDataGraphFor( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isDataGraphFor", QUrl::StrictMode ) ), nao_isRelated( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isRelated", QUrl::StrictMode ) ), nao_isTagFor( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isTagFor", QUrl::StrictMode ) ), nao_isTopicOf( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isTopicOf", QUrl::StrictMode ) ), @@ -61,6 +63,7 @@ nao_scoreParameter( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#scoreParameter", QUrl::StrictMode ) ), nao_serializationLanguage( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#serializationLangu…", QUrl::StrictMode ) ), nao_status( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#status", QUrl::StrictMode ) ), + nao_userVisible( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#userVisible", QUrl::StrictMode ) ), nao_version( QUrl::fromEncoded( "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#version", QUrl::StrictMode ) ) { } @@ -75,6 +78,7 @@ QUrl nao_contributor; QUrl nao_created; QUrl nao_creator; + QUrl nao_deprecated; QUrl nao_description; QUrl nao_engineeringTool; QUrl nao_hasDefaultNamespace; @@ -86,6 +90,7 @@ QUrl nao_hasTopic; QUrl nao_iconName; QUrl nao_identifier; + QUrl nao_isDataGraphFor; QUrl nao_isRelated; QUrl nao_isTagFor; QUrl nao_isTopicOf; @@ -101,6 +106,7 @@ QUrl nao_scoreParameter; QUrl nao_serializationLanguage; QUrl nao_status; + QUrl nao_userVisible; QUrl nao_version; }; @@ -161,6 +167,11 @@ return s_nao()->nao_creator; } +QUrl Soprano::Vocabulary::NAO::deprecated() +{ + return s_nao()->nao_deprecated; +} + QUrl Soprano::Vocabulary::NAO::description() { return s_nao()->nao_description; @@ -216,6 +227,11 @@ return s_nao()->nao_identifier; } +QUrl Soprano::Vocabulary::NAO::isDataGraphFor() +{ + return s_nao()->nao_isDataGraphFor; +} + QUrl Soprano::Vocabulary::NAO::isRelated() { return s_nao()->nao_isRelated; @@ -291,6 +307,11 @@ return s_nao()->nao_status; } +QUrl Soprano::Vocabulary::NAO::userVisible() +{ + return s_nao()->nao_userVisible; +} + QUrl Soprano::Vocabulary::NAO::version() { return s_nao()->nao_version; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/soprano/vocabulary/nao.h new/soprano-2.5.63/soprano/vocabulary/nao.h --- old/soprano-2.5.0/soprano/vocabulary/nao.h 2009-01-19 17:12:25.000000000 +0100 +++ new/soprano-2.5.63/soprano/vocabulary/nao.h 2010-08-18 16:22:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file has been generated by the onto2vocabularyclass tool - * copyright (C) 2007-2008 Sebastian Trueg <trueg(a)kde.org> + * copyright (C) 2007-2010 Sebastian Trueg <trueg(a)kde.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -106,6 +106,15 @@ SOPRANO_EXPORT QUrl creator(); /** + * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#deprecated + * + * If this property is assigned, the subject class, property, + * or resource, is deprecated and should not be used in production + * systems any longer. It may be removed without further notice. + */ + SOPRANO_EXPORT QUrl deprecated(); + + /** * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#description * * A non-technical textual annotation for a resource @@ -187,6 +196,16 @@ SOPRANO_EXPORT QUrl identifier(); /** + * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isDataGraphFor + * + * Links a named graph to the resource for which it contains metadata. + * Its typical usage would be to link the graph containing extracted + * file metadata to the file resource. This allows for easy maintenance + * later on. + */ + SOPRANO_EXPORT QUrl isDataGraphFor(); + + /** * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isRelated * * Defines an annotation for a resource in the form of a relationship @@ -270,7 +289,7 @@ /** * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#score * - * An authorative score for an item valued between 0 and 1 + * An authoritative score for an item valued between 0 and 1 */ SOPRANO_EXPORT QUrl score(); @@ -300,6 +319,15 @@ SOPRANO_EXPORT QUrl status(); /** + * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#userVisible + * + * Mark a property, class, or even resource as user visible or not. + * Non-user-visible entities should never be presented to the + * user. By default everything is user-visible. + */ + SOPRANO_EXPORT QUrl userVisible(); + + /** * http://www.semanticdesktop.org/ontologies/2007/08/15/nao#version * * Specifies the version of a graph, in numeric format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.5.0/tools/onto2vocabularyclass.cpp new/soprano-2.5.63/tools/onto2vocabularyclass.cpp --- old/soprano-2.5.0/tools/onto2vocabularyclass.cpp 2010-01-24 18:14:08.000000000 +0100 +++ new/soprano-2.5.63/tools/onto2vocabularyclass.cpp 2010-09-14 14:54:33.000000000 +0200 @@ -64,7 +64,7 @@ " */\n"; -#define VERSION "0.2" +#define VERSION "1.1" int version() { @@ -330,8 +330,8 @@ return 1; } - // We simplify and take it as granted that all resources have the same NS QString ontoNamespace; + // We simplify and take it as granted that all resources have the same NS QUrl namespaceUri( normalizedResources.constBegin().key() ); if ( namespaceUri.hasFragment() ) { namespaceUri.setFragment( QString() ); @@ -341,6 +341,13 @@ ontoNamespace = namespaceUri.toString().section( "/", 0, -2 ) + '/'; } qDebug() << "namespace: " << ontoNamespace; + + QUrl nrlGraph; + it = graph.listStatements( Node(), Vocabulary::RDF::type(), Vocabulary::NRL::Ontology() ); + if ( it.next() ) { + nrlGraph = it.current().subject().uri(); + it.close(); + } // ---------------------------------------------------- @@ -378,6 +385,17 @@ headerStream << QString( "%1_EXPORT " ).arg(exportModule.toUpper()); headerStream << "QUrl " << className.toLower() << "Namespace();" << endl << endl; + // the NRL graph + if ( !nrlGraph.isEmpty() ) { + headerStream << createIndent( indent ) << "/**" << endl + << createIndent( indent ) << " * " << nrlGraph.toString() << endl + << createIndent( indent ) << " */" << endl; + headerStream << createIndent( indent ); + if ( visibilityExport ) + headerStream << QString( "%1_EXPORT " ).arg(exportModule.toUpper()); + headerStream << "QUrl nrlOntologyGraph();" << endl << endl; + } + for( QMap<QString, QPair<QString, QString> >::const_iterator it = normalizedResources.constBegin(); it != normalizedResources.constEnd(); ++it ) { QString uri = it.key(); @@ -427,6 +445,9 @@ sourceStream << className.toLower() << "_namespace( QUrl::fromEncoded( \"" << ontoNamespace << "\", QUrl::StrictMode ) )," << endl; + if ( !nrlGraph.isEmpty() ) + sourceStream << createIndent( 2 ) << " nrlOntologyGraph( QUrl::fromEncoded( \"" << nrlGraph.toString() << "\", QUrl::StrictMode ) )," << endl; + for( QMap<QString, QPair<QString, QString> >::const_iterator it = normalizedResources.constBegin(); it != normalizedResources.constEnd(); ++it ) { QString uri = it.key(); @@ -446,6 +467,9 @@ sourceStream << createIndent( 1 ) << "QUrl " << className.toLower() << "_namespace;" << endl; + if ( !nrlGraph.isEmpty() ) + sourceStream << createIndent( 1 ) << "QUrl nrlOntologyGraph;" << endl; + for( QMap<QString, QPair<QString, QString> >::const_iterator it = normalizedResources.constBegin(); it != normalizedResources.constEnd(); ++it ) { QString name = normalizeName( it.value().first ); @@ -464,6 +488,17 @@ << createIndent( 1 ) << "return " << singletonName << "()->" << className.toLower() << "_namespace;" << endl << "}" << endl << endl; + if ( !nrlGraph.isEmpty() ) { + sourceStream << "QUrl "; + if ( !namespaceName.isEmpty() ) { + sourceStream << namespaceName << "::"; + } + sourceStream << className << "::nrlOntologyGraph()" << endl + << "{" << endl + << createIndent( 1 ) << "return " << singletonName << "()->nrlOntologyGraph;" << endl + << "}" << endl << endl; + } + for( QMap<QString, QPair<QString, QString> >::const_iterator it = normalizedResources.constBegin(); it != normalizedResources.constEnd(); ++it ) { QString name = normalizeName( it.value().first ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0