Attachment 2580 Details for Bug 2528 – Updated tdevelop patch which include the license_svn file as well

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Updated tdevelop patch which include the license_svn file as well

tdevelop.patch (text/plain), 18.60 KB, created by Michele Calgaro on 2015-10-18 04:22:45 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michele Calgaro

Created: 2015-10-18 04:22:45 CDT

Size: 18.60 KB

patch

obsolete

>diff --git a/vcs/subversion/LICENSE_SVN b/vcs/subversion/LICENSE_SVN
>new file mode 100644
>index 0000000..00ef89e
>--- /dev/null
>+++ b/vcs/subversion/LICENSE_SVN
>@@ -0,0 +1,274 @@
>+A small section of code in svn_tdeio.cpp was taken and modified from the source
>+code of subversion 1.8.10, which is released under the following license.
>+---------------------------------------------------------------------------------
>+
>+
>+                                 Apache License
>+                           Version 2.0, January 2004
>+                        http://www.apache.org/licenses/
>+
>+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>+
>+   1. Definitions.
>+
>+      "License" shall mean the terms and conditions for use, reproduction,
>+      and distribution as defined by Sections 1 through 9 of this document.
>+
>+      "Licensor" shall mean the copyright owner or entity authorized by
>+      the copyright owner that is granting the License.
>+
>+      "Legal Entity" shall mean the union of the acting entity and all
>+      other entities that control, are controlled by, or are under common
>+      control with that entity. For the purposes of this definition,
>+      "control" means (i) the power, direct or indirect, to cause the
>+      direction or management of such entity, whether by contract or
>+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
>+      outstanding shares, or (iii) beneficial ownership of such entity.
>+
>+      "You" (or "Your") shall mean an individual or Legal Entity
>+      exercising permissions granted by this License.
>+
>+      "Source" form shall mean the preferred form for making modifications,
>+      including but not limited to software source code, documentation
>+      source, and configuration files.
>+
>+      "Object" form shall mean any form resulting from mechanical
>+      transformation or translation of a Source form, including but
>+      not limited to compiled object code, generated documentation,
>+      and conversions to other media types.
>+
>+      "Work" shall mean the work of authorship, whether in Source or
>+      Object form, made available under the License, as indicated by a
>+      copyright notice that is included in or attached to the work
>+      (an example is provided in the Appendix below).
>+
>+      "Derivative Works" shall mean any work, whether in Source or Object
>+      form, that is based on (or derived from) the Work and for which the
>+      editorial revisions, annotations, elaborations, or other modifications
>+      represent, as a whole, an original work of authorship. For the purposes
>+      of this License, Derivative Works shall not include works that remain
>+      separable from, or merely link (or bind by name) to the interfaces of,
>+      the Work and Derivative Works thereof.
>+
>+      "Contribution" shall mean any work of authorship, including
>+      the original version of the Work and any modifications or additions
>+      to that Work or Derivative Works thereof, that is intentionally
>+      submitted to Licensor for inclusion in the Work by the copyright owner
>+      or by an individual or Legal Entity authorized to submit on behalf of
>+      the copyright owner. For the purposes of this definition, "submitted"
>+      means any form of electronic, verbal, or written communication sent
>+      to the Licensor or its representatives, including but not limited to
>+      communication on electronic mailing lists, source code control systems,
>+      and issue tracking systems that are managed by, or on behalf of, the
>+      Licensor for the purpose of discussing and improving the Work, but
>+      excluding communication that is conspicuously marked or otherwise
>+      designated in writing by the copyright owner as "Not a Contribution."
>+
>+      "Contributor" shall mean Licensor and any individual or Legal Entity
>+      on behalf of whom a Contribution has been received by Licensor and
>+      subsequently incorporated within the Work.
>+
>+   2. Grant of Copyright License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      copyright license to reproduce, prepare Derivative Works of,
>+      publicly display, publicly perform, sublicense, and distribute the
>+      Work and such Derivative Works in Source or Object form.
>+
>+   3. Grant of Patent License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      (except as stated in this section) patent license to make, have made,
>+      use, offer to sell, sell, import, and otherwise transfer the Work,
>+      where such license applies only to those patent claims licensable
>+      by such Contributor that are necessarily infringed by their
>+      Contribution(s) alone or by combination of their Contribution(s)
>+      with the Work to which such Contribution(s) was submitted. If You
>+      institute patent litigation against any entity (including a
>+      cross-claim or counterclaim in a lawsuit) alleging that the Work
>+      or a Contribution incorporated within the Work constitutes direct
>+      or contributory patent infringement, then any patent licenses
>+      granted to You under this License for that Work shall terminate
>+      as of the date such litigation is filed.
>+
>+   4. Redistribution. You may reproduce and distribute copies of the
>+      Work or Derivative Works thereof in any medium, with or without
>+      modifications, and in Source or Object form, provided that You
>+      meet the following conditions:
>+
>+      (a) You must give any other recipients of the Work or
>+          Derivative Works a copy of this License; and
>+
>+      (b) You must cause any modified files to carry prominent notices
>+          stating that You changed the files; and
>+
>+      (c) You must retain, in the Source form of any Derivative Works
>+          that You distribute, all copyright, patent, trademark, and
>+          attribution notices from the Source form of the Work,
>+          excluding those notices that do not pertain to any part of
>+          the Derivative Works; and
>+
>+      (d) If the Work includes a "NOTICE" text file as part of its
>+          distribution, then any Derivative Works that You distribute must
>+          include a readable copy of the attribution notices contained
>+          within such NOTICE file, excluding those notices that do not
>+          pertain to any part of the Derivative Works, in at least one
>+          of the following places: within a NOTICE text file distributed
>+          as part of the Derivative Works; within the Source form or
>+          documentation, if provided along with the Derivative Works; or,
>+          within a display generated by the Derivative Works, if and
>+          wherever such third-party notices normally appear. The contents
>+          of the NOTICE file are for informational purposes only and
>+          do not modify the License. You may add Your own attribution
>+          notices within Derivative Works that You distribute, alongside
>+          or as an addendum to the NOTICE text from the Work, provided
>+          that such additional attribution notices cannot be construed
>+          as modifying the License.
>+
>+      You may add Your own copyright statement to Your modifications and
>+      may provide additional or different license terms and conditions
>+      for use, reproduction, or distribution of Your modifications, or
>+      for any such Derivative Works as a whole, provided Your use,
>+      reproduction, and distribution of the Work otherwise complies with
>+      the conditions stated in this License.
>+
>+   5. Submission of Contributions. Unless You explicitly state otherwise,
>+      any Contribution intentionally submitted for inclusion in the Work
>+      by You to the Licensor shall be under the terms and conditions of
>+      this License, without any additional terms or conditions.
>+      Notwithstanding the above, nothing herein shall supersede or modify
>+      the terms of any separate license agreement you may have executed
>+      with Licensor regarding such Contributions.
>+
>+   6. Trademarks. This License does not grant permission to use the trade
>+      names, trademarks, service marks, or product names of the Licensor,
>+      except as required for reasonable and customary use in describing the
>+      origin of the Work and reproducing the content of the NOTICE file.
>+
>+   7. Disclaimer of Warranty. Unless required by applicable law or
>+      agreed to in writing, Licensor provides the Work (and each
>+      Contributor provides its Contributions) on an "AS IS" BASIS,
>+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>+      implied, including, without limitation, any warranties or conditions
>+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>+      PARTICULAR PURPOSE. You are solely responsible for determining the
>+      appropriateness of using or redistributing the Work and assume any
>+      risks associated with Your exercise of permissions under this License.
>+
>+   8. Limitation of Liability. In no event and under no legal theory,
>+      whether in tort (including negligence), contract, or otherwise,
>+      unless required by applicable law (such as deliberate and grossly
>+      negligent acts) or agreed to in writing, shall any Contributor be
>+      liable to You for damages, including any direct, indirect, special,
>+      incidental, or consequential damages of any character arising as a
>+      result of this License or out of the use or inability to use the
>+      Work (including but not limited to damages for loss of goodwill,
>+      work stoppage, computer failure or malfunction, or any and all
>+      other commercial damages or losses), even if such Contributor
>+      has been advised of the possibility of such damages.
>+
>+   9. Accepting Warranty or Additional Liability. While redistributing
>+      the Work or Derivative Works thereof, You may choose to offer,
>+      and charge a fee for, acceptance of support, warranty, indemnity,
>+      or other liability obligations and/or rights consistent with this
>+      License. However, in accepting such obligations, You may act only
>+      on Your own behalf and on Your sole responsibility, not on behalf
>+      of any other Contributor, and only if You agree to indemnify,
>+      defend, and hold each Contributor harmless for any liability
>+      incurred by, or claims asserted against, such Contributor by reason
>+      of your accepting any such warranty or additional liability.
>+
>+   END OF TERMS AND CONDITIONS
>+
>+   APPENDIX: How to apply the Apache License to your work.
>+
>+      To apply the Apache License to your work, attach the following
>+      boilerplate notice, with the fields enclosed by brackets "[]"
>+      replaced with your own identifying information. (Don't include
>+      the brackets!)  The text should be enclosed in the appropriate
>+      comment syntax for the file format. We also recommend that a
>+      file or class name and description of purpose be included on the
>+      same "printed page" as the copyright notice for easier
>+      identification within third-party archives.
>+
>+   Copyright [yyyy] [name of copyright owner]
>+
>+   Licensed under the Apache License, Version 2.0 (the "License");
>+   you may not use this file except in compliance with the License.
>+   You may obtain a copy of the License at
>+
>+       http://www.apache.org/licenses/LICENSE-2.0
>+
>+   Unless required by applicable law or agreed to in writing, software
>+   distributed under the License is distributed on an "AS IS" BASIS,
>+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+   See the License for the specific language governing permissions and
>+   limitations under the License.
>+
>+
>+SUBVERSION SUBCOMPONENTS:
>+
>+Subversion includes a number of subcomponents with separate copyright
>+notices and license terms. Your use of the source code for the these
>+subcomponents is subject to the terms and conditions of the following
>+licenses.
>+
>+For portions of the Python bindings test suite at
>+subversion/bindings/swig/python/tests/trac/:
>+
>+ I.  Licensed to the Apache Software Foundation (ASF) under one
>+     or more contributor license agreements.  See the NOTICE file
>+     distributed with this work for additional information
>+     regarding copyright ownership.  The ASF licenses this file
>+     to you under the Apache License, Version 2.0 (the
>+     "License"); you may not use this file except in compliance
>+     with the License.  You may obtain a copy of the License at
>+
>+       http://www.apache.org/licenses/LICENSE-2.0
>+
>+     Unless required by applicable law or agreed to in writing,
>+     software distributed under the License is distributed on an
>+     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>+     KIND, either express or implied.  See the License for the
>+     specific language governing permissions and limitations
>+     under the License.
>+
>+ II. Copyright (C) 2003, 2004, 2005 Edgewall Software
>+     Copyright (C) 2003, 2004, 2005 Jonas BorgstrÃ¶m <jonas@edgewall.com>
>+     Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>
>+
>+     All rights reserved.
>+
>+     Redistribution and use in source and binary forms, with or without
>+     modification, are permitted provided that the following conditions
>+     are met:
>+
>+     1. Redistributions of source code must retain the above copyright
>+        notice, this list of conditions and the following disclaimer.
>+     2. Redistributions in binary form must reproduce the above copyright
>+        notice, this list of conditions and the following disclaimer in the
>+        the documentation and/or other materials provided with the
>+        distribution.
>+     3. The name of the author may not be used to endorse or promote
>+        products derived from this software without specific prior written
>+        permission.
>+
>+     THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
>+     OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
>+     ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
>+     DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>+     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
>+     GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
>+     IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
>+     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
>+     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+For the file subversion/libsvn_subr/utf_width.c
>+
>+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
>+ *
>+ * Permission to use, copy, modify, and distribute this software
>+ * for any purpose and without fee is hereby granted. The author
>+ * disclaims all warranties with regard to this software.
>diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
>index 23f1d2f..80343d8 100644
>--- a/vcs/subversion/svn_tdeio.cpp
>+++ b/vcs/subversion/svn_tdeio.cpp
>@@ -47,6 +47,7 @@
> #include <subversion-1/svn_ra.h>
> #include <subversion-1/svn_time.h>
> #include <subversion-1/svn_cmdline.h>
>+#include <subversion-1/svn_version.h>
> 
> #include <kmimetype.h>
> #include <tqfile.h>
>@@ -110,10 +111,60 @@ static svn_error_t *write_to_string(void *baton, const char *data, apr_size_t *l
> 	return SVN_NO_ERROR;
> }
> 
>-static int
>-compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) {
>-  return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
>+#if (SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8)
>+typedef svn_sort__item_t svn_sort_item_type;
>+#else
>+// Taken from subversion 1.8.10 source code and modified where needed
>+
>+// Same as svn_sort__item_t
>+typedef struct svn_sort_item_type {
>+  const void *key;  // pointer to the key
>+  apr_ssize_t klen; // size of the key
>+  void *value;      // pointer to the value
>+} svn_sort_item_type;
>+
>+apr_array_header_t* svn_sort__hash(apr_hash_t *ht,
>+        int (*comparison_func)(const svn_sort__item_t*, const svn_sort__item_t*), apr_pool_t *pool)
>+{
>+  apr_hash_index_t *hi;
>+  apr_array_header_t *ary;
>+  svn_boolean_t sorted;
>+  svn_sort_item_type *prev_item;
>+
>+  /* allocate an array with enough elements to hold all the keys. */
>+  ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type));
>+
>+  /* loop over hash table and push all keys into the array */
>+  sorted = TRUE;
>+  prev_item = NULL;
>+  for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi))
>+	{
>+		svn_sort_item_type *item = (svn_sort_item_type*)apr_array_push(ary);
>+		apr_hash_this(hi, &item->key, &item->klen, &item->value);
>+
>+		if (prev_item == NULL)
>+		{
>+			prev_item = item;
>+			continue;
>+		}
>+
>+		if (sorted)
>+		{
>+			sorted = (comparison_func((svn_sort__item_t*)prev_item, (svn_sort__item_t*)item) < 0);
>+			prev_item = item;
>+		}
>+	}
>+
>+  /* quicksort the array if it isn't already sorted.  */
>+  if (!sorted)
>+  {
>+    qsort(ary->elts, ary->nelts, ary->elt_size,
>+          (int (*)(const void*, const void*))comparison_func);
>+  }
>+
>+  return ary;
> }
>+#endif
> 
> tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
> 	: SlaveBase("tdeio_svn", pool_socket, app_socket) {
>@@ -461,16 +512,16 @@ void tdeio_svnProtocol::listDir(const KURL& url){
>   apr_array_header_t *array;
>   int i;
> 
>-  array = svn_sort__hash (dirents, compare_items_as_paths, subpool);
>+  array = svn_sort__hash (dirents, svn_sort_compare_items_as_paths, subpool);
> 
>   UDSEntry entry;
>   for (i = 0; i < array->nelts; ++i) {
> 	  entry.clear();
>       const char *utf8_entryname, *native_entryname;
>       svn_dirent_t *dirent;
>-      svn_sort__item_t *item;
>+      svn_sort_item_type *item;
> 
>-      item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);
>+      item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);
> 
>       utf8_entryname = (const char*)item->key;
> 
>@@ -2071,7 +2122,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti
> 	tdeio_svnProtocol *p = ( tdeio_svnProtocol* )nb->master;
> 	if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl;
> 
>-	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path )); 
>+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path ));
> 	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action ));
> 	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind ));
> 	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::fromUtf8( mime_type ));

Actions: View | Diff

Attachments on bug 2528: 2578 | 2579 | 2580 | 2581