Re: KF 5.6 changelog
On Thursday 08 January 2015 17:07:40 Daniel Vrátil wrote: On Saturday, January 03, 2015 02:16:30 PM David Faure wrote: With cookies to Kai Uwe Broulik for using CHANGELOG: in most of his commits! The KPackage frameworks is Tier 2 and depends on KDocTools, which is also Tier 2, which, if I read Tier 2 policy correctly, is not allowed :-) Is there a plan to move it to Tier 3, or remove the dependency? Sorry if this was discussed before. Having actually looked at the CMakeLists.txt file, KDocTools is optional. I assume that was done at least partly to allow it to be a tier 2 framework. Alex ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Review Request 120388: Do not sync if wallet file does not exist
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120388/ --- (Updated Jan. 10, 2015, 5:12 p.m.) Status -- This change has been marked as submitted. Review request for KDE Frameworks, Àlex Fiestas, Teo Mrnjavac, and Valentin Rusu. Repository: kwallet Description --- 1. Create a new wallet foo 2. immediately remove the 'kwalletd5' directory 3. `KWalletD::timedOutSync()` will call sync on a nonexistant wallet (which will create foo.kwl) Kwalletmanager still lists the wallet and new data can be added to the wallet, but this data will be lost once the wallet is closed since the salt has been deleted and therefore the wallet cannot be opened again. Diffs - src/runtime/kwalletd/backend/kwalletbackend.cc b072cec src/runtime/kwalletd/kwalletd.h b94df15 src/runtime/kwalletd/kwalletd.cpp 882eb72 Diff: https://git.reviewboard.kde.org/r/120388/diff/ Testing --- Thanks, Arjun AK ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Review Request 120878: Remove unused header
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120878/ --- (Updated Jan. 10, 2015, 4:09 p.m.) Status -- This change has been marked as submitted. Review request for KDE Frameworks, kdewin and Plasma. Repository: krunner Description --- Since scripting/runnerscript.cpp is not compiled, we get a linking error by exporting but not defining RunnerScript. Diffs - src/abstractrunner.cpp 4da0394 Diff: https://git.reviewboard.kde.org/r/120878/diff/ Testing --- Tested building using MSVC 64bit Thanks, Andrius da Costa Ribas ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Infopage in frameworkintegration
El Dissabte, 10 de gener de 2015, a les 11:43:23, Alex Merry va escriure: On Monday 07 July 2014 23:49:50 David Faure wrote: On Saturday 26 April 2014 13:26:31 Alex Merry wrote: FrameworkIntegration installs a bunch of images and css files to ${DATA_INSTALL_DIR}/kf5/infopage. LXR suggests nothing ever references an infopage directory (either in kf5-qt5 or in qt4-latest), except for the CMakeLists.txt files in frameworkintegration, and the README.md (which suggests the images are for info pages for applications). Are these for GNU Info documentation? Are they actually used anywhere? Does anyone know whether they have any use? Sounds like the stuff used by konqueror, kmail, akregator, etc. -- when they show their blue info page at startup. konqueror/about/konq_aboutpage.cc:73: res = res.arg( KStandardDirs::locate( data, kdeui/about/kde_infopage.css ) ); (not ported yet to KF5) I feel like this stuff belongs in some program resources package for non-arch (ie: not libraries or binaries) data shared between KDE applications. Sort of a KDE branding package or some such. Is it worth splitting off this stuff from frameworkintegration, and maybe putting it under Applications in the project heirarchy? Iy should totally not be in frameworkintegration since apps should just run fine without frameworkintegration. Now where it belongs i don't know :/ Cheers, Albert Alex ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Infopage in frameworkintegration
On Monday 07 July 2014 23:49:50 David Faure wrote: On Saturday 26 April 2014 13:26:31 Alex Merry wrote: FrameworkIntegration installs a bunch of images and css files to ${DATA_INSTALL_DIR}/kf5/infopage. LXR suggests nothing ever references an infopage directory (either in kf5-qt5 or in qt4-latest), except for the CMakeLists.txt files in frameworkintegration, and the README.md (which suggests the images are for info pages for applications). Are these for GNU Info documentation? Are they actually used anywhere? Does anyone know whether they have any use? Sounds like the stuff used by konqueror, kmail, akregator, etc. -- when they show their blue info page at startup. konqueror/about/konq_aboutpage.cc:73: res = res.arg( KStandardDirs::locate( data, kdeui/about/kde_infopage.css ) ); (not ported yet to KF5) I feel like this stuff belongs in some program resources package for non-arch (ie: not libraries or binaries) data shared between KDE applications. Sort of a KDE branding package or some such. Is it worth splitting off this stuff from frameworkintegration, and maybe putting it under Applications in the project heirarchy? Alex ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Review Request 121922: support stringlists as properties
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121922/#review73669 --- src/services/kplugininfo.cpp https://git.reviewboard.kde.org/r/121922/#comment51270 This says , and ; but above does only , ? - Albert Astals Cid On gen. 9, 2015, 4:52 p.m., Marco Martin wrote: --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121922/ --- (Updated gen. 9, 2015, 4:52 p.m.) Review request for KDE Frameworks. Repository: kservice Description --- if a property is defined as a StringList in a servicetype, return it as an actual stringlist upon KPluginInfo::property() instead of a string (with commas to separe the entries), having the same behavior of KService This is necessary to have the same behavior between the old KServiceTypeTrader::query() and KPluginTrader::applyConstraints because without list properties, all queries with the in keyword wouldn't work, such as org.kde.plasma.time in [X-Plasma-Provides] Diffs - src/services/kplugininfo.cpp aa5d263 Diff: https://git.reviewboard.kde.org/r/121922/diff/ Testing --- queries on list properties with in do work now Thanks, Marco Martin ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
[kde-dev-scripts] kf5: Add script to convert to new KDEInstallDirs variable names.
Git commit 98d6363ad17559b87e8b203954381727ebd305d8 by Alex Merry. Committed on 10/01/2015 at 16:23. Pushed by alexmerry into branch 'master'. Add script to convert to new KDEInstallDirs variable names. This is a separate script to adapt_cmakelists_file.pl, because it produces CMakeLists.txt files that depend on e-c-m 1.6.0 or later, and that may not be acceptable for all projects. CCMAIL: kde-buildsys...@kde.org CCMAIL: kde-frameworks-devel@kde.org M +1-1kf5/adapt_cmakelists_file.pl A +98 -0kf5/cmakelists_install_vars.pl http://commits.kde.org/kde-dev-scripts/98d6363ad17559b87e8b203954381727ebd305d8 diff --git a/kf5/adapt_cmakelists_file.pl b/kf5/adapt_cmakelists_file.pl index 0834d4e..4f4cb76 100755 --- a/kf5/adapt_cmakelists_file.pl +++ b/kf5/adapt_cmakelists_file.pl @@ -492,7 +492,7 @@ my @l = map { if (my ($begin, $end) = $_ =~ $regexp) { $_ = $begin . \${KNOTIFYRC_INSTALL_DIR} . $end . \n; $modified = 1; - } elsif (not /KNOTIFYRC_INSTALL_DIR/) { + } elsif (not /KNOTIFYRC_INSTALL_DIR/ and not /_INSTALL_KNOTIFY5RCDIR/) { my $line = $_; $line =~ s/\s*$//; print Could not fix a .notifyrc file installation call ($line)\n diff --git a/kf5/cmakelists_install_vars.pl b/kf5/cmakelists_install_vars.pl new file mode 100755 index 000..8926048 --- /dev/null +++ b/kf5/cmakelists_install_vars.pl @@ -0,0 +1,98 @@ +#!/usr/bin/perl -w + +# Alex Merry alex.me...@kde.org 2015 +# +# Modifies CMakeLists.txt in current directory to use the new (as of +# extra-cmake-modules 1.6.0) install variables. +# +# Do not use unless your project depends on extra-cmake-modules 1.6.0 +# or later. + +use strict; +my $file = CMakeLists.txt; + +my %old_var_map = ( +BUNDLE_INSTALL_DIR = 'BUNDLEDIR', +EXEC_INSTALL_PREFIX = 'EXECROOTDIR', +BIN_INSTALL_DIR = 'BINDIR', +SBIN_INSTALL_DIR = 'SBINDIR', +LIB_INSTALL_DIR = 'LIBDIR', +LIBEXEC_INSTALL_DIR = 'LIBEXECDIR', +KF5_LIBEXEC_INSTALL_DIR = 'LIBEXECDIR_KF5', +CMAKECONFIG_INSTALL_PREFIX = 'CMAKEPACKAGEDIR', +QT_PLUGIN_INSTALL_DIR = 'QTPLUGINDIR', +PLUGIN_INSTALL_DIR = 'PLUGINDIR', +IMPORTS_INSTALL_DIR = 'QTQUICKIMPORTSDIR', +QML_INSTALL_DIR = 'QMLDIR', +INCLUDE_INSTALL_DIR = 'INCLUDEDIR', +KF5_INCLUDE_INSTALL_DIR = 'INCLUDEDIR_KF5', +DATA_INSTALL_DIR = 'DATADIR', +KF5_DATA_INSTALL_DIR = 'DATADIR_KF5', +HTML_INSTALL_DIR = 'DOCBUNDLEDIR', +KCFG_INSTALL_DIR = 'KCFGDIR', +KCONF_UPDATE_INSTALL_DIR = 'KCONFUPDATEDIR', +SERVICES_INSTALL_DIR = 'KSERVICES5DIR', +SERVICETYPES_INSTALL_DIR = 'KSERVICETYPES5DIR', +KXMLGUI_INSTALL_DIR = 'KXMLGUI5DIR', +KNOTIFYRC_INSTALL_DIR = 'KNOTIFY5RCDIR', +ICON_INSTALL_DIR = 'ICONDIR', +LOCALE_INSTALL_DIR = 'LOCALEDIR', +SOUND_INSTALL_DIR = 'SOUNDDIR', +TEMPLATES_INSTALL_DIR = 'TEMPLATEDIR', +WALLPAPER_INSTALL_DIR = 'WALLPAPERDIR', +XDG_APPS_INSTALL_DIR = 'APPDIR', +XDG_DIRECTORY_INSTALL_DIR = 'DESKTOPDIR', +XDG_MIME_INSTALL_DIR = 'MIMEDIR', +MAN_INSTALL_DIR = 'MANDIR', +DBUS_INTERFACES_INSTALL_DIR = 'DBUSINTERFACEDIR', +DBUS_SERVICES_INSTALL_DIR = 'DBUSSERVICEDIR', +DBUS_SYSTEM_SERVICES_INSTALL_DIR = 'DBUSSYSTEMSERVICEDIR', +SYSCONF_INSTALL_DIR = 'SYSCONFDIR', +CONFIG_INSTALL_DIR = 'CONFDIR', +AUTOSTART_INSTALL_DIR = 'AUTOSTARTDIR', +SHARE_INSTALL_PREFIX = 'DATAROOTDIR', +); + +my @new_var_suffixes = ( +'METAINFODIR', +'INFODIR', +'DBUSDIR', +'LOCALSTATEDIR', +'SHAREDSTATEDIR', +'LIBEXECDIR_KF5', +); +push(@new_var_suffixes, values %old_var_map); + +my %extra_changes = ( +INSTALL_TARGETS_DEFAULT_ARGS = 'KDE_INSTALL_TARGETS_DEFAULT_ARGS' +); + +open(my $FILE, , $file) || die; +my $modified = 0; +my @l = map { +my $orig = $_; +my $updated = $_; + +# all variables we care about have INSTALL in their name +if (/INSTALL/) { +while (my ($oldvar,$suffix) = each(%old_var_map)) { +$updated =~ s/\b$oldvar\b/KDE_INSTALL_$suffix/; +} +foreach (@new_var_suffixes) { +$updated =~ s/\bCMAKE_INSTALL_$_\b/KDE_INSTALL_$_/; +} +while (my ($oldvalue,$newvalue) = each(%extra_changes)) { +$updated =~ s/\b$oldvalue\b/$newvalue/; +} +} + +$modified ||= $orig ne $updated; +$updated; +} $FILE; + +if ($modified) { +open (my $OUT, , $file); +print $OUT @l; +close ($OUT); +} +# vi:et:sts=4:sw=4 ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Review Request 121952: Make it possible to prevent a toolbar from being hidden
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121952/#review73670 --- Can't those people that don't want their toolbars to be hidable just not pass ToolBar to setupGUI/createGUI ? src/ktoggletoolbaraction.cpp https://git.reviewboard.kde.org/r/121952/#comment51272 weird newline? src/ktoolbar.h https://git.reviewboard.kde.org/r/121952/#comment51271 Hidable sounds weird. Anyhow it's KToolbar, so i think having toolBar there is extra, what about isHidable? src/kxmlgui.xsd https://git.reviewboard.kde.org/r/121952/#comment51273 the toolbar the user sounds weird, did you mean the user? Woul - Albert Astals Cid On gen. 9, 2015, 4:27 p.m., Aleix Pol Gonzalez wrote: --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121952/ --- (Updated gen. 9, 2015, 4:27 p.m.) Review request for KDE Frameworks. Bugs: 326713 https://bugs.kde.org/show_bug.cgi?id=326713 Repository: kxmlgui Description --- Adds a noHide attribute in the xml format and implements it in the toolbar handler, so we don't get an action to hide some toolbars. See related bug for more information. Basically if the application doesnt' have a menu, one can hide the toolbar and then it can't come back. Diffs - src/ktoggletoolbaraction.cpp 3539ff3 src/ktoolbar.h 54cc1cd src/ktoolbar.cpp f79a149 src/ktoolbarhandler.cpp 83c77bd src/kxmlgui.xsd bca02f1 Diff: https://git.reviewboard.kde.org/r/121952/diff/ Testing --- Fixes the attached bug, tests still pass. Thanks, Aleix Pol Gonzalez ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Review Request 121952: Make it possible to prevent a toolbar from being hidden
On Jan. 10, 2015, 5:05 p.m., Albert Astals Cid wrote: src/ktoolbar.h, line 217 https://git.reviewboard.kde.org/r/121952/diff/2/?file=339326#file339326line217 Hidable sounds weird. Anyhow it's KToolbar, so i think having toolBar there is extra, what about isHidable? Isn't proper (US) spelling hideable? Or better, canBeHidden - Martin --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121952/#review73670 --- On Jan. 9, 2015, 5:27 p.m., Aleix Pol Gonzalez wrote: --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121952/ --- (Updated Jan. 9, 2015, 5:27 p.m.) Review request for KDE Frameworks. Bugs: 326713 https://bugs.kde.org/show_bug.cgi?id=326713 Repository: kxmlgui Description --- Adds a noHide attribute in the xml format and implements it in the toolbar handler, so we don't get an action to hide some toolbars. See related bug for more information. Basically if the application doesnt' have a menu, one can hide the toolbar and then it can't come back. Diffs - src/ktoggletoolbaraction.cpp 3539ff3 src/ktoolbar.h 54cc1cd src/ktoolbar.cpp f79a149 src/ktoolbarhandler.cpp 83c77bd src/kxmlgui.xsd bca02f1 Diff: https://git.reviewboard.kde.org/r/121952/diff/ Testing --- Fixes the attached bug, tests still pass. Thanks, Aleix Pol Gonzalez ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Jenkins build is back to stable : kwindowsystem_stable_qt5 » All,LINBUILDER #15
See http://build.kde.org/job/kwindowsystem_stable_qt5/Variation=All,label=LINBUILDER/15/changes ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Jenkins build is back to stable : kconfig_stable_qt5 #13
See http://build.kde.org/job/kconfig_stable_qt5/13/changes ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Review Request 121972: Make ksycocadicttest work when sycoca does not exist yet.
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/121972/ --- Review request for KDE Frameworks and David Faure. Repository: kservice Description --- Using KServiceType::serviceType when the sycoca database does not yet exist can lead to an assert in the KServiceTypeFactory constructor being called, meaning we never get to the line where we rebuild sycoca. Diffs - autotests/ksycocadicttest.cpp cec9eeb9b40d96b42321fe7f50b8a60b0f5b3492 Diff: https://git.reviewboard.kde.org/r/121972/diff/ Testing --- rm -rf ~/.qttest; ./ksycocadicttest Without this patch, this fails with: * Start testing of KSycocaDictTest * Config: Using QtTest library 5.4.0, Qt 5.4.0 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.2) QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open ksycoca from /home/kde-devel/.qttest/cache/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open global ksycoca from /home/kde-devel/.qttest/share/kservices5/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open ksycoca from /home/kde-devel/.qttest/cache/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open global ksycoca from /home/kde-devel/.qttest/share/kservices5/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open ksycoca from /home/kde-devel/.qttest/cache/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::openDatabase?[0m: Trying to open global ksycoca from /home/kde-devel/.qttest/share/kservices5/ksycoca5 QDEBUG : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(kf5.kservice.sycoca) ?[31m?[34mKSycocaPrivate::checkDatabase?[0m: Still no database... QFATAL : KSycocaDictTest::initTestCase() ksycocadicttest(3942)/(default) ?[31munknown?[0m: ASSERT failure in KServiceTypeFactory::KServiceTypeFactory(): Could not open sycoca database, you must run kbuildsycoca first!, file /home/kde-devel/src/frameworks/kservice/src/services/kservicetypefactory.cpp, line 38 FAIL! : KSycocaDictTest::initTestCase() Received a fatal error. Loc: [Unknown file(0)] Totals: 0 passed, 1 failed, 0 skipped, 0 blacklisted * Finished testing of KSycocaDictTest * With the patch, it succeeds. Thanks, Alex Merry ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Jenkins build became unstable: kservice_master_qt5 #223
See http://build.kde.org/job/kservice_master_qt5/223/changes ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel