April 2017 - openSUSE Commits - openSUSE Mailing Lists

commit html2text for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package html2text for openSUSE:Factory checked in at 2017-04-30 21:23:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/html2text (Old) and /work/SRC/openSUSE:Factory/.html2text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "html2text" Sun Apr 30 21:23:32 2017 rev:20 rq:491753 version:1.3.2a Changes: -------- --- /work/SRC/openSUSE:Factory/html2text/html2text.changes 2016-05-08 10:45:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.html2text.new/html2text.changes 2017-04-30 21:23:47.241634734 +0200 @@ -1,0 +2,6 @@ +Thu Apr 27 16:32:45 UTC 2017 - toddrme2178(a)gmail.com + +- Implement update-alternatives to avoid conflict with + python3-html2text. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ html2text.spec ++++++ --- /var/tmp/diff_new_pack.ZQxZTr/_old 2017-04-30 21:23:47.981530410 +0200 +++ /var/tmp/diff_new_pack.ZQxZTr/_new 2017-04-30 21:23:47.985529846 +0200 @@ -38,6 +38,8 @@ Patch8: http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff Patch9: html2text-debian-810_fix_deprecated_conversion_warnings.patch BuildRequires: gcc-c++ +Requires(post): update-alternatives +Requires(preun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,15 +65,32 @@ make %{?_smp_mflags} EXPLICIT="%{optflags}" %install -install -D -m 0755 html2text %{buildroot}%{_bindir}/html2text -install -D -m 0644 html2text.1.gz %{buildroot}%{_mandir}/man1/html2text.1.gz +# To avoid conflicts with the python3-html2text package +install -D -m 0755 html2text %{buildroot}%{_bindir}/html2text-cpp +install -D -m 0644 html2text.1.gz %{buildroot}%{_mandir}/man1/html2text-cpp.1.gz install -D -m 0644 html2textrc.5.gz %{buildroot}%{_mandir}/man5/html2textrc.5.gz +ln -s -f %{_sysconfdir}/alternatives/html2text %{buildroot}%{_bindir}/html2text +ln -s -f %{_sysconfdir}/alternatives/html2text.1.gz %{buildroot}%{_mandir}/man1/html2text.1.gz + +%post +update-alternatives --install %{_bindir}/html2text html2text %{_bindir}/html2text-cpp 30 \ + --slave %{_mandir}/man1/html2text.1.gz html2text.1.gz %{_mandir}/man1/html2text-cpp.1.gz + +%preun +if [ ! -f %{_bindir}/html2text-cpp ] ; then + update-alternatives --remove html2text %{_bindir}/html2text-cpp +fi + %files %defattr(-,root,root) %doc README CHANGES COPYING TODO CREDITS KNOWN_BUGS RELEASE_NOTES %{_bindir}/html2text +%{_bindir}/html2text-cpp +%ghost %{_sysconfdir}/alternatives/html2text %{_mandir}/man1/html2text.1.gz +%{_mandir}/man1/html2text-cpp.1.gz +%ghost %{_sysconfdir}/alternatives/html2text.1.gz %{_mandir}/man5/html2textrc.5.gz %changelog

1 0

commit ptokax for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package ptokax for openSUSE:Factory checked in at 2017-04-30 21:23:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ptokax (Old) and /work/SRC/openSUSE:Factory/.ptokax.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ptokax" Sun Apr 30 21:23:28 2017 rev:2 rq:491538 version:0.5.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ptokax/ptokax.changes 2017-03-03 17:55:55.816549685 +0100 +++ /work/SRC/openSUSE:Factory/.ptokax.new/ptokax.changes 2017-04-30 21:23:46.073799397 +0200 @@ -1,0 +2,20 @@ +Fri Apr 14 01:02:03 UTC 2017 - 13ilya(a)gmail.com + +- Update to 0.5.2.2 + * Added: Reconnect to database on connection failure or connection lost. + * Fixed: Typo in server manager and resource leak in sqlite on exit. + * Fixed: Incorrect long length message when incomplete search command was received. + * Fixed: Search request was sent to users without share. + * Fixed: Missing $ValidateDenide when user use nick that is in reserved nicks. + * Fixed: Extra pipe in !checknickban result. + * Fixed: IP and Port check in DC commands. + * Fixed: Missing IP check for validity in some hub commands. + * Fixed: Empty password received from user was not checked properly and accepted as new password for reg. + * Fixed: Bandwidth waste, when IPv6 user send search request with IPv4 address. + * Fixed: Possible crash on hublist registration. + * Fixed: Bind to single IP caused bind to all addresses when IPv6 address was empty. + * Fixed: Typo in scripting interface. MaxSlotsLimt -> MaxSlotsLimit. + * Changed: Log script errors is enabled by default. +- Removed addressofbool.diff + +------------------------------------------------------------------- Old: ---- 0.5.2.1-nix-src.tgz addressofbool.diff New: ---- 0.5.2.2-nix-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ptokax.spec ++++++ --- /var/tmp/diff_new_pack.PxsGio/_old 2017-04-30 21:23:46.957674772 +0200 +++ /var/tmp/diff_new_pack.PxsGio/_new 2017-04-30 21:23:46.961674208 +0200 @@ -17,7 +17,7 @@ Name: ptokax -Version: 0.5.2.1 +Version: 0.5.2.2 Release: 0 Summary: Server application for the Neo-Modus DC++ sharing network License: GPL-3.0 @@ -25,15 +25,14 @@ Url: http://www.ptokax.org/ BuildRequires: gcc-c++ BuildRequires: lua-devel +BuildRequires: systemd-rpm-macros BuildRequires: tinyxml-devel BuildRequires: zlib-devel -BuildRequires: systemd-rpm-macros -Source0: http://www.ptokax.org/files/%version-nix-src.tgz +Source: http://www.ptokax.org/files/%version-nix-src.tgz Source1: ptokax.service Patch1: logs.patch Patch2: nodate.diff -Patch3: addressofbool.diff -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} Requires(pre): pwdutils @@ -46,7 +45,7 @@ %prep %setup -q -n PtokaX -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 sed -i 's/\r//' ReadMe.txt Changelog.txt scripting.docs/scripting-interface.txt # remove tinyxml as we use system lib rm -rf tinyxml ++++++ 0.5.2.1-nix-src.tgz -> 0.5.2.2-nix-src.tgz ++++++ /work/SRC/openSUSE:Factory/ptokax/0.5.2.1-nix-src.tgz /work/SRC/openSUSE:Factory/.ptokax.new/0.5.2.2-nix-src.tgz differ: char 5, line 1 ++++++ logs.patch ++++++ --- /var/tmp/diff_new_pack.PxsGio/_old 2017-04-30 21:23:47.033664057 +0200 +++ /var/tmp/diff_new_pack.PxsGio/_new 2017-04-30 21:23:47.033664057 +0200 @@ -1,40 +1,33 @@ ---- - core/ServerManager.cpp | 4 ++-- - core/utility.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -Index: PtokaX/core/ServerManager.cpp -=================================================================== ---- PtokaX.orig/core/ServerManager.cpp -+++ PtokaX/core/ServerManager.cpp -@@ -246,8 +246,8 @@ void clsServerManager::Initialize() { +diff -Pdpru PtokaX.orig/core/ServerManager.cpp PtokaX/core/ServerManager.cpp +--- PtokaX.orig/core/ServerManager.cpp 2017-04-08 13:06:30.000000000 +0300 ++++ PtokaX/core/ServerManager.cpp 2017-04-14 03:21:33.950860135 +0300 +@@ -251,8 +251,8 @@ void ServerManager::Initialize() { #else srandom(acctime); -- if(DirExist((clsServerManager::sPath+"/logs").c_str()) == false) { -- if(mkdir((clsServerManager::sPath+"/logs").c_str(), 0755) == -1) { +- if(DirExist((m_sPath+"/logs").c_str()) == false) { +- if(mkdir((m_sPath+"/logs").c_str(), 0755) == -1) { + if(DirExist("/var/log/ptokax") == false) { + if(mkdir("/var/log/ptokax", 0755) == -1) { - if(bDaemon == true) { + if(m_bDaemon == true) { syslog(LOG_USER | LOG_ERR, "Creating of logs directory failed!\n"); } else { -Index: PtokaX/core/utility.cpp -=================================================================== ---- PtokaX.orig/core/utility.cpp -+++ PtokaX/core/utility.cpp -@@ -889,13 +889,13 @@ void AppendLog(const string & sData, con +diff -Pdpru PtokaX.orig/core/utility.cpp PtokaX/core/utility.cpp +--- PtokaX.orig/core/utility.cpp 2017-04-09 12:22:59.000000000 +0300 ++++ PtokaX/core/utility.cpp 2017-04-14 03:26:45.246257342 +0300 +@@ -877,13 +877,13 @@ void AppendLog(const char * sData, const #ifdef _WIN32 - fw = fopen((clsServerManager::sPath + "\\logs\\system.log").c_str(), "a"); + fw = fopen((ServerManager::m_sPath + "\\logs\\system.log").c_str(), "a"); #else -- fw = fopen((clsServerManager::sPath + "/logs/system.log").c_str(), "a"); +- fw = fopen((ServerManager::m_sPath + "/logs/system.log").c_str(), "a"); + fw = fopen("/var/log/ptokax/system.log", "a"); #endif } else { #ifdef _WIN32 - fw = fopen((clsServerManager::sPath + "\\logs\\script.log").c_str(), "a"); + fw = fopen((ServerManager::m_sPath + "\\logs\\script.log").c_str(), "a"); #else -- fw = fopen((clsServerManager::sPath + "/logs/script.log").c_str(), "a"); -+ fw = fopen("/var/log/ptokax/script.log", "a"); +- fw = fopen((ServerManager::m_sPath + "/logs/script.log").c_str(), "a"); ++ fw = fopen("/var/log/ptokax/system.log", "a"); #endif } ++++++ nodate.diff ++++++ --- /var/tmp/diff_new_pack.PxsGio/_old 2017-04-30 21:23:47.057660674 +0200 +++ /var/tmp/diff_new_pack.PxsGio/_new 2017-04-30 21:23:47.057660674 +0200 @@ -1,69 +1,41 @@ -From: Jan Engelhardt <jengelh(a)inai.de> -Date: 2016-11-26 17:15:58.757191704 +0100 - ---- - core/HubCommands.cpp | 1 - - core/PtokaX-nix.cpp | 2 +- - core/PtokaX-win.cpp | 2 +- - core/ServerManager.cpp | 2 +- - skein/Additional_Implementations/skein_test.c | 2 +- - 5 files changed, 4 insertions(+), 5 deletions(-) - -Index: PtokaX/core/HubCommands.cpp -=================================================================== ---- PtokaX.orig/core/HubCommands.cpp -+++ PtokaX/core/HubCommands.cpp -@@ -3329,7 +3329,6 @@ bool clsHubCommands::DoCommand(User * pU +diff -Pdpru PtokaX.orig/core/HubCommands-RZ.cpp PtokaX/core/HubCommands-RZ.cpp +--- PtokaX.orig/core/HubCommands-RZ.cpp 2017-03-18 22:20:59.000000000 +0200 ++++ PtokaX/core/HubCommands-RZ.cpp 2017-04-14 03:57:53.330916603 +0300 +@@ -413,7 +413,6 @@ bool HubCommands::Stats(ChatCommand * pC #ifdef _PtokaX_TESTING_ - " [build " BUILD_NUMBER "]" + " [build " BUILD_NUMBER "]" #endif -- " built on " __DATE__ " " __TIME__ "\n" +- " built on " __DATE__ " " __TIME__ "\n" + #if LUA_VERSION_NUM > 501 - "Lua: " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "." LUA_VERSION_RELEASE "\n"; - #else -Index: PtokaX/core/PtokaX-nix.cpp -=================================================================== ---- PtokaX.orig/core/PtokaX-nix.cpp -+++ PtokaX/core/PtokaX-nix.cpp + "Lua: " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "." LUA_VERSION_RELEASE "\n"; +diff -Pdpru PtokaX.orig/core/PtokaX-nix.cpp PtokaX/core/PtokaX-nix.cpp +--- PtokaX.orig/core/PtokaX-nix.cpp 2017-03-19 14:30:04.000000000 +0200 ++++ PtokaX/core/PtokaX-nix.cpp 2017-04-14 03:59:07.235932373 +0300 @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) { } } } else if(strcasecmp(argv[i], "-v") == 0) { - printf("%s built on %s %s\n", g_sPtokaXTitle, __DATE__, __TIME__); -+ printf("%s built on %s %s\n", g_sPtokaXTitle, "",""); ++ printf("%s built on %s %s\n", g_sPtokaXTitle, "", ""); return EXIT_SUCCESS; } else if(strcasecmp(argv[i], "-h") == 0) { printf("Usage: PtokaX [-d] [-v] [-m] [-c configdir] [-p pidfile]\n\n" -Index: PtokaX/core/PtokaX-win.cpp -=================================================================== ---- PtokaX.orig/core/PtokaX-win.cpp -+++ PtokaX/core/PtokaX-win.cpp -@@ -286,7 +286,7 @@ int __cdecl main(int argc, char* argv[]) - sServiceName = argv[i]; - return UninstallService(sServiceName); - } else if(stricmp(argv[i], "-v") == NULL || stricmp(argv[i], "/version") == NULL) { -- printf("%s built on %s %s\n", g_sPtokaXTitle, __DATE__, __TIME__); -+ printf("%s built on %s %s\n", g_sPtokaXTitle, "",""); - return EXIT_SUCCESS; - } else if(stricmp(argv[i], "-h") == NULL || stricmp(argv[i], "/help") == NULL) { - printf("Usage: PtokaX [-v] [-m] [-i servicename] [-u servicename] [-c configdir]\n\n" -Index: PtokaX/core/ServerManager.cpp -=================================================================== ---- PtokaX.orig/core/ServerManager.cpp -+++ PtokaX/core/ServerManager.cpp -@@ -1032,7 +1032,7 @@ void clsServerManager::CreateServerThrea +diff -Pdpru PtokaX.orig/core/ServerManager.cpp PtokaX/core/ServerManager.cpp +--- PtokaX.orig/core/ServerManager.cpp 2017-04-08 13:06:30.000000000 +0300 ++++ PtokaX/core/ServerManager.cpp 2017-04-14 04:00:01.937723391 +0300 +@@ -1052,7 +1052,7 @@ void ServerManager::CreateServerThread(c //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - void clsServerManager::CommandLineSetup() { + void ServerManager::CommandLineSetup() { - printf("%s built on %s %s\n\n", g_sPtokaXTitle, __DATE__, __TIME__); -+ printf("%s built on %s %s\n\n", g_sPtokaXTitle, "",""); - printf("Welcome to PtokaX configuration setup.\nDirectory for PtokaX configuration is: %s\nWhen this directory is wrong, then exit this setup.\nTo specify correct configuration directory start PtokaX with -c configdir parameter.", clsServerManager::sPath.c_str()); ++ printf("%s built on %s %s\n\n", g_sPtokaXTitle, "", ""); + printf("Welcome to PtokaX configuration setup.\nDirectory for PtokaX configuration is: %s\nWhen this directory is wrong, then exit this setup.\nTo specify correct configuration directory start PtokaX with -c configdir parameter.", m_sPath.c_str()); const char sMenu[] = "\n\nAvailable options:\n" -Index: PtokaX/skein/Additional_Implementations/skein_test.c -=================================================================== ---- PtokaX.orig/skein/Additional_Implementations/skein_test.c -+++ PtokaX/skein/Additional_Implementations/skein_test.c +diff -Pdpru PtokaX.orig/skein/Additional_Implementations/skein_test.c PtokaX/skein/Additional_Implementations/skein_test.c +--- PtokaX.orig/skein/Additional_Implementations/skein_test.c 2010-10-15 02:40:28.000000000 +0300 ++++ PtokaX/skein/Additional_Implementations/skein_test.c 2017-04-14 04:01:31.466107739 +0300 @@ -1213,7 +1213,7 @@ void Skein_MeasurePerformance(const char if (targetSize == 0) {

1 0

commit libpreludedb for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package libpreludedb for openSUSE:Factory checked in at 2017-04-30 21:23:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpreludedb (Old) and /work/SRC/openSUSE:Factory/.libpreludedb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpreludedb" Sun Apr 30 21:23:24 2017 rev:4 rq:490890 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libpreludedb/libpreludedb.changes 2017-04-03 11:05:12.358851715 +0200 +++ /work/SRC/openSUSE:Factory/.libpreludedb.new/libpreludedb.changes 2017-04-30 21:23:44.837973646 +0200 @@ -1,0 +2,5 @@ +Thu Mar 30 14:55:53 UTC 2017 - jengelh(a)inai.de + +- Rename %soname to %sover to better reflect its use + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpreludedb.spec ++++++ --- /var/tmp/diff_new_pack.eOzIvR/_old 2017-04-30 21:23:45.557872141 +0200 +++ /var/tmp/diff_new_pack.eOzIvR/_new 2017-04-30 21:23:45.561871577 +0200 @@ -18,8 +18,8 @@ %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch3: %global python_sitearch3 %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%define soname 7 -%define soname_cpp 2 +%define sover 7 +%define sover_cpp 2 Name: libpreludedb Version: 3.1.0 Release: 0 @@ -51,22 +51,22 @@ worrying about SQL, and to access the database independently of the type/format of the database. -%package -n %{name}%{soname} +%package -n %{name}%{sover} Summary: Prelude Libraries Group: System/Libraries -%description -n %{name}%{soname} +%description -n %{name}%{sover} The PreludeDB Library provides an abstraction layer upon the type and the format of the database used to store IDMEF alerts. It allows developers to use the Prelude IDMEF database easily and efficiently without worrying about SQL, and to access the database independently of the type/format of the database. -%package -n %{name}cpp%{soname_cpp} +%package -n %{name}cpp%{sover_cpp} Summary: Prelude Libraries Group: System/Libraries -%description -n %{name}cpp%{soname_cpp} +%description -n %{name}cpp%{sover_cpp} The PreludeDB Library provides an abstraction layer upon the type and the format of the database used to store IDMEF alerts. It allows developers to use the Prelude IDMEF database easily and efficiently without @@ -78,8 +78,8 @@ Group: Development/Libraries/C and C++ Requires: automake Requires: libprelude-devel -Requires: libpreludedb%{soname} = %{version} -Requires: libpreludedbcpp%{soname_cpp} = %{version} +Requires: libpreludedb%{sover} = %{version} +Requires: libpreludedbcpp%{sover_cpp} = %{version} Requires: mysql-devel Requires: postgresql-devel Requires: sqlite-devel @@ -189,24 +189,24 @@ %install %make_install -mkdir -p %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/python -cp bindings/libpreludedbcpp.i %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/ -cp bindings/python/libpreludedbcpp-python.i %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/python +mkdir -p %{buildroot}%{_datadir}/libpreludedb%{sover}/swig/python +cp bindings/libpreludedbcpp.i %{buildroot}%{_datadir}/libpreludedb%{sover}/swig/ +cp bindings/python/libpreludedbcpp-python.i %{buildroot}%{_datadir}/libpreludedb%{sover}/swig/python find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' -%post -n libpreludedb%{soname} -p /sbin/ldconfig -%post -n libpreludedbcpp%{soname_cpp} -p /sbin/ldconfig -%postun -n libpreludedb%{soname} -p /sbin/ldconfig -%postun -n libpreludedbcpp%{soname_cpp} -p /sbin/ldconfig +%post -n libpreludedb%{sover} -p /sbin/ldconfig +%post -n libpreludedbcpp%{sover_cpp} -p /sbin/ldconfig +%postun -n libpreludedb%{sover} -p /sbin/ldconfig +%postun -n libpreludedbcpp%{sover_cpp} -p /sbin/ldconfig -%files -n %{name}%{soname} +%files -n %{name}%{sover} %defattr(-,root,root) -%{_libdir}/libpreludedb.so.%{soname}* +%{_libdir}/libpreludedb.so.%{sover}* -%files -n %{name}cpp%{soname_cpp} +%files -n %{name}cpp%{sover_cpp} %defattr(-,root,root) -%{_libdir}/libpreludedbcpp.so.%{soname_cpp}* +%{_libdir}/libpreludedbcpp.so.%{sover_cpp}* %files -n preludedb-tools %defattr(-,root,root) @@ -230,11 +230,11 @@ %files devel-bindings %defattr(-,root,root) -%dir %{_datadir}/libpreludedb%{soname}/ -%dir %{_datadir}/libpreludedb%{soname}/swig/ -%{_datadir}/libpreludedb%{soname}/swig/libpreludedbcpp.i -%dir %{_datadir}/libpreludedb%{soname}/swig/python/ -%{_datadir}/libpreludedb%{soname}/swig/python/libpreludedbcpp-python.i +%dir %{_datadir}/libpreludedb%{sover}/ +%dir %{_datadir}/libpreludedb%{sover}/swig/ +%{_datadir}/libpreludedb%{sover}/swig/libpreludedbcpp.i +%dir %{_datadir}/libpreludedb%{sover}/swig/python/ +%{_datadir}/libpreludedb%{sover}/swig/python/libpreludedbcpp-python.i %files -n python-%{name} %defattr(-,root,root)

1 0

commit breeze for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package breeze for openSUSE:Factory checked in at 2017-04-30 21:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/breeze (Old) and /work/SRC/openSUSE:Factory/.breeze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "breeze" Sun Apr 30 21:22:59 2017 rev:45 rq:492166 version:5.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/breeze/breeze.changes 2017-03-28 15:14:33.374713921 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze.changes 2017-04-30 21:23:08.787056759 +0200 @@ -1,0 +2,23 @@ +Sat Apr 29 13:30:20 UTC 2017 - wbauer(a)tmo.at + +- BuildRequire plasma5-workspace instead of plasma-framework, that + one is actually needed to fix the appdata file generation + (kde#367923) + +------------------------------------------------------------------- +Tue Apr 25 18:57:59 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.9.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.5.php +- Changes since 5.9.4: + * bump version for 5.9.5 + +------------------------------------------------------------------- +Fri Apr 7 09:57:10 UTC 2017 - fabian(a)ritter-vogt.de + +- Add BuildRequires: plasma-framework to allow appdata file to be built +- Add appdata file to %files + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/breeze/breeze4-style.changes 2017-03-28 15:14:33.418707690 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze4-style.changes 2017-04-30 21:23:08.831050555 +0200 @@ -1,0 +2,10 @@ +Tue Apr 25 18:57:59 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.9.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.5.php +- Changes since 5.9.4: + * bump version for 5.9.5 + +------------------------------------------------------------------- Old: ---- breeze-5.9.4.tar.xz New: ---- breeze-5.9.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ breeze.spec ++++++ --- /var/tmp/diff_new_pack.LhuPM2/_old 2017-04-30 21:23:10.786774802 +0200 +++ /var/tmp/diff_new_pack.LhuPM2/_new 2017-04-30 21:23:10.790774238 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: breeze -Version: 5.9.4 +Version: 5.9.5 Release: 0 # Full Plasma 5 version (e.g. 5.9.4) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -29,6 +29,8 @@ BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem +# Needed for Plasma/LookAndFeel package type declaration (kde#367923) +BuildRequires: plasma5-workspace BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) @@ -146,6 +148,7 @@ %dir %{_kf5_servicesdir} %{_kf5_servicesdir}/breezestyleconfig.desktop %{_kf5_libdir}/cmake/Breeze/ +%{_kf5_appstreamdir}/org.kde.breezedark.desktop.appdata.xml %files -n breeze5-wallpapers %defattr(-,root,root) ++++++ breeze4-style.spec ++++++ --- /var/tmp/diff_new_pack.LhuPM2/_old 2017-04-30 21:23:10.822769726 +0200 +++ /var/tmp/diff_new_pack.LhuPM2/_new 2017-04-30 21:23:10.822769726 +0200 @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.9.4 +Version: 5.9.5 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 ++++++ breeze-5.9.4.tar.xz -> breeze-5.9.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/breeze/breeze-5.9.4.tar.xz /work/SRC/openSUSE:Factory/.breeze.new/breeze-5.9.5.tar.xz differ: char 26, line 1

1 0

commit oxygen5-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package oxygen5-icon-theme for openSUSE:Factory checked in at 2017-04-30 21:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen5-icon-theme (Old) and /work/SRC/openSUSE:Factory/.oxygen5-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen5-icon-theme" Sun Apr 30 21:22:53 2017 rev:13 rq:492108 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen5-icon-theme/oxygen5-icon-theme.changes 2017-03-28 15:13:23.380628875 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen5-icon-theme.new/oxygen5-icon-theme.changes 2017-04-30 21:22:59.984297932 +0200 @@ -1,0 +2,12 @@ +Sat Apr 15 10:11:59 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * new icons for kmail gpg + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- Old: ---- oxygen-icons5-5.32.0.tar.xz New: ---- oxygen-icons5-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen5-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.OqUlzB/_old 2017-04-30 21:23:07.399252436 +0200 +++ /var/tmp/diff_new_pack.OqUlzB/_new 2017-04-30 21:23:07.403251873 +0200 @@ -16,9 +16,9 @@ # -%define _tar_path 5.32 +%define _tar_path 5.33 Name: oxygen5-icon-theme -Version: 5.32.0 +Version: 5.33.0 Release: 0 Summary: Oxygen Icon Theme License: LGPL-3.0 ++++++ oxygen-icons5-5.32.0.tar.xz -> oxygen-icons5-5.33.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/oxygen5-icon-theme/oxygen-icons5-5.32.0.tar.xz /work/SRC/openSUSE:Factory/.oxygen5-icon-theme.new/oxygen-icons5-5.33.0.tar.xz differ: char 27, line 1

1 0

commit plasma5-desktop for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2017-04-30 21:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-desktop" Sun Apr 30 21:22:46 2017 rev:60 rq:492106 version:5.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2017-04-17 10:24:15.739624338 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2017-04-30 21:22:48.497917490 +0200 @@ -1,0 +2,17 @@ +Tue Apr 25 18:58:04 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.9.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.5.php +- Changes since 5.9.4: + * Too many changes to list here + +------------------------------------------------------------------- +Wed Apr 19 07:25:39 UTC 2017 - fabian(a)ritter-vogt.de + +- Add upstreamed patch to fix the apply button on the file content + indexing option (boo#1034800): + * 0001-Fix-new-checkbox-for-file-content-indexing-in-kcm_ba.patch + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.9.4.tar.xz New: ---- 0001-Fix-new-checkbox-for-file-content-indexing-in-kcm_ba.patch plasma-desktop-5.9.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.Wf9HjH/_old 2017-04-30 21:22:49.617759595 +0200 +++ /var/tmp/diff_new_pack.Wf9HjH/_new 2017-04-30 21:22:49.617759595 +0200 @@ -20,7 +20,7 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.9.4 +Version: 5.9.5 Release: 0 # Full Plasma 5 version (e.g. 5.9.4) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -37,6 +37,8 @@ # PATCHES 201-300 and above are from upstream master/5.10 branch # PATCH-FIX-UPSTREAM Patch201: 0001-kcm_baloofile-Add-option-to-disable-file-content-ind.patch +# PATCH-FIX-UPSTREAM +Patch202: 0001-Fix-new-checkbox-for-file-content-indexing-in-kcm_ba.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -181,6 +183,7 @@ %setup -q -n plasma-desktop-%{version} %patch1 -p1 %patch201 -p1 +%patch202 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Fix-new-checkbox-for-file-content-indexing-in-kcm_ba.patch ++++++ >From df9cee28e120167414a5ae79e4835c8b6533f807 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian(a)ritter-vogt.de> Date: Tue, 18 Apr 2017 22:46:53 +0200 Subject: [PATCH] Fix new checkbox for file content indexing in kcm_baloofile Summary: Needs a new connection to enable the "Apply" button. Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5499 --- kcms/baloo/kcm.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kcms/baloo/kcm.cpp b/kcms/baloo/kcm.cpp index a192ad5a..0cb77bc5 100644 --- a/kcms/baloo/kcm.cpp +++ b/kcms/baloo/kcm.cpp @@ -73,6 +73,8 @@ ServerConfigModule::ServerConfigModule(QWidget* parent, const QVariantList& args this, &ServerConfigModule::onDirectoryListChanged); connect(m_enableCheckbox, SIGNAL(stateChanged(int)), this, SLOT(changed())); + connect(m_enableContentIndexing, SIGNAL(stateChanged(int)), + this, SLOT(changed())); connect(m_enableCheckbox, SIGNAL(stateChanged(int)), this, SLOT(indexingEnabledChanged())); } -- 2.12.0 ++++++ plasma-desktop-5.9.4.tar.xz -> plasma-desktop-5.9.5.tar.xz ++++++ ++++ 20363 lines of diff (skipped)

1 0

commit threadweaver for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2017-04-30 21:22:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "threadweaver" Sun Apr 30 21:22:41 2017 rev:40 rq:492105 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2017-03-28 15:13:56.923877297 +0200 +++ /work/SRC/openSUSE:Factory/.threadweaver.new/threadweaver.changes 2017-04-30 21:22:42.774724450 +0200 @@ -1,0 +2,11 @@ +Sat Apr 15 10:12:00 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- Old: ---- threadweaver-5.32.0.tar.xz New: ---- threadweaver-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.jwlA8Z/_old 2017-04-30 21:22:43.450629149 +0200 +++ /var/tmp/diff_new_pack.jwlA8Z/_new 2017-04-30 21:22:43.454628584 +0200 @@ -17,9 +17,9 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: threadweaver -Version: 5.32.0 +Version: 5.33.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ threadweaver-5.32.0.tar.xz -> threadweaver-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.32.0/CMakeLists.txt new/threadweaver-5.33.0/CMakeLists.txt --- old/threadweaver-5.32.0/CMakeLists.txt 2017-03-03 14:16:46.000000000 +0100 +++ new/threadweaver-5.33.0/CMakeLists.txt 2017-04-01 20:51:15.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") # handled by release scripts +set(KF5_VERSION "5.33.0") # handled by release scripts project(ThreadWeaver VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.32.0 NO_MODULE) +find_package(ECM 5.33.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)

1 0

commit syntax-highlighting for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package syntax-highlighting for openSUSE:Factory checked in at 2017-04-30 21:22:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syntax-highlighting (Old) and /work/SRC/openSUSE:Factory/.syntax-highlighting.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syntax-highlighting" Sun Apr 30 21:22:35 2017 rev:6 rq:492104 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/syntax-highlighting/syntax-highlighting.changes 2017-03-28 15:14:01.599215017 +0200 +++ /work/SRC/openSUSE:Factory/.syntax-highlighting.new/syntax-highlighting.changes 2017-04-30 21:22:36.371627275 +0200 @@ -1,0 +2,17 @@ +Sat Apr 15 10:12:00 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * TOML: Fix highlighting of string escape sequences + * Update Clojure syntax highlighting + * few updates to OCaml syntax + * Hightlight *.sbt files as scala code + * Also use the QML highlighter for .qmltypes files + * Add unit test for Apache configuration highlighting + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- Old: ---- syntax-highlighting-5.32.0.tar.xz New: ---- syntax-highlighting-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syntax-highlighting.spec ++++++ --- /var/tmp/diff_new_pack.INNn7f/_old 2017-04-30 21:22:37.111522951 +0200 +++ /var/tmp/diff_new_pack.INNn7f/_new 2017-04-30 21:22:37.115522387 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5SyntaxHighlighting5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: syntax-highlighting -Version: 5.32.0 +Version: 5.33.0 Release: 0 Summary: Syntax highlighting engine and library License: LGPL-2.1+ and GPL-2.0 and GPL-2.0+ and GPL-3.0 and MIT and BSD-3-Clause and Artistic-1.0 ++++++ syntax-highlighting-5.32.0.tar.xz -> syntax-highlighting-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/CMakeLists.txt new/syntax-highlighting-5.33.0/CMakeLists.txt --- old/syntax-highlighting-5.32.0/CMakeLists.txt 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/CMakeLists.txt 2017-04-01 21:45:56.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") +set(KF5_VERSION "5.33.0") project(KSyntaxHighlighting VERSION ${KF5_VERSION}) -find_package(ECM 5.32.0 REQUIRED NO_MODULE) +find_package(ECM 5.33.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/folding/apache.conf.fold new/syntax-highlighting-5.33.0/autotests/folding/apache.conf.fold --- old/syntax-highlighting-5.32.0/autotests/folding/apache.conf.fold 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/folding/apache.conf.fold 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,67 @@ +# Apache configuration highlighting unit test +# comment with alters TODO FIXME ### + +<beginfold id='1'><IfModule</beginfold id='1'> mod_dav_fs.c> + DAVLockDB /var/lock/apache/DAVLock +<endfold id='1'></IfModule</endfold id='1'>> + +<beginfold id='1'><VirtualHost</beginfold id='1'> *:443> + Include something_else.inc + + SSLEngine on + # exclude insecure protocols + SSLProtocol all -SSLv2 -SSLv3 + SSLHonorCipherOrder on + # exclude insecure ciphers + SSLCipherSuite "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK !SRP !DSS !DES !aECDH" + + SSLCertificateFile /etc/letsencrypt/live/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/chain.pem + CustomLog /var/log/apache2/ssl_request_log ssl_combined +<endfold id='1'></VirtualHost</endfold id='1'>> + +<beginfold id='1'><Proxy</beginfold id='1'> "http://localhost:10000/"> + SSLRequireSSL +<endfold id='1'></Proxy</endfold id='1'>> + +<beginfold id='1'><Directory</beginfold id='1'> "/some/quoted/path"> + Options -Indexes -FollowSymLinks + DirectoryIndex index.php + AllowOverride None + Order allow,deny + Allow from all + + Options FollowSymLinks + AllowOverride FileInfo Options All + <beginfold id='1'><LimitExcept</beginfold id='1'> GET> + Require valid-user + <endfold id='1'></LimitExcept</endfold id='1'>> + + <beginfold id='1'><Files</beginfold id='1'> ~ "\.(cgi|shtml|phtml|php3?)$"> + ForceType text/plain + <endfold id='1'></Files</endfold id='1'>> +<endfold id='1'></Directory</endfold id='1'>> + +Alias /foo/ "/srv/www/htdocs/foo/" + +AuthType Basic +AuthName "KDE" +AuthUserFile /srv/www/htpasswd.db +Require user konqui + +<beginfold id='1'><VirtualHost</beginfold id='1'> _default_:80> + ServerName www.kde.org + ServerAlias kde.org + + RewriteEngine On + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent] +<endfold id='1'></VirtualHost</endfold id='1'>> + +AuthBasicProvider ldap +AuthLDAPBindDN uid=ldapproxy,ou=people,dc=kde,dc=org +AuthLDAPBindPassword top_secret +AuthLDAPURL ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount) +AuthLDAPGroupAttributeIsDN on +AuthLDAPGroupAttribute member +Require ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/folding/clojure.clj.fold new/syntax-highlighting-5.33.0/autotests/folding/clojure.clj.fold --- old/syntax-highlighting-5.32.0/autotests/folding/clojure.clj.fold 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/folding/clojure.clj.fold 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,71 @@ +; Test file, released under MIT License +(ns ^{:doc "Syntax highlighting test file" + :author "Markus Brenneis"} + highlighting) + +(defn something-else [f xs] + #_(map #(apply f (% [%])) (cons 1 xs)) + (map #(apply f (% xs)) (cons 1 xs)) + #_[1 '(2)] + xs) + +(def foo [\a \b \n \ucafe \o123 \n + \newline \tab \space \formfeed \backspace]) + +(def fizz {#{\a \b} + #{\n \newline}}) + +(def fizz' #{{\a \b} + {\n \newline}}) + +(defn bar [xs] + (as-> xs <> + (cons :a <>) + (map #(%1 %2) <>) ; TODO improve + (into <> [:konjure.logic.specs/numShips]))) + +(def x-2-y + #_"do \" sth" + (domonad set-m + [x #{1.1, (+ -2 +4)} + y #{1.1, (- -2.0 4.0)}] + (*' x y))) + +(def bases + (and (= -1 -1N) + (= 1/4 -2.5e-1) + (= -1/2 -0.5M) + (= -0x1Ab -0X1ab) + (= +2r101010 25R1h) + (= 39r13 42R10))) ; FIXME this one is not correct + +(def ^{:private true} + (= (last #{#{}}) #{{#{}}})) + +(def s "#repl\n") +(def r #"repl") + +(defn- stuff! + [a] + "This is no \"documentation\"!" + (= (class #'+) (class #'foo)) + (let [+ -] [(+ a 1) (@#'+ a 1)])) + +(defn- throwIllegalArgumentException! + "Throws an \"IllegalArgumentException\" or + a js/Error." + [message] + #?(:clj (throw (IllegalArgumentException. message)) + :cljs (throw (js/Error. message)))) + +(defmacro let-fn "a nonsense macro" [one-binding & body] + `(+ 1 ~(inc' 1)) + (let [[identifier & fn-body] one-binding] + `(let [~identifier (fn ~identifier ~@fn-body)] + ~@body `a#))) + +(def state (atom [(= false true) nil])) + +(defn something-cool [] (first @state)) + +(defn- something-different [] (first (into @state [12]))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/html/apache.conf.html new/syntax-highlighting-5.33.0/autotests/html/apache.conf.html --- old/syntax-highlighting-5.32.0/autotests/html/apache.conf.html 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/html/apache.conf.html 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,74 @@ +<!DOCTYPE html> +<html><head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<title>apache.conf</title> +<meta name="generator" content="KF5::SyntaxHighlighting (Apache Configuration)"/> +</head><body style="color:#1f1c1b"><pre> +# Apache configuration highlighting unit test +# comment with alters TODO FIXME ### + +<IfModule mod_dav_fs.c> + DAVLockDB /var/lock/apache/DAVLock +</IfModule> + +<VirtualHost *:443> + Include something_else.inc + + SSLEngine on + # exclude insecure protocols + SSLProtocol all -SSLv2 -SSLv3 + SSLHonorCipherOrder on + # exclude insecure ciphers + SSLCipherSuite "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK !SRP !DSS !DES !aECDH" + + SSLCertificateFile /etc/letsencrypt/live/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/chain.pem + CustomLog /var/log/apache2/ssl_request_log ssl_combined +</VirtualHost> + +<Proxy "http://localhost:10000/"> + SSLRequireSSL +</Proxy> + +<Directory "/some/quoted/path"> + Options -Indexes -FollowSymLinks + DirectoryIndex index.php + AllowOverride None + Order allow,deny + Allow from all + + Options FollowSymLinks + AllowOverride FileInfo Options All + <LimitExcept GET> + Require valid-user + </LimitExcept> + + <Files ~ "\.(cgi|shtml|phtml|php3?)$"> + ForceType text/plain + </Files> +</Directory> + +Alias /foo/ "/srv/www/htdocs/foo/" + +AuthType Basic +AuthName "KDE" +AuthUserFile /srv/www/htpasswd.db +Require user konqui + +<VirtualHost _default_:80> + ServerName www.kde.org + ServerAlias kde.org + + RewriteEngine On + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent] +</VirtualHost> + +AuthBasicProvider ldap +AuthLDAPBindDN uid=ldapproxy,ou=people,dc=kde,dc=org +AuthLDAPBindPassword top_secret +AuthLDAPURL ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount) +AuthLDAPGroupAttributeIsDN on +AuthLDAPGroupAttribute member +Require ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org +</pre></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/html/clojure.clj.html new/syntax-highlighting-5.33.0/autotests/html/clojure.clj.html --- old/syntax-highlighting-5.32.0/autotests/html/clojure.clj.html 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/html/clojure.clj.html 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,78 @@ +<!DOCTYPE html> +<html><head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<title>clojure.clj</title> +<meta name="generator" content="KF5::SyntaxHighlighting (Clojure)"/> +</head><body style="color:#1f1c1b"><pre> +; Test file, released under MIT License +(ns ^{:doc "Syntax highlighting test file" + :author "Markus Brenneis"} + highlighting) + +(defn something-else [f xs] + #_(map #(apply f (% [%])) (cons 1 xs)) + (map #(apply f (% xs)) (cons 1 xs)) + #_[1 '(2)] + xs) + +(def foo [\a \b \n \ucafe \o123 \n + \newline \tab \space \formfeed \backspace]) + +(def fizz {#{\a \b} + #{\n \newline}}) + +(def fizz' #{{\a \b} + {\n \newline}}) + +(defn bar [xs] + (as-> xs <> + (cons :a <>) + (map #(%1 %2) <>) ; TODO improve + (into <> [:konjure.logic.specs/numShips]))) + +(def x-2-y + #_"do \" sth" + (domonad set-m + [x #{1.1, (+ -2 +4)} + y #{1.1, (- -2.0 4.0)}] + (*' x y))) + +(def bases + (and (= -1 -1N) + (= 1/4 -2.5e-1) + (= -1/2 -0.5M) + (= -0x1Ab -0X1ab) + (= +2r101010 25R1h) + (= 39r13 42R10))) ; FIXME this one is not correct + +(def ^{:private true} + (= (last #{#{}}) #{{#{}}})) + +(def s "#repl\n") +(def r #"repl") + +(defn- stuff! + [a] + "This is no \"documentation\"!" + (= (class #'+) (class #'foo)) + (let [+ -] [(+ a 1) (@#'+ a 1)])) + +(defn- throwIllegalArgumentException! + "Throws an \"IllegalArgumentException\" or + a js/Error." + [message] + #?(:clj (throw (IllegalArgumentException. message)) + :cljs (throw (js/Error. message)))) + +(defmacro let-fn "a nonsense macro" [one-binding & body] + `(+ 1 ~(inc' 1)) + (let [[identifier & fn-body] one-binding] + `(let [~identifier (fn ~identifier ~@fn-body)] + ~@body `a#))) + +(def state (atom [(= false true) nil])) + +(defn something-cool [] (first @state)) + +(defn- something-different [] (first (into @state [12]))) +</pre></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/input/apache.conf new/syntax-highlighting-5.33.0/autotests/input/apache.conf --- old/syntax-highlighting-5.32.0/autotests/input/apache.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/input/apache.conf 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,67 @@ +# Apache configuration highlighting unit test +# comment with alters TODO FIXME ### + +<IfModule mod_dav_fs.c> + DAVLockDB /var/lock/apache/DAVLock +</IfModule> + +<VirtualHost *:443> + Include something_else.inc + + SSLEngine on + # exclude insecure protocols + SSLProtocol all -SSLv2 -SSLv3 + SSLHonorCipherOrder on + # exclude insecure ciphers + SSLCipherSuite "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK !SRP !DSS !DES !aECDH" + + SSLCertificateFile /etc/letsencrypt/live/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/chain.pem + CustomLog /var/log/apache2/ssl_request_log ssl_combined +</VirtualHost> + +<Proxy "http://localhost:10000/"> + SSLRequireSSL +</Proxy> + +<Directory "/some/quoted/path"> + Options -Indexes -FollowSymLinks + DirectoryIndex index.php + AllowOverride None + Order allow,deny + Allow from all + + Options FollowSymLinks + AllowOverride FileInfo Options All + <LimitExcept GET> + Require valid-user + </LimitExcept> + + <Files ~ "\.(cgi|shtml|phtml|php3?)$"> + ForceType text/plain + </Files> +</Directory> + +Alias /foo/ "/srv/www/htdocs/foo/" + +AuthType Basic +AuthName "KDE" +AuthUserFile /srv/www/htpasswd.db +Require user konqui + +<VirtualHost _default_:80> + ServerName www.kde.org + ServerAlias kde.org + + RewriteEngine On + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent] +</VirtualHost> + +AuthBasicProvider ldap +AuthLDAPBindDN uid=ldapproxy,ou=people,dc=kde,dc=org +AuthLDAPBindPassword top_secret +AuthLDAPURL ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount) +AuthLDAPGroupAttributeIsDN on +AuthLDAPGroupAttribute member +Require ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/input/apache.conf.syntax new/syntax-highlighting-5.33.0/autotests/input/apache.conf.syntax --- old/syntax-highlighting-5.32.0/autotests/input/apache.conf.syntax 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/input/apache.conf.syntax 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1 @@ +Apache Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/input/clojure.clj new/syntax-highlighting-5.33.0/autotests/input/clojure.clj --- old/syntax-highlighting-5.32.0/autotests/input/clojure.clj 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/input/clojure.clj 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,71 @@ +; Test file, released under MIT License +(ns ^{:doc "Syntax highlighting test file" + :author "Markus Brenneis"} + highlighting) + +(defn something-else [f xs] + #_(map #(apply f (% [%])) (cons 1 xs)) + (map #(apply f (% xs)) (cons 1 xs)) + #_[1 '(2)] + xs) + +(def foo [\a \b \n \ucafe \o123 \n + \newline \tab \space \formfeed \backspace]) + +(def fizz {#{\a \b} + #{\n \newline}}) + +(def fizz' #{{\a \b} + {\n \newline}}) + +(defn bar [xs] + (as-> xs <> + (cons :a <>) + (map #(%1 %2) <>) ; TODO improve + (into <> [:konjure.logic.specs/numShips]))) + +(def x-2-y + #_"do \" sth" + (domonad set-m + [x #{1.1, (+ -2 +4)} + y #{1.1, (- -2.0 4.0)}] + (*' x y))) + +(def bases + (and (= -1 -1N) + (= 1/4 -2.5e-1) + (= -1/2 -0.5M) + (= -0x1Ab -0X1ab) + (= +2r101010 25R1h) + (= 39r13 42R10))) ; FIXME this one is not correct + +(def ^{:private true} + (= (last #{#{}}) #{{#{}}})) + +(def s "#repl\n") +(def r #"repl") + +(defn- stuff! + [a] + "This is no \"documentation\"!" + (= (class #'+) (class #'foo)) + (let [+ -] [(+ a 1) (@#'+ a 1)])) + +(defn- throwIllegalArgumentException! + "Throws an \"IllegalArgumentException\" or + a js/Error." + [message] + #?(:clj (throw (IllegalArgumentException. message)) + :cljs (throw (js/Error. message)))) + +(defmacro let-fn "a nonsense macro" [one-binding & body] + `(+ 1 ~(inc' 1)) + (let [[identifier & fn-body] one-binding] + `(let [~identifier (fn ~identifier ~@fn-body)] + ~@body `a#))) + +(def state (atom [(= false true) nil])) + +(defn something-cool [] (first @state)) + +(defn- something-different [] (first (into @state [12]))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/reference/apache.conf.ref new/syntax-highlighting-5.33.0/autotests/reference/apache.conf.ref --- old/syntax-highlighting-5.32.0/autotests/reference/apache.conf.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/reference/apache.conf.ref 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,67 @@ +<Comment># Apache configuration highlighting unit test</Comment> +<Comment># comment with alters </Comment><Alert Level 2>TODO</Alert Level 2><Comment> </Comment><Alert Level 2>FIXME</Alert Level 2><Comment> </Comment><Alert Level 3>###</Alert Level 3> +<dsNormal></dsNormal> +<Container><IfModule</Container><Attribute> mod_dav_fs.c</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>DAVLockDB</Directives><String> /var/lock/apache/DAVLock</String> +<Container></IfModule></Container> +<dsNormal></dsNormal> +<Container><VirtualHost</Container><Attribute> *:443</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>Include</Directives><String> something_else.inc</String> +<dsNormal></dsNormal> +<Normal Text> </Normal Text><Directives>SSLEngine</Directives><Other> </Other><Alternates>on</Alternates> +<Normal Text> </Normal Text><Comment># exclude insecure protocols</Comment> +<Normal Text> </Normal Text><Directives>SSLProtocol</Directives><Other> </Other><Alternates>all</Alternates><Other> </Other><Alternates>-SSLv2</Alternates><Other> </Other><Alternates>-SSLv3</Alternates> +<Normal Text> </Normal Text><Directives>SSLHonorCipherOrder</Directives><Other> </Other><Alternates>on</Alternates> +<Normal Text> </Normal Text><Comment># exclude insecure ciphers</Comment> +<Normal Text> </Normal Text><Directives>SSLCipherSuite</Directives><String> "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK !SRP !DSS !DES !aECDH"</String> +<dsNormal></dsNormal> +<Normal Text> </Normal Text><Directives>SSLCertificateFile</Directives><String> /etc/letsencrypt/live/cert.pem</String> +<Normal Text> </Normal Text><Directives>SSLCertificateKeyFile</Directives><String> /etc/letsencrypt/live/privkey.pem</String> +<Normal Text> </Normal Text><Directives>SSLCertificateChainFile</Directives><String> /etc/letsencrypt/live/chain.pem</String> +<Normal Text> </Normal Text><Directives>CustomLog</Directives><String> /var/log/apache2/ssl_request_log ssl_combined</String> +<Container></VirtualHost></Container> +<dsNormal></dsNormal> +<Container><Proxy</Container><Attribute> "http://localhost:10000/"</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>SSLRequireSSL</Directives> +<Container></Proxy></Container> +<dsNormal></dsNormal> +<Container><Directory</Container><Attribute> "/some/quoted/path"</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>Options</Directives><Other> </Other><Alternates>-Indexes</Alternates><Other> </Other><Alternates>-FollowSymLinks</Alternates> +<Normal Text> </Normal Text><Directives>DirectoryIndex</Directives><String> index.php</String> +<Normal Text> </Normal Text><Directives>AllowOverride</Directives><Other> </Other><Alternates>None</Alternates> +<Normal Text> </Normal Text><Directives>Order</Directives><Other> </Other><Alternates>allow,deny</Alternates> +<Normal Text> </Normal Text><Directives>Allow</Directives><String> from all</String> +<dsNormal></dsNormal> +<Normal Text> </Normal Text><Directives>Options</Directives><Other> </Other><Alternates>FollowSymLinks</Alternates> +<Normal Text> </Normal Text><Directives>AllowOverride</Directives><Other> </Other><Alternates>FileInfo</Alternates><Other> </Other><Alternates>Options</Alternates><Other> </Other><Alternates>All</Alternates> +<Normal Text> </Normal Text><Container><LimitExcept</Container><Attribute> GET</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>Require</Directives><String> valid-user</String> +<Normal Text> </Normal Text><Container></LimitExcept></Container> +<dsNormal></dsNormal> +<Normal Text> </Normal Text><Container><Files</Container><Attribute> ~ "\.(cgi|shtml|phtml|php3?)$"</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>ForceType</Directives><String> text/plain</String> +<Normal Text> </Normal Text><Container></Files></Container> +<Container></Directory></Container> +<dsNormal></dsNormal> +<Directives>Alias</Directives><String> /foo/ "/srv/www/htdocs/foo/"</String> +<dsNormal></dsNormal> +<Directives>AuthType</Directives><Other> </Other><Alternates>Basic</Alternates> +<Directives>AuthName</Directives><String> "KDE"</String> +<Directives>AuthUserFile</Directives><String> /srv/www/htpasswd.db</String> +<Directives>Require</Directives><String> user konqui</String> +<dsNormal></dsNormal> +<Container><VirtualHost</Container><Attribute> _default_:80</Attribute><Container>></Container> +<Normal Text> </Normal Text><Directives>ServerName</Directives><String> www.kde.org</String> +<Normal Text> </Normal Text><Directives>ServerAlias</Directives><String> kde.org</String> +<dsNormal></dsNormal> +<Normal Text> </Normal Text><Directives>RewriteEngine</Directives><Other> </Other><Alternates>On</Alternates> +<Normal Text> </Normal Text><Directives>RewriteRule</Directives><String> ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent]</String> +<Container></VirtualHost></Container> +<dsNormal></dsNormal> +<Directives>AuthBasicProvider</Directives><String> ldap</String> +<Directives>AuthLDAPBindDN</Directives><String> uid=ldapproxy,ou=people,dc=kde,dc=org</String> +<Directives>AuthLDAPBindPassword</Directives><String> top_secret</String> +<Directives>AuthLDAPURL</Directives><String> ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount)</String> +<Directives>AuthLDAPGroupAttributeIsDN</Directives><Other> </Other><Alternates>on</Alternates> +<Directives>AuthLDAPGroupAttribute</Directives><String> member</String> +<Directives>Require</Directives><String> ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org</String> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/autotests/reference/clojure.clj.ref new/syntax-highlighting-5.33.0/autotests/reference/clojure.clj.ref --- old/syntax-highlighting-5.32.0/autotests/reference/clojure.clj.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/syntax-highlighting-5.33.0/autotests/reference/clojure.clj.ref 2017-04-01 21:45:56.000000000 +0200 @@ -0,0 +1,71 @@ +<Comment>; Test file, released under MIT License</Comment> +<Brackets1>(</Brackets1><Keyword>ns</Keyword><Normal> </Normal><BracketsMeta>^{</BracketsMeta><Modifier2>:doc</Modifier2><Normal> </Normal><Documentation>"Syntax highlighting test file"</Documentation> +<Normal> </Normal><Modifier2>:author</Modifier2><Normal> </Normal><Documentation>"Markus Brenneis"</Documentation><BracketsMeta>}</BracketsMeta> +<Normal> highlighting</Normal><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn</Definition><Function> something-else </Function><BracketsSquare>[</BracketsSquare><Normal>f xs</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Comment>#_</Comment><Brackets2>(</Brackets2><Keyword>map</Keyword><Normal> </Normal><Brackets3>#(</Brackets3><Keyword>apply</Keyword><Normal> f </Normal><Brackets4>(</Brackets4><Variable>%</Variable><Normal> </Normal><BracketsSquare>[</BracketsSquare><Variable>%</Variable><BracketsSquare>]</BracketsSquare><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Normal> </Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal> </Normal><Decimal>1</Decimal><Normal> xs</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>map</Keyword><Normal> </Normal><Brackets3>#(</Brackets3><Keyword>apply</Keyword><Normal> f </Normal><Brackets4>(</Brackets4><Variable>%</Variable><Normal> xs</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Normal> </Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal> </Normal><Decimal>1</Decimal><Normal> xs</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2> +<Normal> </Normal><Comment>#_</Comment><BracketsSquare>[</BracketsSquare><Decimal>1</Decimal><Normal> </Normal><Brackets2>'(</Brackets2><Decimal>2</Decimal><Brackets2>)</Brackets2><BracketsSquare>]</BracketsSquare> +<Normal> xs</Normal><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> foo </Function><BracketsSquare>[</BracketsSquare><Char>\a</Char><Normal> </Normal><Char>\b</Char><Normal> </Normal><Char>\n</Char><Normal> </Normal><Char>\ucafe</Char><Normal> </Normal><Char>\o123</Char><Normal> </Normal><Char>\n</Char> +<Normal> </Normal><Char>\newline</Char><Normal> </Normal><Char>\tab</Char><Normal> </Normal><Char>\space</Char><Normal> </Normal><Char>\formfeed</Char><Normal> </Normal><Char>\backspace</Char><BracketsSquare>]</BracketsSquare><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> fizz </Function><BracketsMap>{</BracketsMap><BracketsSet>#{</BracketsSet><Char>\a</Char><Normal> </Normal><Char>\b</Char><BracketsSet>}</BracketsSet> +<Normal> </Normal><BracketsSet>#{</BracketsSet><Char>\n</Char><Normal> </Normal><Char>\newline</Char><BracketsSet>}</BracketsSet><BracketsMap>}</BracketsMap><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> fizz' </Function><BracketsSet>#{</BracketsSet><BracketsMap>{</BracketsMap><Char>\a</Char><Normal> </Normal><Char>\b</Char><BracketsMap>}</BracketsMap> +<Normal> </Normal><BracketsMap>{</BracketsMap><Char>\n</Char><Normal> </Normal><Char>\newline</Char><BracketsMap>}</BracketsMap><BracketsSet>}</BracketsSet><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn</Definition><Function> bar </Function><BracketsSquare>[</BracketsSquare><Normal>xs</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>as-></Keyword><Normal> xs <></Normal> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal> </Normal><Modifier2>:a</Modifier2><Normal> <></Normal><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>map</Keyword><Normal> </Normal><Brackets4>#(</Brackets4><Variable>%1</Variable><Normal> </Normal><Variable>%2</Variable><Brackets4>)</Brackets4><Normal> <></Normal><Brackets3>)</Brackets3><Normal> </Normal><Comment>; </Comment><Alert>TODO</Alert><Comment> improve</Comment> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>into</Keyword><Normal> <> </Normal><BracketsSquare>[</BracketsSquare><Modifier2>:konjure.logic.specs/numShips</Modifier2><BracketsSquare>]</BracketsSquare><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> x-2-y</Function> +<Normal> </Normal><Comment>#_</Comment><String>"do </String><dsNormal>\"</dsNormal><String> sth"</String> +<Normal> </Normal><Brackets2>(</Brackets2><Normal>domonad set-m</Normal> +<Normal> </Normal><BracketsSquare>[</BracketsSquare><Normal>x </Normal><BracketsSet>#{</BracketsSet><Float>1.1</Float><Normal>, </Normal><Brackets1>(</Brackets1><Keyword>+</Keyword><Normal> -2 +4</Normal><Brackets1>)</Brackets1><BracketsSet>}</BracketsSet> +<Normal> y </Normal><BracketsSet>#{</BracketsSet><Float>1.1</Float><Normal>, </Normal><Brackets1>(</Brackets1><Keyword>-</Keyword><Normal> -2.</Normal><Decimal>0</Decimal><Normal> </Normal><Float>4.0</Float><Brackets1>)</Brackets1><BracketsSet>}</BracketsSet><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>*'</Keyword><Normal> x y</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> bases</Function> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>and</Keyword><Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> -1 -1N</Normal><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> </Normal><Float>1/4</Float><Normal> -2.</Normal><Decimal>5</Decimal><Normal>e-1</Normal><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> -</Normal><Float>1/2</Float><Normal> -0.</Normal><Decimal>5</Decimal><Normal>M</Normal><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> -</Normal><BaseN>0x1Ab</BaseN><Normal> -</Normal><BaseN>0X1ab</BaseN><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> +</Normal><BaseN>2r101010</BaseN><Normal> </Normal><BaseN>25R1h</BaseN><Brackets3>)</Brackets3> +<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> </Normal><Error>39r13</Error><Normal> </Normal><Error>42R10</Error><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><Normal> </Normal><Comment>; </Comment><Alert>FIXME</Alert><Comment> this one is not correct</Comment> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> </Function><BracketsMeta>^{</BracketsMeta><Modifier2>:private</Modifier2><Normal> </Normal><Variable>true</Variable><BracketsMeta>}</BracketsMeta> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>=</Keyword><Normal> </Normal><Brackets3>(</Brackets3><Keyword>last</Keyword><Normal> </Normal><BracketsSet>#{#{}}</BracketsSet><Brackets3>)</Brackets3><Normal> </Normal><BracketsSet>#{</BracketsSet><BracketsMap>{</BracketsMap><BracketsSet>#{}</BracketsSet><BracketsMap>}</BracketsMap><BracketsSet>}</BracketsSet><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> s </Function><String>"#repl</String><dsNormal>\n</dsNormal><String>"</String><Brackets1>)</Brackets1> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> r </Function><Regexpr>#"repl"</Regexpr><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn-</Definition><Function> stuff!</Function> +<dsNormal> </dsNormal><BracketsSquare>[</BracketsSquare><Normal>a</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><String>"This is no </String><dsNormal>\"</dsNormal><String>documentation</String><dsNormal>\"</dsNormal><String>!"</String> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>=</Keyword><Normal> </Normal><Brackets3>(</Brackets3><Keyword>class</Keyword><Normal> </Normal><Variable>#'+</Variable><Brackets3>)</Brackets3><Normal> </Normal><Brackets3>(</Brackets3><Keyword>class</Keyword><Normal> </Normal><Variable>#'foo</Variable><Brackets3>)</Brackets3><Brackets2>)</Brackets2> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>let</Keyword><Normal> </Normal><BracketsSquare>[</BracketsSquare><Keyword>+</Keyword><Normal> </Normal><Keyword>-</Keyword><BracketsSquare>]</BracketsSquare><Normal> </Normal><BracketsSquare>[</BracketsSquare><Brackets3>(</Brackets3><Keyword>+</Keyword><Normal> a </Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><Normal> </Normal><Brackets3>(</Brackets3><Modifier>@#'+</Modifier><Normal> a </Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><BracketsSquare>]</BracketsSquare><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn-</Definition><Function> throwIllegalArgumentException!</Function> +<dsNormal> </dsNormal><Documentation>"Throws an </Documentation><dsNormal>\"</dsNormal><Documentation>IllegalArgumentException</Documentation><dsNormal>\"</dsNormal><Documentation> or</Documentation> +<Documentation> a js/Error."</Documentation> +<Normal> </Normal><BracketsSquare>[</BracketsSquare><Normal>message</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Readermacro>#?</Readermacro><Brackets2>(</Brackets2><Modifier2>:clj</Modifier2><Normal> </Normal><Brackets3>(</Brackets3><Keyword>throw</Keyword><Normal> </Normal><Brackets4>(</Brackets4><Normal>IllegalArgumentException. message</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3> +<Normal> </Normal><Modifier2>:cljs</Modifier2><Normal> </Normal><Brackets3>(</Brackets3><Keyword>throw</Keyword><Normal> </Normal><Brackets4>(</Brackets4><Normal>js/Error. message</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defmacro</Definition><Function> let-fn </Function><Documentation>"a nonsense macro"</Documentation><Normal> </Normal><BracketsSquare>[</BracketsSquare><Normal>one-binding & body</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Brackets2>`(</Brackets2><Keyword>+</Keyword><Normal> </Normal><Decimal>1</Decimal><Normal> ~</Normal><Brackets3>(</Brackets3><Keyword>inc'</Keyword><Normal> </Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><Brackets2>)</Brackets2> +<Normal> </Normal><Brackets2>(</Brackets2><Keyword>let</Keyword><Normal> </Normal><BracketsSquare>[[</BracketsSquare><Normal>identifier & fn-body</Normal><BracketsSquare>]</BracketsSquare><Normal> one-binding</Normal><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Brackets3>`(</Brackets3><Keyword>let</Keyword><Normal> </Normal><BracketsSquare>[</BracketsSquare><Modifier>~identifier</Modifier><Normal> </Normal><Brackets4>(</Brackets4><Keyword>fn</Keyword><Normal> </Normal><Modifier>~identifier</Modifier><Normal> </Normal><Modifier>~@fn-body</Modifier><Brackets4>)</Brackets4><BracketsSquare>]</BracketsSquare> +<Normal> </Normal><Modifier>~@body</Modifier><Normal> </Normal><Modifier>`a#</Modifier><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>def</Definition><Function> state </Function><Brackets2>(</Brackets2><Keyword>atom</Keyword><Normal> </Normal><BracketsSquare>[</BracketsSquare><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> </Normal><Variable>false</Variable><Normal> </Normal><Variable>true</Variable><Brackets3>)</Brackets3><Normal> </Normal><Variable>nil</Variable><BracketsSquare>]</BracketsSquare><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn</Definition><Function> something-cool </Function><BracketsSquare>[]</BracketsSquare><Normal> </Normal><Brackets2>(</Brackets2><Keyword>first</Keyword><Normal> </Normal><Modifier>@state</Modifier><Brackets2>)</Brackets2><Brackets1>)</Brackets1> +<dsNormal></dsNormal> +<Brackets1>(</Brackets1><Definition>defn-</Definition><Function> something-different </Function><BracketsSquare>[]</BracketsSquare><Normal> </Normal><Brackets2>(</Brackets2><Keyword>first</Keyword><Normal> </Normal><Brackets3>(</Brackets3><Keyword>into</Keyword><Normal> </Normal><Modifier>@state</Modifier><Normal> </Normal><BracketsSquare>[</BracketsSquare><Decimal>12</Decimal><BracketsSquare>]</BracketsSquare><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/apache.xml new/syntax-highlighting-5.33.0/data/syntax/apache.xml --- old/syntax-highlighting-5.32.0/data/syntax/apache.xml 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/data/syntax/apache.xml 2017-04-01 21:45:56.000000000 +0200 @@ -13,7 +13,7 @@ --> <language name="Apache Configuration" section="Configuration" - version="2" kateversion="5.0" + version="3" kateversion="5.0" extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf;.htaccess*;.htpasswd*" mimetype="" author="Jan Janssen (medhefgo(a)googlemail.com)" license="LGPL"> @@ -401,6 +401,7 @@ <item>ServerSignature</item> <item>ServerTokens</item> <item>SSLEngine</item> +<item>SSLHonorCipherOrder</item> <item>SSLMutex</item> <item>SSLOptions</item> <item>SSLProtocol</item> @@ -609,14 +610,14 @@ <itemDatas> <itemData name="Normal Text" defStyleNum="dsNormal" /> <itemData name="Comment" defStyleNum="dsComment" /> - <itemData name="Directives" defStyleNum="dsExtension" bold="true" /> + <itemData name="Directives" defStyleNum="dsExtension" bold="true" spellChecking="false"/> <itemData name="String" defStyleNum="dsString" /> <itemData name="Float" defStyleNum="dsFloat" /> <itemData name="Int" defStyleNum="dsFloat" /> - <itemData name="Alternates" defStyleNum="dsKeyword" /> + <itemData name="Alternates" defStyleNum="dsKeyword" spellChecking="false"/> <itemData name="Alert" defStyleNum="dsError" /> - <itemData name="Container" defStyleNum="dsFunction" /> - <itemData name="Attribute" defStyleNum="dsAttribute" /> + <itemData name="Container" defStyleNum="dsFunction" spellChecking="false"/> + <itemData name="Attribute" defStyleNum="dsAttribute" spellChecking="false"/> <itemData name="Other" defStyleNum="dsChar" /> </itemDatas> </highlighting> @@ -630,5 +631,3 @@ </general> </language> - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/clojure.xml new/syntax-highlighting-5.33.0/data/syntax/clojure.xml --- old/syntax-highlighting-5.32.0/data/syntax/clojure.xml 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/data/syntax/clojure.xml 2017-04-01 21:45:56.000000000 +0200 @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA. * ********************************************************************** --> -<language version="5" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+"> +<language version="6" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+"> <highlighting> <list name="definitions"> <item> def </item> @@ -30,12 +30,8 @@ <item> defalias </item> <item> defhinted </item> <item> definline </item> - <item> defmacro </item> - <item> defmacro- </item> <item> defmethod </item> <item> defmulti </item> - <item> defn </item> - <item> defn- </item> <item> defnk </item> <item> defn-memo </item> <item> defonce </item> @@ -52,6 +48,12 @@ <item> defvar </item> <item> defvar- </item> </list> + <list name="documentable_definitions"> + <item> defn </item> + <item> defn- </item> + <item> defmacro </item> + <item> defmacro- </item> + </list> <list name="keywords"> <item> < </item> <item> <= </item> @@ -60,17 +62,20 @@ <item> > </item> <item> >= </item> <item> - </item> + <item> -' </item> <item> -> </item> <item> ->> </item> <item> / </item> <item> . </item> <item> .. </item> <item> * </item> + <item> *' </item> <item> + </item> + <item> +' </item> <item> accessor </item> <item> aclone </item> <item> add-classpath </item> - <item> add-watcher </item> + <item> add-watch </item> <item> agent </item> <item> agent-errors </item> <item> aget </item> @@ -89,6 +94,7 @@ <item> are </item> <item> areduce </item> <item> array-map </item> + <item> as-> </item> <item> aset </item> <item> aset-boolean </item> <item> aset-byte </item> @@ -188,6 +194,7 @@ <item> create-struct </item> <item> cycle </item> <item> dec </item> + <item> dec' </item> <item> decimal? </item> <item> declare </item> <item> delay </item> @@ -243,6 +250,7 @@ <item> file-position </item> <item> file-seq </item> <item> filter </item> + <item> filterv </item> <item> finally </item> <item> find </item> <item> find-doc </item> @@ -257,9 +265,11 @@ <item> fn </item> <item> fn? </item> <item> fnext </item> + <item> fnil </item> <item> for </item> <item> force </item> <item> format </item> + <item> frequencies </item> <item> function? </item> <item> future </item> <item> future? </item> @@ -281,6 +291,7 @@ <item> get-proxy-class </item> <item> get-thread-bindings </item> <item> get-validator </item> + <item> group-by </item> <item> handle </item> <item> handler-case </item> <item> hash </item> @@ -294,6 +305,7 @@ <item> if-not </item> <item> import </item> <item> inc </item> + <item> inc' </item> <item> inc-report-counter </item> <item> index </item> <item> init-proxy </item> @@ -364,6 +376,7 @@ <item> map </item> <item> map? </item> <item> mapcat </item> + <item> mapv </item> <item> map-invert </item> <item> max </item> <item> max-key </item> @@ -462,6 +475,7 @@ <item> quot </item> <item> rand </item> <item> rand-int </item> + <item> rand-nth </item> <item> range </item> <item> ratio? </item> <item> rational? </item> @@ -488,7 +502,7 @@ <item> remove </item> <item> remove-method </item> <item> remove-ns </item> - <item> remove-watcher </item> + <item> remove-watch </item> <item> rename </item> <item> rename-keys </item> <item> re-pattern </item> @@ -607,6 +621,7 @@ <item> unquote </item> <item> unquote-splicing </item> <item> up </item> + <item> update </item> <item> update-in </item> <item> update-proxy </item> <item> use </item> @@ -620,6 +635,7 @@ <item> vec </item> <item> vector </item> <item> vector? </item> + <item> vector-of </item> <item> walk </item> <item> when </item> <item> when-first </item> @@ -639,6 +655,7 @@ <item> with-test-out </item> <item> xml-seq </item> <item> zero? </item> + <item> zipmap </item> </list> <list name="variables"> <item> *1 </item> @@ -680,112 +697,174 @@ <item> *test-out* </item> <item> *use-context-classloader* </item> <item> *warn-on-reflection* </item> + <item> *warn-on-reflection* </item> + <item> false </item> + <item> nil </item> + <item> true </item> </list> <contexts> <context name="Level0" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets1" context="Level1" char="("/> + <Detect2Chars attribute="Brackets1" context="Level1" char="'" char1="("/> + <Detect2Chars attribute="Brackets1" context="Level1" char="`" char1="("/> <Detect2Chars attribute="Brackets1" context="Level1" char="#" char1="("/> <IncludeRules context="Default" /> </context> <context name="Default" attribute="Normal" lineEndContext="#stay"> - <RegExpr attribute="Comment" context="#stay" String=";.*$"/> + <DetectChar attribute="Comment" context="Comment" char=";"/> <Detect2Chars attribute="Comment" context="#stay" char="#" char1="_"/> - <RegExpr attribute="Modifier" context="#stay" String="[@~]\S+"/> - <RegExpr attribute="Modifier2" context="#stay" String="::?[a-zA-Z0-9\-]+"/> - <Detect2Chars attribute="Brackets" context="#stay" char="#" char1="{"/> - <Detect2Chars attribute="Brackets" context="#stay" char="^" char1="{"/> - <DetectChar attribute="BracketsCurly" context="#stay" char="{"/> - <DetectChar attribute="BracketsCurly" context="#stay" char="}"/> + <RegExpr attribute="Readermacro" context="#stay" String="#\?@?"/> + <RegExpr attribute="Modifier" context="#stay" String="[@~'`][^\s\{\}\[\]]+"/> + <RegExpr attribute="Modifier" context="#stay" String="[^\s"\{\}\[\]]+#"/> + <RegExpr attribute="Modifier2" context="#stay" String="::?[a-zA-Z0-9\-\./]+"/> + <Detect2Chars attribute="BracketsSet" context="BracketsSet" char="#" char1="{"/> + <Detect2Chars attribute="BracketsMeta" context="BracketsMeta" char="^" char1="{"/> + <DetectChar attribute="BracketsMap" context="BracketsMap" char="{"/> <DetectChar attribute="BracketsSquare" context="#stay" char="["/> <DetectChar attribute="BracketsSquare" context="#stay" char="]"/> - <Detect2Chars attribute="Variable" context="#stay" char="#" char1="'"/> + <RegExpr attribute="Variable" context="#stay" String="#'[^\s\{\}\[\]]+"/> <keyword attribute="Keyword" context="#stay" String="keywords"/> + <RegExpr attribute="Variable" context="#stay" String="%[0-9]*"/> <keyword attribute="Variable" context="#stay" String="variables"/> + <keyword attribute="Definition" context="function_decl_documentable" String="documentable_definitions"/> <keyword attribute="Definition" context="function_decl" String="definitions"/> - <RegExpr attribute="Char" context="#stay" String="\\."/> - <Detect2Chars attribute="String" context="String" char="#" char1="""/> + <RegExpr attribute="Char" context="#stay" String="\\u[0-9A-Fa-f]+|\\o[0-7]+|\\backspace|\\formfeed|\\newline|\\space|\\tab|\\[^\s\{\}\[\]]"/> + <Detect2Chars attribute="Regexpr" context="Regexpr" char="#" char1="""/> <DetectChar attribute="String" context="String" char="""/> - <Float attribute="Float" context="#stay"/> - <Int attribute="Decimal" context="#stay"/> + <RegExpr attribute="Float" context="#stay" String="[0-9]+/[0-9]+"/> + <RegExpr attribute="BaseN" context="#stay" String="0[xX][0-9A-Fa-f]+"/> + <RegExpr attribute="BaseN" context="#stay" String="([12]?[0-9]|3[0-6])[rR][0-9a-zA-Z]+"/> + <RegExpr attribute="Error" context="#stay" String="(3[7-9]|[0-9]*[4-9][0-9]+)[rR][0-9a-zA-Z]+"/> + <Float attribute="Float" context="#stay"> + <StringDetect attribute="Decimal" context="#stay" String="M" insensitive="false"/> + </Float> + <Int attribute="Decimal" context="#stay"> + <StringDetect attribute="Decimal" context="#stay" String="N" insensitive="false"/> + </Int> <DetectChar attribute="Brackets1" context="Level1" char="("/> </context> - <context name="function_decl" attribute="Function" lineEndContext="#stay"> - <RegExpr attribute="Function" context="#pop" String="\s*[A-Za-z0-9-+\<\>//\*]*\s*"/> + <context name="Comment" attribute="Comment" lineEndContext="#pop"> + <RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/> + </context> + <context name="function_decl_documentable" attribute="Function" lineEndContext="#stay"> + <RegExpr attribute="Function" context="#pop!DocumentationPossible" String="\s*[A-Za-z0-9-+\<\>//\*!\?']*\s*"/> </context> - <context name="SpecialNumber" attribute="Normal" lineEndContext="#pop"> - <Float attribute="Float" context="#pop"/> - <Int attribute="Decimal" context="#pop"/> - <HlCOct attribute="BaseN" context="#pop"/> - <HlCHex attribute="Float" context="#pop"/> + <context name="function_decl" attribute="Function" lineEndContext="#stay"> + <RegExpr attribute="Function" context="#pop" String="\s*[A-Za-z0-9-+\<\>//\*!\?']*\s*"/> </context> <context name="String" attribute="String" lineEndContext="#stay"> <RegExpr attribute="Char" context="#stay" String="#\\."/> <HlCStringChar attribute="String Char" context="#stay"/> <DetectChar attribute="String" context="#pop" char="""/> </context> + <context name="Regexpr" attribute="Regexpr" lineEndContext="#stay"> + <RegExpr attribute="Char" context="#stay" String="#\\."/> + <HlCStringChar attribute="Regexpr Char" context="#stay"/> + <DetectChar attribute="Regexpr" context="#pop" char="""/> + </context> + <context name="DocumentationPossible" attribute="DocumentationPossible" lineEndContext="#stay"> + <DetectChar attribute="Comment" context="Comment" char=";"/> + <DetectChar attribute="Documentation" context="#pop!Documentation" char="""/> + <RegExpr attribute="Documentation" context="#pop" String="\S" lookAhead="true"/> + </context> + <context name="Documentation" attribute="Documentation" lineEndContext="#stay"> + <RegExpr attribute="Char" context="#stay" String="#\\."/> + <HlCStringChar attribute="Documentation Char" context="#stay"/> + <DetectChar attribute="Documentation" context="#pop" char="""/> + </context> + <context name="BracketsSet" attribute="Normal" lineEndContext="#stay"> + <DetectChar attribute="BracketsSet" context="#pop" char="}" /> + <IncludeRules context="Default" /> + </context> + <context name="BracketsMeta" attribute="Normal" lineEndContext="#stay"> + <DetectChar attribute="BracketsMeta" context="#pop" char="}" /> + <DetectChar attribute="Documentation" context="Documentation" char="""/> + <IncludeRules context="Default" /> + </context> + <context name="BracketsMap" attribute="Normal" lineEndContext="#stay"> + <DetectChar attribute="BracketsMap" context="#pop" char="}" /> + <IncludeRules context="Default" /> + </context> <context name="Level1" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets2" context="Level2" char="("/> + <Detect2Chars attribute="Brackets2" context="Level2" char="'" char1="("/> + <Detect2Chars attribute="Brackets2" context="Level2" char="`" char1="("/> <Detect2Chars attribute="Brackets2" context="Level2" char="#" char1="("/> <DetectChar attribute="Brackets1" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> <context name="Level2" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets3" context="Level3" char="("/> + <Detect2Chars attribute="Brackets3" context="Level3" char="'" char1="("/> + <Detect2Chars attribute="Brackets3" context="Level3" char="`" char1="("/> <Detect2Chars attribute="Brackets3" context="Level3" char="#" char1="("/> <DetectChar attribute="Brackets2" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> <context name="Level3" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets4" context="Level4" char="("/> + <Detect2Chars attribute="Brackets4" context="Level4" char="'" char1="("/> + <Detect2Chars attribute="Brackets4" context="Level4" char="`" char1="("/> <Detect2Chars attribute="Brackets4" context="Level4" char="#" char1="("/> <DetectChar attribute="Brackets3" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> <context name="Level4" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets5" context="Level5" char="("/> + <Detect2Chars attribute="Brackets5" context="Level5" char="'" char1="("/> + <Detect2Chars attribute="Brackets5" context="Level5" char="`" char1="("/> <Detect2Chars attribute="Brackets5" context="Level5" char="#" char1="("/> <DetectChar attribute="Brackets4" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> <context name="Level5" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets6" context="Level6" char="("/> + <Detect2Chars attribute="Brackets6" context="Level6" char="'" char1="("/> + <Detect2Chars attribute="Brackets6" context="Level6" char="`" char1="("/> <Detect2Chars attribute="Brackets6" context="Level6" char="#" char1="("/> <DetectChar attribute="Brackets5" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> <context name="Level6" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="Brackets1" context="Level1" char="("/> + <Detect2Chars attribute="Brackets1" context="Level1" char="'" char1="("/> + <Detect2Chars attribute="Brackets1" context="Level1" char="`" char1="("/> <Detect2Chars attribute="Brackets1" context="Level1" char="#" char1="("/> <DetectChar attribute="Brackets6" context="#pop" char=")" /> <IncludeRules context="Default" /> </context> </contexts> <itemDatas> - <itemData name="Normal" defStyleNum="dsNormal"/> - <itemData name="Keyword" defStyleNum="dsKeyword"/> - <itemData name="Operator" defStyleNum="dsOperator"/> - <itemData name="Modifier" defStyleNum="dsAttribute"/> - <itemData name="Modifier2" defStyleNum="dsAttribute"/> - <itemData name="Variable" defStyleNum="dsVariable" /> - <itemData name="Definition" defStyleNum="dsBuiltIn"/> - <itemData name="Data" defStyleNum="dsDataType"/> - <itemData name="Decimal" defStyleNum="dsDecVal"/> - <itemData name="BaseN" defStyleNum="dsBaseN"/> - <itemData name="Float" defStyleNum="dsFloat"/> - <itemData name="Function" defStyleNum="dsFunction"/> - <itemData name="Char" defStyleNum="dsChar"/> + <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false"/> + <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/> + <itemData name="Operator" defStyleNum="dsOperator" spellChecking="false"/> + <itemData name="Modifier" defStyleNum="dsAttribute" spellChecking="false"/> + <itemData name="Modifier2" defStyleNum="dsAttribute" spellChecking="false"/> + <itemData name="Variable" defStyleNum="dsVariable" spellChecking="false"/> + <itemData name="Definition" defStyleNum="dsBuiltIn" spellChecking="false"/> + <itemData name="Data" defStyleNum="dsDataType" spellChecking="false"/> + <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/> + <itemData name="BaseN" defStyleNum="dsBaseN" spellChecking="false"/> + <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/> + <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/> + <itemData name="Char" defStyleNum="dsChar" spellChecking="false"/> <itemData name="String" defStyleNum="dsString"/> + <itemData name="Regexpr" defStyleNum="dsSpecialString"/> <itemData name="Comment" defStyleNum="dsComment"/> - <itemData name="Region Marker" defStyleNum="dsRegionMarker"/> - <itemData name="Brackets" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="0"/> + <itemData name="Documentation" defStyleNum="dsDocumentation"/> + <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> + <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> + <itemData name="Readermacro" defStyleNum="dsPreprocessor"/> + <itemData name="BracketsSet" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00"/> + <itemData name="BracketsMeta" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="0"/> + <itemData name="BracketsMap" defStyleNum="dsNormal" color="#206620" selColor="#219921"/> <itemData name="BracketsSquare" defStyleNum="dsNormal" color="#3333ff" selColor="#3333aa"/> - <itemData name="BracketsCurly" defStyleNum="dsNormal" color="#206620" selColor="#219921"/> - <itemData name="Brackets1" defStyleNum="dsNormal" color="#ff0000" selColor="#ffaa00" bold="0" italic="0"/> - <itemData name="Brackets2" defStyleNum="dsNormal" color="#ff8800" selColor="#ffff00" bold="0" italic="0"/> - <itemData name="Brackets3" defStyleNum="dsNormal" color="#888800" selColor="#888888" bold="0" italic="0"/> - <itemData name="Brackets4" defStyleNum="dsNormal" color="#008800" selColor="#000000" bold="0" italic="0"/> - <itemData name="Brackets5" defStyleNum="dsNormal" color="#000088" selColor="#000000" bold="0" italic="0"/> - <itemData name="Brackets6" defStyleNum="dsNormal" color="#880088" selColor="#000000" bold="0" italic="0"/> + <itemData name="Brackets1" defStyleNum="dsNormal" color="#ff0000" selColor="#ffaa00" bold="0" italic="0"/> + <itemData name="Brackets2" defStyleNum="dsNormal" color="#ff8800" selColor="#ffff00" bold="0" italic="0"/> + <itemData name="Brackets3" defStyleNum="dsNormal" color="#888800" selColor="#888888" bold="0" italic="0"/> + <itemData name="Brackets4" defStyleNum="dsNormal" color="#008800" selColor="#000000" bold="0" italic="0"/> + <itemData name="Brackets5" defStyleNum="dsNormal" color="#000088" selColor="#000000" bold="0" italic="0"/> + <itemData name="Brackets6" defStyleNum="dsNormal" color="#880088" selColor="#000000" bold="0" italic="0"/> </itemDatas> </highlighting> <general> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/ocaml.xml new/syntax-highlighting-5.33.0/data/syntax/ocaml.xml --- old/syntax-highlighting-5.32.0/data/syntax/ocaml.xml 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/data/syntax/ocaml.xml 2017-04-01 21:45:56.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <!DOCTYPE language SYSTEM "language.dtd" [ @@ -15,9 +15,9 @@ ]> <language name="Objective Caml" extensions="*.ml;*.mli" - mimetype="" + mimetype="text/x-ocaml" section="Sources" - version="3" + version="4" priority="10" kateversion="2.4" author="Glyn Webster (glynwebster(a)orcon.net.nz) and Vincent Hugot (vincent.hugot(a)gmail.com)" @@ -67,6 +67,7 @@ <item> module </item> <item> mutable </item> <item> new </item> + <item> nonrec </item> <item> object </item> <item> of </item> <item> open </item> @@ -114,12 +115,14 @@ <item> close_out </item> <item> close_out_noerr </item> <item> compare </item> + <item> copysign </item> <item> cos </item> <item> cosh </item> <item> decr </item> <item> do_at_exit </item> <item> epsilon_float </item> <item> exp </item> + <item> expm1 </item> <item> float </item> <item> float_of_int </item> <item> float_of_string </item> @@ -129,6 +132,7 @@ <item> format_of_string </item> <item> frexp </item> <item> fst </item> + <item> hypot </item> <item> ignore </item> <item> in_channel_length </item> <item> incr </item> @@ -146,6 +150,7 @@ <item> lnot </item> <item> log </item> <item> log10 </item> + <item> log1p </item> <item> max </item> <item> max_float </item> <item> max_int </item> @@ -167,18 +172,22 @@ <item> output </item> <item> output_binary_int </item> <item> output_byte </item> + <item> output_bytes </item> <item> output_char </item> <item> output_string </item> + <item> output_substring </item> <item> output_value </item> <item> pos_in </item> <item> pos_out </item> <item> pred </item> + <item> prerr_bytes </item> <item> prerr_char </item> <item> prerr_endline </item> <item> prerr_float </item> <item> prerr_int </item> <item> prerr_newline </item> <item> prerr_string </item> + <item> print_bytes </item> <item> print_char </item> <item> print_endline </item> <item> print_float </item> @@ -189,6 +198,7 @@ <item> read_int </item> <item> read_line </item> <item> really_input </item> + <item> really_input_string </item> <item> ref </item> <item> seek_in </item> <item> seek_out </item> @@ -220,14 +230,18 @@ <item> failwith </item> <item> invalid_arg </item> <item> raise </item> + <item> raise_notrace </item> </list> <list name="Pervasive Types"> <item> array </item> <item> bool </item> + <item> bytes </item> <item> char </item> <item> exn </item> + <item> float </item> <item> format4 </item> + <item> format6 </item> <item> fpclass </item> <item> in_channel </item> <item> int </item> @@ -253,22 +267,13 @@ <item> FP_zero </item> <item> None </item> <item> Open_append </item> - <item> Open_append </item> - <item> Open_binary </item> <item> Open_binary </item> <item> Open_creat </item> - <item> Open_creat </item> - <item> Open_excl </item> <item> Open_excl </item> <item> Open_nonblock </item> - <item> Open_nonblock </item> - <item> Open_rdonly </item> <item> Open_rdonly </item> <item> Open_text </item> - <item> Open_text </item> <item> Open_trunc </item> - <item> Open_trunc </item> - <item> Open_wronly </item> <item> Open_wronly </item> <item> Some </item> </list> @@ -294,10 +299,12 @@ <item> Array </item> <item> ArrayLabels </item> <item> Buffer </item> + <item> Bytes </item> <item> Callback </item> <item> Char </item> <item> Complex </item> <item> Digest </item> + <item> Ephemeron </item> <item> Filename </item> <item> Format </item> <item> Gc </item> @@ -322,12 +329,14 @@ <item> Scanf </item> <item> Set </item> <item> Sort </item> + <item> Spacetime </item> <item> Stack </item> <item> StdLabels </item> <item> Stream </item> <item> String </item> <item> StringLabels </item> <item> Sys </item> + <item> Uchar </item> <item> Weak </item> </list> @@ -471,7 +480,7 @@ <RegExpr String="@see\s*(<[^>]*>|"[^"]*"|'[^']*')" context="#stay" attribute="Ocamldoc Markup" /> <RegExpr String="@(param|raise)\s*" context="Ocamldoc Identifier" attribute="Ocamldoc Markup" /> - <RegExpr String="@(author|deprecated|return|since|version)" context="#stay" attribute="Ocamldoc Markup" /> + <RegExpr String="@(author|before|deprecated|return|since|version)" context="#stay" attribute="Ocamldoc Markup" /> <RegExpr String="@&IDENT;" context="#stay" attribute="Ocamldoc Custom Tag" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/qml.xml new/syntax-highlighting-5.33.0/data/syntax/qml.xml --- old/syntax-highlighting-5.32.0/data/syntax/qml.xml 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/data/syntax/qml.xml 2017-04-01 21:45:56.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd">  -<language name="QML" version="2" kateversion="5.0" section="Scripts" extensions="*.qml" +<language name="QML" version="3" kateversion="5.0" section="Scripts" extensions="*.qml;*.qmltypes" mimetype="text/x-qml;application/x-qml" indenter="cstyle" author="Milian Wolff (mail(a)milianw.de)" license="LGPL"> <highlighting> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/scala.xml new/syntax-highlighting-5.33.0/data/syntax/scala.xml --- old/syntax-highlighting-5.32.0/data/syntax/scala.xml 2017-03-04 17:24:44.000000000 +0100 +++ new/syntax-highlighting-5.33.0/data/syntax/scala.xml 2017-04-01 21:45:56.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> -<language name="Scala" version="2" kateversion="2.3" section="Sources" - extensions="*.scala" mimetype="text/x-scala" license="LGPL" +<language name="Scala" version="3" kateversion="2.3" section="Sources" + extensions="*.scala;*.sbt" mimetype="text/x-scala" license="LGPL" author="Stephane Micheloud (stephane.micheloud(a)epfl.ch)">  -<language name="TOML" section="Configuration" extensions="*.toml" mimetype="text/x-toml" version="2" kateversion="5.0" author="flying-sheep(a)web.de" license="LGPLv2+"> +<language name="TOML" section="Configuration" extensions="*.toml" mimetype="text/x-toml" version="3" kateversion="5.0" author="flying-sheep(a)web.de" license="LGPLv2+"> <highlighting> <list name="bools"> <item>true</item> @@ -65,17 +65,23 @@  <context attribute="Key" lineEndContext="#pop" name="QuotedKey"> <LineContinue attribute="Escape" context="#stay"/> - <HlCStringChar attribute="Escape" context="#stay"/> + <RegExpr attribute="Escape" String="\\[btnfr"\\]" context="#stay" /> + <RegExpr attribute="Escape" String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" /> + <RegExpr attribute="Error" String="\\." context="#stay" /> <DetectChar attribute="Key" context="#pop" char="""/> </context> <context attribute="String" lineEndContext="#pop" name="String"> <LineContinue attribute="Escape" context="#stay"/> - <HlCStringChar attribute="Escape" context="#stay"/> + <RegExpr attribute="Escape" String="\\[btnfr"\\]" context="#stay" /> + <RegExpr attribute="Escape" String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" /> + <RegExpr attribute="Error" String="\\." context="#stay" /> <DetectChar attribute="String" context="#pop" char="""/> </context> <context attribute="String" lineEndContext="#stay" name="MultilineString"> <LineContinue attribute="Escape" context="#stay"/> - <HlCStringChar attribute="Escape" context="#stay"/> + <RegExpr attribute="Escape" String="\\[btnfr"\\]" context="#stay" /> + <RegExpr attribute="Escape" String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" /> + <RegExpr attribute="Error" String="\\." context="#stay" /> <StringDetect attribute="String" context="#pop" String="""""/> </context> <context attribute="LitString" lineEndContext="#pop" name="LitString"> @@ -125,4 +131,4 @@ <comment name="singleLine" start="#" /> </comments> </general> -</language> \ No newline at end of file +</language>

1 0

commit sonnet for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2017-04-30 21:22:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sonnet" Sun Apr 30 21:22:28 2017 rev:42 rq:492103 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2017-03-28 15:13:50.384803586 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2017-04-30 21:22:31.036379535 +0200 @@ -1,0 +2,11 @@ +Sat Apr 15 10:11:59 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- Old: ---- sonnet-5.32.0.tar.xz New: ---- sonnet-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.4xBTK9/_old 2017-04-30 21:22:31.796272392 +0200 +++ /var/tmp/diff_new_pack.4xBTK9/_new 2017-04-30 21:22:31.800271828 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: sonnet -Version: 5.32.0 +Version: 5.33.0 Release: 0 #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 ++++++ sonnet-5.32.0.tar.xz -> sonnet-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.32.0/CMakeLists.txt new/sonnet-5.33.0/CMakeLists.txt --- old/sonnet-5.32.0/CMakeLists.txt 2017-03-04 17:24:28.000000000 +0100 +++ new/sonnet-5.33.0/CMakeLists.txt 2017-04-01 21:45:39.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") # handled by release scripts +set(KF5_VERSION "5.33.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.32.0 NO_MODULE) +find_package(ECM 5.33.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)

1 0

commit solid for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '17

30 Apr '17

Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2017-04-30 21:22:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "solid" Sun Apr 30 21:22:22 2017 rev:42 rq:492102 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2017-03-28 15:13:42.773881710 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2017-04-30 21:22:23.985373715 +0200 @@ -1,0 +2,12 @@ +Sat Apr 15 10:11:59 CEST 2017 - lbeltrame(a)kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Minor: Fix API doc + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- Old: ---- solid-5.32.0.tar.xz New: ---- solid-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.h8wez5/_old 2017-04-30 21:22:24.589288564 +0200 +++ /var/tmp/diff_new_pack.h8wez5/_new 2017-04-30 21:22:24.593288000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Solid5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: solid -Version: 5.32.0 +Version: 5.33.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 3.0 ++++++ solid-5.32.0.tar.xz -> solid-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.32.0/CMakeLists.txt new/solid-5.33.0/CMakeLists.txt --- old/solid-5.32.0/CMakeLists.txt 2017-03-04 17:24:09.000000000 +0100 +++ new/solid-5.33.0/CMakeLists.txt 2017-04-01 21:45:21.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") # handled by release scripts +set(KF5_VERSION "5.33.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.32.0 NO_MODULE) +find_package(ECM 5.33.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.32.0/po/gl/solid5_qt.po new/solid-5.33.0/po/gl/solid5_qt.po --- old/solid-5.32.0/po/gl/solid5_qt.po 2017-03-04 17:24:09.000000000 +0100 +++ new/solid-5.33.0/po/gl/solid5_qt.po 2017-04-01 21:45:21.000000000 +0200 @@ -1071,7 +1071,7 @@ msgctxt "solid-hardware|" msgid "KDE tool for querying your hardware from the command line" msgstr "" -"Unha utilidade de KDE para facer pescudas acerca do hardware mediante a liña " +"Unha utilidade de KDE para facer pescudas sobre o hardware mediante a liña " "de ordes" #: tools/solid-hardware/solid-hardware.cpp:191 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.32.0/src/solid/devices/backends/win/winutils_p.h new/solid-5.33.0/src/solid/devices/backends/win/winutils_p.h --- old/solid-5.32.0/src/solid/devices/backends/win/winutils_p.h 2017-03-04 17:24:09.000000000 +0100 +++ new/solid-5.33.0/src/solid/devices/backends/win/winutils_p.h 2017-04-01 21:45:21.000000000 +0200 @@ -28,7 +28,7 @@ /** * @brief RAII class for blocking Windows from reporting errors * - * Internally calls GetThreadErrorMode + SetErrorMode. This class stores the + * Internally calls SetThreadErrorMode. This class stores the * current error mode on construction and disables certain error reportings * during the life time of this object *

1 0