Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item

htconfig.php

@@ -24,11 +24,15 @@ $db_data = 'mysqldatabasename';
 // Use environment variables for mysql if they are set beforehand
 if (!empty(getenv('MYSQL_HOST'))
 	&& !empty(getenv('MYSQL_PORT'))
-	&& !empty(getenv('MYSQL_USERNAME'))
+	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
 	&& !empty(getenv('MYSQL_PASSWORD'))
 	&& !empty(getenv('MYSQL_DATABASE'))) {
 	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	$db_user = getenv('MYSQL_USERNAME');
+	if (!empty(getenv('MYSQL_USERNAME'))) {
+		$db_user = getenv('MYSQL_USERNAME');
+	} elseif (!empty(getenv('MYSQL_USER'))) {
+		$db_user = getenv('MYSQL_USER');
+	}
 	$db_pass = getenv('MYSQL_PASSWORD');
 	$db_data = getenv('MYSQL_DATABASE');
 }

include/dba.php

@@ -52,16 +52,6 @@ class dba {
 			return false;
 		}
 
-		if ($a->mode == App::MODE_INSTALL) {
-			// server has to be a non-empty string that is not 'localhost' and not an IP
-			if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) {
-				if (! dns_get_record($server, DNS_A + DNS_CNAME)) {
-					self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
-					return false;
-				}
-			}
-		}
-
 		if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
 			self::$driver = 'pdo';
 			$connect = "mysql:host=".$server.";dbname=".$db;

mod/admin.php

@@ -1395,7 +1395,7 @@ function admin_page_site(App $a)
 		'$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system','no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")],
 		'$allowed_oembed'	=> ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system','allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")],
 		'$block_public'		=> ['block_public', L10n::t("Block public"), Config::get('system','block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")],
-		'$force_publish'	=> ['publish_all', L10n::t("Force publish"), Config::get('system','publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.")],
+		'$force_publish'	=> ['publish_all', L10n::t("Force publish"), Config::get('system','publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '<strong>' . L10n::t('Enabling this may violate privacy laws like the GDPR') . '</strong>'],
 		'$global_directory'	=> ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")],
 		'$newuser_private'	=> ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system','newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")],
 		'$enotify_no_content'	=> ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), L10n::t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")],

mod/register.php

@@ -233,8 +233,8 @@ function register_content(App $a)
 		$profile_publish = replace_macros($publish_tpl, [
 			'$instance' => 'reg',
 			'$pubdesc' => L10n::t('Include your profile in member directory?'),
-			'$yes_selected' => ' checked="checked" ',
+			'$yes_selected' => '',
-			'$no_selected' => '',
+			'$no_selected' => ' checked="checked"',
 			'$str_yes' => L10n::t('Yes'),
 			'$str_no' => L10n::t('No'),
 		]);

mod/settings.php

@@ -1091,13 +1091,13 @@ function settings_content(App $a)
 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
 	} else {
 		$profile_in_dir = replace_macros($opt_tpl, [
-			'$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. <a href="%s">%s</a>). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]]
+			'$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
 		]);
 	}
 
 	if (strlen(Config::get('system', 'directory'))) {
 		$profile_in_net_dir = replace_macros($opt_tpl, [
-			'$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
+			'$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. <a href="%s">%s</a>). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]]
 		]);
 	} else {
 		$profile_in_net_dir = '';

mods/sample-nginx.config

@@ -82,27 +82,22 @@ server {
 
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
+    if (!-e $request_filename) {
-        rewrite ^/(.*) /index.php?pagename=$uri&$args last;
+    	rewrite ^(.*)$ /index.php?pagename=$1;
     }
-    rewrite ^/(.*) /index.php?pagename=$uri last;
   }
+  
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    rewrite ^/(.*) /index.php?pagename=$uri&$args last;
+   if (!-e $request_filename) {
-  }
+     rewrite ^(.*)$ /index.php?pagename=$1;
-
+   }
-  # statically serve these file types when possible
-  # otherwise fall back to front controller
-  # allow browser to cache them
-  # added .htm for advanced source code editor library
-  location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
-    expires 30d;
-    try_files $uri /index.php?pagename=$uri&$args;
   }
+  
+  include mime.types;
 
   # block these file types
   location ~* \.(tpl|md|tgz|log|out)$ {

src/App.php

@@ -9,6 +9,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use dba;
 
 use Detection\MobileDetect;
 
@@ -1095,9 +1097,10 @@ class App
 			return '';
 		}
 
-		if (!$this->current_theme) {
+		//// @TODO Compute the current theme only once (this behavior has
-			$this->computeCurrentTheme();
+		/// already been implemented, but it didn't work well -
-		}
+		/// https://github.com/friendica/friendica/issues/5092)
+		$this->computeCurrentTheme();
 
 		return $this->current_theme;
 	}

src/Worker/Cron.php

@@ -102,7 +102,9 @@ Class Cron {
 			dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
 
 			// Optimizing this table only last seconds
-			dba::e("OPTIMIZE TABLE `workerqueue`");
+			if (Config::get('system', 'optimize_workerqueue', false)) {
+				dba::e("OPTIMIZE TABLE `workerqueue`");
+			}
 
 			Config::set('system', 'last_cron_hourly', time());
 		}

view/lang/pl/messages.po

@@ -39,8 +39,8 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-20 13:51+0000\n"
+"PO-Revision-Date: 2018-05-24 16:34+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3946,11 +3946,11 @@ msgstr "Członkowie"
 
 #: mod/group.php:229
 msgid "Remove contact from group"
-msgstr ""
+msgstr "Usuń kontakt z grupy"
 
 #: mod/group.php:253
 msgid "Add contact to group"
-msgstr ""
+msgstr "Dodaj kontakt do grupy"
 
 #: mod/openid.php:29
 msgid "OpenID protocol error. No ID returned."
@@ -4104,7 +4104,7 @@ msgstr "Pokaż niektóre informacje dotyczące potrzebnych informacji do obsług
 
 #: mod/admin.php:307
 msgid "Privacy Statement Preview"
-msgstr ""
+msgstr "Podgląd oświadczenia o prywatności"
 
 #: mod/admin.php:309
 msgid "The Terms of Service"
@@ -5020,7 +5020,7 @@ msgstr "Maksymalny rozmiar stołu do optymalizacji"
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
-msgstr ""
+msgstr "Maksymalny rozmiar tablicy (w MB) do automatycznej optymalizacji. Wprowadź -1, aby go wyłączyć."
 
 #: mod/admin.php:1425
 msgid "Minimum level of fragmentation"
@@ -8804,7 +8804,7 @@ msgstr "Informacje o tej instancji friendica"
 
 #: src/Content/Nav.php:178
 msgid "Terms of Service of this Friendica instance"
-msgstr ""
+msgstr "Warunki świadczenia usług tej instancji Friendica"
 
 #: src/Content/Nav.php:184
 msgid "Network Reset"
@@ -9448,7 +9448,7 @@ msgid ""
 "This data is required for communication and is passed on to the nodes of the"
 " communication partners and is stored there. Users can enter additional "
 "private data that may be transmitted to the communication partners accounts."
-msgstr ""
+msgstr "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych."
 
 #: src/Module/Tos.php:36 src/Module/Tos.php:76
 #, php-format
@@ -9459,7 +9459,7 @@ msgid ""
 "href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
 "be permanent. Deletion of the data will also be requested from the nodes of "
 "the communication partners."
-msgstr ""
+msgstr "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1$s/removeme\">%1$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych."
 
 #: src/Module/Tos.php:39 src/Module/Tos.php:73
 msgid "Privacy Statement"
@@ -9471,7 +9471,7 @@ msgstr "Ten wpis został zedytowany"
 
 #: src/Object/Post.php:187
 msgid "Remove from your stream"
-msgstr ""
+msgstr "Usuń ze swojego strumienia"
 
 #: src/Object/Post.php:200
 msgid "save to folder"

view/lang/pl/strings.php

@@ -915,8 +915,8 @@ $a->strings["Delete Group"] = "Usuń grupę";
 $a->strings["Group Editor"] = "Edycja grup";
 $a->strings["Edit Group Name"] = "Edytuj nazwę grupy";
 $a->strings["Members"] = "Członkowie";
-$a->strings["Remove contact from group"] = "";
+$a->strings["Remove contact from group"] = "Usuń kontakt z grupy";
-$a->strings["Add contact to group"] = "";
+$a->strings["Add contact to group"] = "Dodaj kontakt do grupy";
 $a->strings["OpenID protocol error. No ID returned."] = "Błąd protokołu OpenID. Nie znaleziono identyfikatora.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Konto nie zostało znalezione, a rejestracja OpenID nie jest dozwolona na tej stronie.";
 $a->strings["Login failed."] = "Logowanie nieudane.";
@@ -952,7 +952,7 @@ $a->strings["Display Terms of Service"] = "Wyświetl Warunki korzystania z usłu
 $a->strings["Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page."] = "Włącz stronę Warunki świadczenia usług. Jeśli ta opcja jest włączona, link do warunków zostanie dodany do formularza rejestracyjnego i strony z informacjami ogólnymi.";
 $a->strings["Display Privacy Statement"] = "Wyświetl oświadczenie o prywatności";
 $a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Pokaż niektóre informacje dotyczące potrzebnych informacji do obsługi węzła zgodnie np. do <a href=\"%s\" target=\"_blank\">EU-GDPR</a>.";
-$a->strings["Privacy Statement Preview"] = "";
+$a->strings["Privacy Statement Preview"] = "Podgląd oświadczenia o prywatności";
 $a->strings["The Terms of Service"] = "Warunki świadczenia usług";
 $a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Wprowadź tutaj Warunki świadczenia usług dla swojego węzła. Możesz użyć BBCode. Nagłówki sekcji powinny być [h2] i poniżej.";
 $a->strings["The blocked domain"] = "Zablokowana domena";
@@ -1158,7 +1158,7 @@ $a->strings["Maximum system load before the frontend quits service - default 50.
 $a->strings["Minimal Memory"] = "Minimalna pamięć";
 $a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimalna wolna pamięć w MB dla pracownika. Potrzebuje dostępu do /proc/ meminfo - domyślnie 0 (wyłączone).";
 $a->strings["Maximum table size for optimization"] = "Maksymalny rozmiar stołu do optymalizacji";
-$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "";
+$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "Maksymalny rozmiar tablicy (w MB) do automatycznej optymalizacji. Wprowadź -1, aby go wyłączyć.";
 $a->strings["Minimum level of fragmentation"] = "Minimalny poziom fragmentacji";
 $a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimalny poziom fragmentacji, aby rozpocząć automatyczną optymalizację - domyślna wartość to 30%.";
 $a->strings["Periodical check of global contacts"] = "Okresowa kontrola kontaktów globalnych";
@@ -2045,7 +2045,7 @@ $a->strings["Conversations on this and other servers"] = "Rozmowy na tym i innyc
 $a->strings["Directory"] = "Katalog";
 $a->strings["People directory"] = "Katalog osób";
 $a->strings["Information about this friendica instance"] = "Informacje o tej instancji friendica";
-$a->strings["Terms of Service of this Friendica instance"] = "";
+$a->strings["Terms of Service of this Friendica instance"] = "Warunki świadczenia usług tej instancji Friendica";
 $a->strings["Network Reset"] = "Resetowanie sieci";
 $a->strings["Load Network page with no filters"] = "Załaduj stronę sieci bez filtrów";
 $a->strings["Friend Requests"] = "Prośba o przyjęcie do grona znajomych";
@@ -2183,11 +2183,11 @@ $a->strings["terms of service"] = "warunki użytkowania";
 $a->strings["Website Privacy Policy"] = "Polityka Prywatności Witryny";
 $a->strings["privacy policy"] = "polityka prywatności";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "W momencie rejestracji oraz w celu zapewnienia komunikacji między kontem użytkownika, a jego kontaktami, użytkownik musi podać nazwę wyświetlaną (pseudonim), nazwę użytkownika (przydomek) i działający adres e-mail. Nazwy będą dostępne na stronie profilu konta dla każdego odwiedzającego stronę, nawet jeśli inne szczegóły profilu nie zostaną wyświetlone. Adres e-mail będzie używany tylko do wysyłania powiadomień użytkownika o interakcjach, ale nie będzie wyświetlany w widoczny sposób. Lista kont w katalogu użytkownika węzła lub globalnym katalogu użytkownika jest opcjonalna i może być kontrolowana w ustawieniach użytkownika, nie jest konieczna do komunikacji.";
-$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "";
+$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych.";
-$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "";
+$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1\$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1\$s/removeme\">%1\$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych.";
 $a->strings["Privacy Statement"] = "Oświadczenie o prywatności";
 $a->strings["This entry was edited"] = "Ten wpis został zedytowany";
-$a->strings["Remove from your stream"] = "";
+$a->strings["Remove from your stream"] = "Usuń ze swojego strumienia";
 $a->strings["save to folder"] = "zapisz w folderze";
 $a->strings["I will attend"] = "Będę uczestniczyć";
 $a->strings["I will not attend"] = "Nie będę uczestniczyć";

view/templates/htconfig.tpl

@@ -19,16 +19,21 @@ $db_data = '{{$dbdata}}';
 
 // Use environment variables for mysql if they are set beforehand
 if (!empty(getenv('MYSQL_HOST'))
-   && !empty(getenv('MYSQL_PORT'))
+	&& !empty(getenv('MYSQL_PORT'))
-   && !empty(getenv('MYSQL_USERNAME'))
+	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
-   && !empty(getenv('MYSQL_PASSWORD'))
+	&& !empty(getenv('MYSQL_PASSWORD'))
-   && !empty(getenv('MYSQL_DATABASE'))) {
+	&& !empty(getenv('MYSQL_DATABASE'))) {
 	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	$db_user = getenv('MYSQL_USERNAME');
+	if (!empty(getenv('MYSQL_USERNAME'))) {
+		$db_user = getenv('MYSQL_USERNAME');
+	} elseif (!empty(getenv('MYSQL_USER'))) {
+		$db_user = getenv('MYSQL_USER');
+	}
 	$db_pass = getenv('MYSQL_PASSWORD');
 	$db_data = getenv('MYSQL_DATABASE');
 }
 
+
 // Set the database connection charset to full Unicode (utf8mb4).
 // Changing this value will likely corrupt the special characters.
 // You have been warned.

view/theme/frost-mobile/TODO

@@ -1,31 +0,0 @@
-Photo album display?
-
-- The "lock" icon for private items
-	- change it to black?
-	- when clicked, the popup window displays poorly
-
-- Edit photo page: bottom buttons are off-center in Dolphin Mini
-
-- BB code buttons for status updates
-
-- Get "add contact" back on contacts page
-
-- Allow creating a new private message
-
-- Admin: access to more pages than summary?
-
-- Find a way to show embedded videos at the normal size for tablets that can handle it
-
-- Need to find a way to deal with freakin annoying elements that don't respect screen width limits.
-  Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and
-  making the rest of the body text overflow the item's borders that is screen-width sensitive (it's
-  annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems:
-	- code blocks
-	- blockquote blocks
-	- #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags
-
-- Needs to be faster!
-	- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
-
-
-- Sometimes, when "Permission denied", wrong login page is shown

view/theme/frost-mobile/images/oxygen/LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.