Index: src/lib/SSDP/NotifyMsgFactory.cpp
===================================================================
--- src/lib/SSDP/NotifyMsgFactory.cpp	(revision 692)
+++ src/lib/SSDP/NotifyMsgFactory.cpp	(working copy)
@@ -56,7 +56,7 @@

 	result << "NOTIFY * HTTP/1.1\r\n";
   result << "HOST: 239.255.255.250:1900\r\n";
-	result << "CACHE-CONTROL: max-age=1800\r\n";
+	result << "CACHE-CONTROL: max-age=1900\r\n";
 	result << "LOCATION: http://" << m_sHTTPServerURL << "/description.xml\r\n";
   result << "NT: " << type_to_string(a_type) << "\r\n";
 	result << "NTS: ssdp:alive\r\n";

Add patch to increase ttl for samsung television.


From 39272e0a1c227b1ab9360e6fbcbc497eaaed4cb0 Mon Sep 17 00:00:00 2001
From: John Lo <loj@cisco.com>
Date: Fri, 26 Feb 2016 12:45:55 -0500
Subject: [PATCH 1/2] Fix link bonding PMD slave status polling path used by
 ENIC driver,

---
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index b1373c6..9efd73c 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1734,7 +1734,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)

 	if (!bonded_ethdev->data->dev_started ||
 		!internals->link_status_polling_enabled)
-		return;
+		goto rearm_and_exit;

 	/* If device is currently being configured then don't check slaves link
 	 * status, wait until next period */
@@ -1768,6 +1768,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)
 		rte_spinlock_unlock(&internals->lock);
 	}

+ rearm_and_exit:
 	if (polling_slave_found)
 		/* Set alarm to continue monitoring link status of slave ethdev's */
 		rte_eal_alarm_set(internals->link_status_polling_interval_ms * 1000,
--
1.9.1

Fix link bonding PMD slave status polling path used by VIC ENIC driver.

Change-Id: Ic9fc952b618477beb246974b33d753bf6fd47dde
Signed-off-by: John Lo <e676165d137051a9de0d8979abbff6c5d0ccb4f0@cisco.com>


diff -urN libdvdread-4.1.3/configure.ac libdvdread-4.1.3-haiku/configure.ac
--- libdvdread-4.1.3/configure.ac	2009-02-19 08:11:30.000000000 +0000
+++ libdvdread-4.1.3-haiku/configure.ac	2009-02-19 08:03:55.000000000 +0000
@@ -145,6 +145,8 @@
   *cygwin*)
     LDFLAGS="-no-undefined $LDFLAGS"
     ;;
+  *haiku*)
+    ;;
   *)
     AC_CHECK_LIB(c, dlopen,
 	         DYNAMIC_LD_LIBS="",
diff -urN libdvdread-4.1.3/src/bswap.h libdvdread-4.1.3-haiku/src/bswap.h
--- libdvdread-4.1.3/src/bswap.h	2009-02-19 08:11:31.000000000 +0000
+++ libdvdread-4.1.3-haiku/src/bswap.h	2009-02-19 08:09:28.000000000 +0000
@@ -71,7 +71,7 @@
  * functionality!
  */

-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__)
 #define B2N_16(x) \
  x = ((((x) & 0xff00) >> 8) | \
       (((x) & 0x00ff) << 8))

Patch to allow building libdvdread on haiku


diff --git library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java
index 25a92e2..abfea77 100644
--- library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java
+++ library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java
@@ -80,7 +80,10 @@ public final class PtsTimestampAdjuster {
     }
     // Record the adjusted PTS to adjust for wraparound next time.
     lastPts = pts;
-    return timeUs + timestampOffsetUs;
+
+    // SEAN:
+    //return timeUs + timestampOffsetUs;
+    return timeUs;
   }

   /**

Patch to fix ExoPlayer TS seeking

Patch to fix ExoPlayer TS seeking


diff -Naur gzip-1.3.12-original/configure.ac gzip-1.3.12/configure.ac
--- gzip-1.3.12-original/configure.ac	2009-04-06 23:31:48.000000000 -0400
+++ gzip-1.3.12/configure.ac	2009-04-06 23:37:45.000000000 -0400
@@ -26,13 +26,14 @@
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 AM_INIT_AUTOMAKE([gnits])
+AC_CONFIG_MACRO_DIR([m4])

 AC_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_CHECK_TOOL([NM], [nm], [nm])
 AC_PROG_LN_S
-AC_PROG_RANLIB
+LT_INIT
 AC_PROG_SHELL

 gl_EARLY

Patch for configure.ac : AC_CONFIG_MACRO([m4]) and s/AC_PROG_RANLIB/LT_INIT


diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 185e681..b9d8dcc 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -138,7 +138,7 @@
                 <argument>bash</argument>
                 <argument>-c</argument>
                 <argument>cat maven-shared-archive-resources/META-INF/NOTICE \
-                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt` \
+                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`
                 </argument>
               </arguments>
               <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>

BIGTOP-3004: Fix HBase build failure on Debian/Fedora

Debian/Fedora uses bash-4.4.12 which treats the extra
trailing backslash as error. HBase has patch for this
and should be backported.

Change-Id: I11353ec0fcdca6e04373c0dac34e0e23aa757f30
Signed-off-by: Jun He <05c4aea3b428e9f4cbf962ab56f389db00194977@linaro.org>
Signed-off-by: Evans Ye <7923dc130617f2e3d238aa15914d111b40ceb059@apache.org>


From 1e106a503a3ffd63e37e96a8e071c16e6bf63f03 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sun, 19 Oct 2014 19:55:16 -0700
Subject: [PATCH] PlatformWindow: Add needed support in PlatformWindow.

This patch adds necessary API support in PlatformWindow. The changes
need to be evaluated further before trying to upstream them.
---
 ui/platform_window/platform_window.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ui/platform_window/platform_window.h b/ui/platform_window/platform_window.h
index d5f5750..14aada4 100644
--- a/ui/platform_window/platform_window.h
+++ b/ui/platform_window/platform_window.h
@@ -22,8 +22,21 @@ class PlatformWindowDelegate;
 // underlying platform windowing system (i.e. X11/Win/OSX).
 class PlatformWindow {
  public:
+   enum PlatformWindowType {
+     PLATFORM_WINDOW_UNKNOWN,
+     PLATFORM_WINDOW_TYPE_TOOLTIP,
+     PLATFORM_WINDOW_TYPE_POPUP,
+     PLATFORM_WINDOW_TYPE_MENU,
+     PLATFORM_WINDOW_TYPE_BUBBLE,
+     PLATFORM_WINDOW_TYPE_WINDOW,
+     PLATFORM_WINDOW_TYPE_WINDOW_FRAMELESS
+   };
+
   virtual ~PlatformWindow() {}

+  virtual void InitPlatformWindow(PlatformWindowType type,
+                                  gfx::AcceleratedWidget parent_window) { }
+
   virtual void Show() = 0;
   virtual void Hide() = 0;
   virtual void Close() = 0;
--
1.9.1

Add needed support in PlatformWindow.

Add needed support in PlatformWindow.


diff --git b/src/generated/accessible_adaptor.cpp a/src/generated/accessible_adaptor.cpp
index 5542a5c..5474686 100644
--- b/src/generated/accessible_adaptor.cpp
+++ a/src/generated/accessible_adaptor.cpp
@@ -51,7 +51,8 @@ QString AccessibleAdaptor::name() const
     return qvariant_cast< QString >(parent()->property("name"));
 }

-QSpiObjectReference AccessibleAdaptor::parent() const
+//HAND-EDIT because parent() is a QObject method already...
+QSpiObjectReference AccessibleAdaptor::getParent() const
 {
     // get the value of property parent
     return qvariant_cast< QSpiObjectReference >(parent()->property("parent"));
diff --git b/src/generated/accessible_adaptor.h a/src/generated/accessible_adaptor.h
index dad2cf9..75a7bb9 100644
--- b/src/generated/accessible_adaptor.h
+++ a/src/generated/accessible_adaptor.h
@@ -90,8 +90,8 @@ public: // PROPERTIES
     Q_PROPERTY(QString name READ name)
     QString name() const;

-    Q_PROPERTY(QSpiObjectReference parent READ parent)
-    QSpiObjectReference parent() const;
+    Q_PROPERTY(QSpiObjectReference parent READ getParent)
+    QSpiObjectReference getParent() const;

 public Q_SLOTS: // METHODS
     QSpiObjectReference GetApplication();

Add patch to make maintenance of hand edited parts easier.

Since parent exists in at-spi and qobject, we need to rename one of them.


diff --git a/ckanext/reclineview/theme/public/recline_view.js b/ckanext/reclineview/theme/public/recline_view.js
index 43a6e27..0636ace 100644
--- a/ckanext/reclineview/theme/public/recline_view.js
+++ b/ckanext/reclineview/theme/public/recline_view.js
@@ -1,11 +1,20 @@
 this.ckan.module('recline_view', function (jQuery, _) {
+  var NoRecordsView = Backbone.View.extend({
+    template: '
{{text}}
',
+    render: function(){
+      var self = this;
+      var htmls = Mustache.render(self.template, {text: self.options.i18n.noRecords});
+      self.$el.html(htmls);
+    }
+  });
   return {
     options: {
       i18n: {
         errorLoadingPreview: "Could not load view",
         errorDataProxy: "DataProxy returned an error",
         errorDataStore: "DataStore returned an error",
-        previewNotAvailableForDataType: "View not available for data type: "
+        previewNotAvailableForDataType: "View not available for data type: ",
+        noRecords: "No matching records"
       },
       site_url: "",
       controlsClassName: "controls"
@@ -87,7 +96,12 @@ this.ckan.module('recline_view', function (jQuery, _) {
           state,
           controls = [];

-      if(reclineView.view_type === "recline_graph_view") {
+      if(typeof(dataset.recordCount) == 'undefined' || dataset.recordCount == 0){
+        view = new NoRecordsView({
+          'model': dataset,
+          i18n: {noRecords:this.options.i18n.noRecords}
+        });
+      } else if(reclineView.view_type === "recline_graph_view") {
         state = {
           "graphType": reclineView.graph_type,
           "group": reclineView.group,

Patch to make recline view handle empty searches. PR 2028 sent to CKAN.


From 08a346400c17ac72009f07d565de7da49cd073d7 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Thu, 12 May 2016 11:07:34 +0100
Subject: [PATCH] Allow earlier gettext version

Allow 0.18 rather than 0.19
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ec08be8..e3cc79d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no")

 GTK_DOC_CHECK(1.1)
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19])
+AM_GNU_GETTEXT_VERSION([0.18])

 AC_C_BIGENDIAN

--
1.9.1

Add patch to allow earlier gettext

Add patch to allow earlier gettext


--- /tmp/rrdtool-1.4.5-4/configure.ac	2011-05-18 13:58:07.894187696 -0400
+++ rrdtool-1.4.5/configure.ac	2011-05-18 14:39:07.034665407 -0400
@@ -763,8 +763,10 @@
              test "$?" = "0" && LUA_HAVE_COMPAT51=HAVE_COMPAT51],
             [AC_SEARCH_LIBS(luaL_openlib, lualib$lua_vdot lualib$lua_vndot lualib,
               [lua_havelib=$lua_vndot],
-              [COMP_LUA=], [-lm])], [-lm])], [-lm])],
-        [COMP_LUA=], [-lm])
+              [COMP_LUA=], [-lm -ldl -lcrypt])],
+            [-lm -ldl -lcrypt])],
+          [-lm -ldl -lcrypt])],
+        [COMP_LUA=], [-lm -ldl -lcrypt])
       lua_libs=$LIBS
       LIBS=

[wrt] Add -lcrypt to rrdtool configure looking for lua to support Backfire linking crypt() into liblua.  Doesn't break trunk


Disable K6/K7 builds (just in case).

gmp: Disable K6/K7 builds (just in case).


Index: twisted/web2/dav/test/test_stream.py
===================================================================
--- twisted/web2/dav/test/test_stream.py	(revision 0)
+++ twisted/web2/dav/test/test_stream.py	(revision 0)
@@ -0,0 +1,51 @@
+##
+# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+##
+
+from twisted.trial import unittest
+from twisted.web2.stream import MemoryStream
+from twisted.web2.dav.stream import MD5StreamWrapper
+import md5
+
+class Stream(unittest.TestCase):
+    """
+    MD5StreamWrapper tests.
+    """
+    def test_simple(self):
+        """
+        Simple test
+        """
+
+        data = """I am sorry Dave, I can't do that.
+--HAL 9000
+"""
+
+        datastream = MemoryStream(data)
+        stream = MD5StreamWrapper(datastream)
+
+        while stream.read() is not None:
+            pass
+        stream.close()
+
+        m = md5.new()
+        m.update(data)
+
+        self.assertEqual(m.hexdigest(), stream.getMD5())

Test to make sure we don't hash None.

Test to make sure we don't hash None.

git-svn-id: 81e381228600e5752b80483efd2b45b26c451ea2@2615 e27351fd-9f3e-4f54-a53b-843176b1656c


Index: Makefile
===================================================================
--- Makefile	(revision 179269)
+++ Makefile	(working copy)
@@ -77,12 +77,25 @@
   NO_INSTALL = 1
 endif

+ifeq ($(MAKECMDGOALS),install-cling)
+  DIRS := tools/cling/tools/driver tools/cling/docs \
+          tools/clang/lib/Headers
+  OPTIONAL_DIRS :=
+  NO_INSTALL = 1
+endif
+
 ifeq ($(MAKECMDGOALS),clang-only)
   DIRS := $(filter-out tools docs unittests, $(DIRS)) \
           tools/clang tools/lto
   OPTIONAL_DIRS :=
 endif

+ifeq ($(MAKECMDGOALS),cling-only)
+  DIRS := $(filter-out tools docs unittests, $(DIRS)) \
+          tools/clang tools/cling
+  OPTIONAL_DIRS :=
+endif
+
 ifeq ($(MAKECMDGOALS),unittests)
   DIRS := $(filter-out tools runtime docs, $(DIRS)) utils unittests
   OPTIONAL_DIRS :=
@@ -164,9 +177,11 @@
 	  $(TopDistDir)/include/llvm/Support/DataTypes.h

 clang-only: all
+cling-only: all
 tools-only: all
 libs-only: all
 install-clang: install
+install-cling: install
 install-libs: install

 # If SHOW_DIAGNOSTICS is enabled, clear the diagnostics file first.

Add targets cling-only; install-cling - reduces build-time for cling. ROOT-4868


diff --git a/gdb/dcache.c b/gdb/dcache.c
index e1386e0..65b1a02 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -76,7 +76,7 @@
 /* The size of a cache line.  Smaller values reduce the time taken to
    read a single byte and make the cache more granular, but increase
    overhead and reduce the effectiveness of the cache as a prefetcher.  */
-#define LINE_SIZE_POWER 6
+#define LINE_SIZE_POWER 8
 #define LINE_SIZE (1 << LINE_SIZE_POWER)

 /* Each cache block holds LINE_SIZE bytes of data

Add a gdb patch increasing the

Add a gdb patch increasing the

Roundtrips are more expensive then plain data transfer. So fetch larger
chunks and hope there will be fewer. Works well in practice.


--- sofia-sip-1.12.11.orig/libsofia-sip-ua/tport/tport_tls.c	2011-03-11 15:49:19.000000000 +0100
+++ sofia-sip-1.12.11/libsofia-sip-ua/tport/tport_tls.c	2012-12-18 17:38:45.000000000 +0100
@@ -396,15 +396,15 @@
   if (!tls)
     return;

-  if (tls->con != NULL)
+  if (tls->con != NULL) {
     SSL_shutdown(tls->con);
+    SSL_shutdown(tls->con);
+    SSL_free(tls->con);
+  }

   if (tls->ctx != NULL && tls->type != tls_slave)
     SSL_CTX_free(tls->ctx);

-  if (tls->bio_con != NULL)
-    BIO_free(tls->bio_con);
-
   su_home_unref(tls->home);
 }

@@ -472,7 +472,6 @@

   if (tls) {
     tls->ctx = master->ctx;
-    tls->type = master->type;
     tls->accept = accept ? 1 : 0;
     tls->verify_outgoing = master->verify_outgoing;
     tls->verify_incoming = master->verify_incoming;

Add patch to fix sofia TLS memory leak.

Add patch to fix sofia TLS memory leak.


From dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Date: Fri, 30 Mar 2018 11:58:16 -0700
Subject: [PATCH] QCoreTextFontEngine: Fix build with Xcode 9.3

Apple LLVM version 9.1.0 (clang-902.0.39.1)

Error message:

.../qfontengine_coretext.mm:827:20: error: qualified reference to
      'QFixed' is a constructor name rather than a type in this context
    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));

Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 25ff69d877d..98b753eff96 100644
--- old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl

 QFixed QCoreTextFontEngine::emSquareSize() const
 {
-    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
 }

 QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
--
2.16.3

Fix Qt build with XCode 9.3

depends: Fix Qt build with XCode 9.3


--- a/apis/Google.Cloud.Recommender.V1/Google.Cloud.Recommender.V1.Snippets/RecommenderClientSnippets.g.cs
+++ b/apis/Google.Cloud.Recommender.V1/Google.Cloud.Recommender.V1.Snippets/RecommenderClientSnippets.g.cs
@@ -405,7 +405,7 @@ namespace Google.Cloud.Recommender.V1.Snippets
             RecommenderName parent = new RecommenderName("[PROJECT]", "[LOCATION]", "[RECOMMENDER]");
             string filter = "";
             // Make the request
-            PagedEnumerable<ListRecommendationsResponse, Recommendation> response = recommenderClient.ListRecommendations(parent, filter);
+            PagedEnumerable<ListRecommendationsResponse, Recommendation> response = recommenderClient.ListRecommendations(parent, filter: filter);

             // Iterate over all response items, lazily performing RPCs as required
             foreach (Recommendation item in response)
@@ -451,7 +451,7 @@ namespace Google.Cloud.Recommender.V1.Snippets
             RecommenderName parent = new RecommenderName("[PROJECT]", "[LOCATION]", "[RECOMMENDER]");
             string filter = "";
             // Make the request
-            PagedAsyncEnumerable<ListRecommendationsResponse, Recommendation> response = recommenderClient.ListRecommendationsAsync(parent, filter);
+            PagedAsyncEnumerable<ListRecommendationsResponse, Recommendation> response = recommenderClient.ListRecommendationsAsync(parent, filter: filter);

             // Iterate over all response items, lazily performing RPCs as required
             await response.ForEachAsync((Recommendation item) =>

Add patch for Google.Cloud.Recommender.V1 to provide named arguments

This can be removed in the next-major-version branch, where the generator does the right thing.


Index: test/Makefile
===================================================================
--- test/Makefile	(revision 153954)
+++ test/Makefile	(working copy)
@@ -61,6 +61,8 @@
 ifndef TESTSUITE
 ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test

 # Force creation of Clang's lit.site.cfg.
 clang-lit-site-cfg: FORCE

Enable global check-all to include cling if checked out.

git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@43638 27541ba8-7e3a-0410-8455-c3a389f83636


From bc330a80de4a626623e75dc5d86c5899ac8626fe Mon Sep 17 00:00:00 2001
From: Ian Munsie <darkstarsword@gmail.com>
Date: Tue, 9 Jul 2013 14:45:34 +1000
Subject: [PATCH] Make focussing off the end of an output wrap

This way feels more comfortable to me, though it may just be that I'm
used to it from wmii.
---
 src/tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tree.c b/src/tree.c
index 836183e..0df3222 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -562,7 +562,7 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
         else
             return false;

-        next_output = get_output_next(direction, current_output, CLOSEST_OUTPUT);
+        next_output = get_output_next_wrap(direction, current_output);
         if (!next_output)
             return false;
         DLOG("Next output is %s\n", next_output->name);
--
1.8.4.rc3

patches/i3: Make focussing off the end of an output wrap


--- ../src_base/minecraft/net/minecraft/client/renderer/texture/Texture.java
+++ ../src_work/minecraft/net/minecraft/client/renderer/texture/Texture.java
@@ -222,7 +222,7 @@

                 if (par4)
                 {
-                    l = par2 + (par3Texture.getHeight() - k);
+                    l = par1 + (par3Texture.getHeight() - k); //BUGFIX: targetY -> targetX
                 }

                 for (int k1 = 0; k1 < par3Texture.getWidth(); ++k1)
@@ -232,7 +232,7 @@

                     if (par4)
                     {
-                        l1 = par1 + k1 * this.width * 4 + l * 4;
+                        l1 = (par2 + k1) * this.width * 4 + l * 4; //BUGFIX: targetX -> targetY and parens
                     }

                     this.textureData.put(l1 + 0, bytebuffer.get(i2 + 0));

--- ../src_base/minecraft/net/minecraft/client/renderer/texture/Texture.java
+++ ../src_work/minecraft/net/minecraft/client/renderer/texture/Texture.java
@@ -222,7 +222,7 @@

                 if (par4)
                 {
-                    l = par2 + (par3Texture.getHeight() - k);
+                    l = par1 + (par3Texture.getHeight() - k - 1); //BUGFIX: targetY -> targetX and -1
                 }

                 for (int k1 = 0; k1 < par3Texture.getWidth(); ++k1)
@@ -232,7 +232,7 @@

                     if (par4)
                     {
-                        l1 = par1 + k1 * this.width * 4 + l * 4;
+                        l1 = (par2 + k1) * this.width * 4 + l * 4; //BUGFIX: targetX -> targetY and parens
                     }

                     this.textureData.put(l1 + 0, bytebuffer.get(i2 + 0));

Fix off-by-one in rotated textures.

Fix off-by-one in rotated textures.


Index: makefile
===================================================================
--- makefile	(revision 3)
+++ makefile	(working copy)
@@ -13,7 +13,7 @@
 #    Set compiler.
 #------------------------------------------------

-FC = gfortran
+#FC = gfortran

 #------------------------------------------------
 #    Set NetCDF Library Locations.
@@ -23,10 +23,10 @@
 #        HDF5 :=
 #------------------------------------------------

-NETCDF_INCDIR = /usr/local/netcdf-4.1.3/include
-NETCDF_LIBDIR = /usr/local/netcdf-4.1.3/lib
+#NETCDF_INCDIR = /usr/local/netcdf-4.1.3/include
+#NETCDF_LIBDIR = /usr/local/netcdf-4.1.3/lib

-HDF5 := on
+HDF5 :=

 #------------------------------------------------
 #    Set compiler flags.
@@ -49,13 +49,14 @@
 ifdef HDF5
 	LIBS      = -L$(NETCDF_LIBDIR) -lnetcdf -lnetcdff -L/usr/local/hdf5-1.8.7/lib -lhdf5_hl -lhdf5 -lcurl
 else
-	LIBS      = -L$(NETCDF_LIBDIR) -lnetcdf
+	LIBS      = -L$(NETCDF_LIBDIR) -lnetcdf -lnetcdff
 endif

+NAME=ltrans

 LTRANS : $(OBJS)
 	@echo "  Compiling LTRANS.f90"
-	@$(FC) $(FFLAGS) -o LTRANS LTRANS.f90 $(OBJS) $(LIBS)
+	@$(FC) $(FFLAGS) -o $(NAME) LTRANS.f90 $(OBJS) $(LIBS)
 	@\rm *.o *.mod
 	@echo "  "
 	@echo "  Compilation Successfully Completed"
@@ -66,5 +67,5 @@
 	@$(FC) $(FFLAGS) -c $<

 clean:
-	\rm *.o *.mod LTRANS
+	\rm *.o *.mod $(NAME)

Add patch to makefile Use it to set environment variables, include a missing library, and lowercase the executable name.


Add example to skip menu and load default file on startup


--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -89,7 +89,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B)
     return __A;
 }

-#  ifdef __OPTIMIZE__
+#  if defined(__OPTIMIZE__) && !defined(__clang__)
 extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
 {

Fix pixmap compilation with clang

Fix pixmap compilation with clang

Clang does not allow a variable to be used for the "K" register, even if
all uses of the inlined function use a constant value.

The current version of pixmap doesn't use the inline function. It uses a
macro regardless of the optimization level. There should be no
performance overhead from using the macro.


--- src/Terraria\Terraria.Social\SocialAPI.cs
+++ src/tModLoader\Terraria.Social\SocialAPI.cs
@@ -28,6 +28,9 @@
 			{
 				mode = new SocialMode?(SocialMode.None);
 #if CLIENT
+#if DEBUG
+                if (!Program.LaunchParameters.ContainsKey("-nosteam"))
+#endif
 				mode = new SocialMode?(SocialMode.Steam);
 #else
 				if (Program.LaunchParameters.ContainsKey("-steam"))

Add -nosteam command line parameter for debugging.


From 8a882d8b2d8587772138d4f65d47bf15e5b83004 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@silklabs.com>
Date: Tue, 3 May 2016 16:21:05 -0700
Subject: [PATCH] Allow .node modules to override LOCAL_INSTALLED_MODULE_STEM

Change-Id: Ic4ce75a0bd7fd3546d62ad79edee84ab85012e9a
---
 core/shared_library.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/shared_library.mk b/core/shared_library.mk
index 71a3bb2..00764c0 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -40,8 +40,13 @@ LOCAL_BUILT_MODULE :=
 LOCAL_INSTALLED_MODULE :=
 LOCAL_MODULE_STEM :=
 LOCAL_BUILT_MODULE_STEM :=
+ifeq ($(LOCAL_MODULE_SUFFIX),.node)
+# Gyp-generated .node modules can have very unfriendly LOCAL_MODULE names and
+# want to use LOCAL_INSTALLED_MODULE_STEM to fix them for installing on device.
+$(info Keeping LOCAL_INSTALLED_MODULE_STEM for $(LOCAL_MODULE): $(LOCAL_INSTALLED_MODULE_STEM))
+else
 LOCAL_INSTALLED_MODULE_STEM :=
-LOCAL_INTERMEDIATE_TARGETS :=
+endif

 include $(BUILD_SYSTEM)/shared_library_internal.mk

--
1.9.1


Make copy-propagated pointers be addressed in Pmode.

BUG: http://code.google.com/p/nativeclient/issues/detail?id=453
diff -uNr gcc-4.4.3.orig/gcc/config/i386/i386.c gcc-4.4.3/gcc/config/i386/i386.c
--- gcc-4.4.3.orig/gcc/config/i386/i386.c	2010-04-28 16:21:13.000000000 +0200
+++ gcc-4.4.3/gcc/config/i386/i386.c	2010-04-28 16:22:02.000000000 +0200
@@ -19102,7 +19102,12 @@
 	   ? !sibcall_insn_operand (XEXP (fnaddr, 0), Pmode)
 	   : !call_insn_operand (XEXP (fnaddr, 0), Pmode))
     {
-      fnaddr = copy_to_mode_reg (Pmode, XEXP (fnaddr, 0));
+      fnaddr = copy_to_mode_reg (ptr_mode, XEXP (fnaddr, 0));
+      if (Pmode != ptr_mode)
+	{
+	  fnaddr = gen_lowpart (Pmode, fnaddr);
+	  fnaddr = force_reg(Pmode, fnaddr);
+	}
       fnaddr = gen_rtx_MEM (QImode, fnaddr);
     }

Make copy-propagated pointers be addressed in Pmode.

BUG: http://code.google.com/p/nativeclient/issues/detail?id=453
Review URL: http://codereview.chromium.org/1700020

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@2154 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2


commit 722beb976da61fffd48546a3a6b2dca994e96bbd
Author: Han-Wen Nienhuys <hanwen@google.com>
Date:   Wed Aug 17 00:01:08 2011 -0300

    Introduce $(MAKE_SHELL) for invoking shell commands.

    This allows for more flexible command distribution.

diff --git a/job.c b/job.c
index aacfb84..c6cd1f4 100644
--- a/job.c
+++ b/job.c
@@ -3138,7 +3138,11 @@ construct_command_argv (char *line, char **restp, struct file *file,
     int save = warn_undefined_variables_flag;
     warn_undefined_variables_flag = 0;

-    shell = allocated_variable_expand_for_file ("$(SHELL)", file);
+    shell = allocated_variable_expand_for_file ("$(MAKE_SHELL)", file);
+    if (*shell == '\0') {
+      free(shell);
+      shell = allocated_variable_expand_for_file ("$(SHELL)", file);
+    }
 #ifdef WINDOWS32
     /*
      * Convert to forward slashes so that construct_command_argv_internal()

Add patch for make to allow invocation shell to be changed separately.


--- install_elpa.sh.orig	2020-01-07 14:52:49.000000000 +0000
+++ install_elpa.sh	2020-01-07 14:48:01.000000000 +0000
@@ -75,9 +75,9 @@
             has_GPU=$([ "$ENABLE_CUDA" == "__TRUE__" ] && echo "yes" || echo "no")
             FMA_flag=`grep '\bfma\b' /proc/cpuinfo 1>/dev/null && echo '-mfma' || echo '-mno-fma'`
             SSE4_flag=`grep '\bsse4_1\b' /proc/cpuinfo 1>/dev/null && echo '-msse4' || echo '-mno-sse4'`
-            grep '\bavx512dq\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512dq"
+#            grep '\bavx512dq\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512dq"
             grep '\bavx512cd\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512cd"
-            grep '\bavx512bw\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512bw"
+#            grep '\bavx512bw\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512bw"
             grep '\bavx512v1\b' /proc/cpuinfo 1>/dev/null && AVX512_flags+=" -mavx512v1"
             # non-threaded version
             mkdir -p obj_no_thread; cd obj_no_thread
@@ -88,7 +88,6 @@
                           --enable-static=yes \
                           --enable-avx=${has_AVX} \
                           --enable-avx2=${has_AVX2} \
-                          --enable-avx512=${has_AVX512} \
                           --enable-gpu=${has_GPU} \
                           --with-cuda-path=${CUDA_PATH} \
                           FC=${MPIFC} \
@@ -113,7 +112,6 @@
                               --enable-static=yes \
                               --enable-avx=${has_AVX} \
                               --enable-avx2=${has_AVX2} \
-                              --enable-avx512=${has_AVX512} \
                               --enable-gpu=${has_GPU} \
                               --with-cuda-path=${CUDA_PATH} \
                               FC=${MPIFC} \

Patch to fix old GCC AVX512 Elpa issues.


--- getmachine.orig	2018-08-21 14:48:54.000000000 +0100
+++ getmachine	2018-08-21 14:55:16.000000000 +0100
@@ -254,8 +254,10 @@
 # PG compiler
 #  	   echo 'RUNF90=pgf90 -Bstatic' >> makefile
 # Intel compiler
-  	   echo 'RUNF90=ifort ' >> makefile
-           echo 'RUNCC=icc ' >> makefile
+#  	   echo 'RUNF90=ifort ' >> makefile
+#           echo 'RUNCC=icc ' >> makefile
+          echo 'RUNF90=mpif90 ' >> makefile
+          echo 'RUNCC=mpicc ' >> makefile
 # Cray compiler
 #  	   echo 'RUNF90=ftn -h noomp ' >> makefile
 #           echo 'RUNCC=cc -h noomp ' >> makefile
@@ -299,12 +301,13 @@
 # For Cray remove blas.o and lapack.o
            echo 'BLAS=blas.o' >> makefile
 # for chemshell use, we should have lapack so comment the following line out
-           echo 'LAPACK=lapack.o' >> makefile
+#           echo 'LAPACK=lapack.o' >> makefile
            echo 'GULPENV=' >> makefile
 	   echo 'CDABS=cdabs.o' >> makefile
 # If PLUMED is needed then set -DPLUMED
 #           echo 'DEFS=-DFLUSH -DPLUMED' >> makefile
-           echo 'DEFS=-DFLUSH ' >> makefile
+#           echo 'DEFS=-DFLUSH ' >> makefile
+           echo 'DEFS=-DFLUSH -DMPI -DNOFOX ' >> makefile
            echo 'PLUMEDDEFS=-DDL_POLY' >> makefile
            echo 'ARCHIVE = ar rcv' >> makefile
            echo 'RANLIB = ar ts' >> makefile

Patch for Chemshell library version of gulp 4.5


From e5f840ecb5093e4f5e96f76119d5e3b733e660f3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 14 Jun 2019 11:00:37 +0200
Subject: [PATCH] make sure we use cfg-if as a std dependency

---
 src/libstd/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index a170dae2b08c..38df1f26d95f 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["dylib", "rlib"]

 [dependencies]
 alloc = { path = "../liballoc" }
-cfg-if = "0.1.8"
+cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
 panic_unwind = { path = "../libpanic_unwind", optional = true }
 panic_abort = { path = "../libpanic_abort" }
 core = { path = "../libcore" }

Apply rust-lang pr61828 to fix sysroot building


--- src-reference/minecraft_server/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ src-work/minecraft_server/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLHandler;
 import net.minecraft.server.MinecraftServer;

 public class NetServerHandler extends NetHandler implements ICommandListener
@@ -558,7 +560,10 @@
                 }
             }

-            if (var2.startsWith("/"))
+            if (FMLHandler.instance().handleChatPacket(p_23_1_,field_16_e)) {
+              // We handled it
+            }
+            else if (var2.startsWith("/"))
             {
                 this.func_4010_d(var2);
             }
@@ -898,4 +903,9 @@
     {
         this.field_16_e.field_35214_K.field_35658_b = p_50003_1_.field_50005_b && this.field_16_e.field_35214_K.field_35659_c;
     }
+
+    @Override
+    public void func_44001_a(Packet250CustomPayload p_44001_1_) {
+      FMLHandler.instance().handlePacket250(p_44001_1_, field_16_e);
+    }
 }

Update patches for network handler

Update patches for network handler


diff --git a/src/graph/draw/graph_cairo_draw.cc b/src/graph/draw/graph_cairo_draw.cc
index c4cd8a2..9ba442b 100644
--- a/src/graph/draw/graph_cairo_draw.cc
+++ b/src/graph/draw/graph_cairo_draw.cc
@@ -29,7 +29,6 @@

 #include <iostream>
 #include <array>
-#include <chrono>

 #include "hash_map_wrap.hh"
 #include "demangle.hh"
@@ -44,6 +43,8 @@

 #include <boost/mpl/map/map50.hpp>

+#include <chrono>
+
 using namespace std;
 using namespace boost;
 using namespace graph_tool;
@@ -1563,11 +1564,11 @@ void draw_vertices(Graph&, pair<VertexIterator, VertexIterator> v_range,
         vs.draw(cr);
         count++;

-        if (chrono::high_resolution_clock::now() > max_time)
+        if (std::chrono::high_resolution_clock::now() > max_time)
         {
             yield(boost::python::object(count));
-            max_time = chrono::high_resolution_clock::now() +
-                chrono::milliseconds(dt);
+            max_time = std::chrono::high_resolution_clock::now() +
+                std::chrono::milliseconds(dt);
         }
     }
 }
@@ -1613,11 +1614,11 @@ void draw_edges(Graph& g, pair<EdgeIterator, EdgeIterator> e_range,
                                                                      edefaults));
         es.draw(cr, res);

-        if (chrono::high_resolution_clock::now() > max_time)
+        if (std::chrono::high_resolution_clock::now() > max_time)
         {
             yield(boost::python::object(count));
-            max_time = chrono::high_resolution_clock::now() +
-                chrono::milliseconds(dt);
+            max_time = std::chrono::high_resolution_clock::now() +
+                std::chrono::milliseconds(dt);
         }
     }
 }
@@ -1819,11 +1820,11 @@ boost::python::object cairo_draw(GraphInterface& gi,
                 eorder = no_order();

             size_t count = 0;
-            auto mtime = chrono::high_resolution_clock::now();
+            auto mtime = std::chrono::high_resolution_clock::now();
             if (max_time < 0)
-                mtime = chrono::high_resolution_clock::time_point::max();
+                mtime = std::chrono::high_resolution_clock::time_point::max();
             else
-                mtime += chrono::milliseconds(max_time);
+                mtime += std::chrono::milliseconds(max_time);
             int64_t dt = max_time;

             Cairo::Context cr(PycairoContext_GET(ocr.ptr()));

Add patch for graph-tool compilation error regarding ambiguous chrono with boost 1.63


diff -NaurbE libsdl-1.2-hg/src/video/bwindow/SDL_sysevents.cc libsdl-1.2-hg-gci/src/video/bwindow/SDL_sysevents.cc
--- libsdl-1.2-hg/src/video/bwindow/SDL_sysevents.cc	2010-12-06 18:12:49.755761152 +0100
+++ libsdl-1.2-hg-gci/src/video/bwindow/SDL_sysevents.cc	2010-12-06 18:10:31.250871808 +0100
@@ -36,6 +36,7 @@
 #include "../../events/SDL_sysevents.h"
 #include "../../events/SDL_events_c.h"
 #include "SDL_sysevents_c.h"
+#include "../SDL_cursor_c.h"

 void BE_PumpEvents(_THIS)
 {
@@ -203,11 +204,13 @@
 				if (transit == B_EXITED_VIEW) {
 					if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) {
 						SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+						SDL_EraseCursor(SDL_VideoSurface);
 						be_app->SetCursor(B_HAND_CURSOR);
 					}
 				} else {
 					if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
 						SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+						SDL_EraseCursor(SDL_VideoSurface);
 						SDL_SetCursor(NULL);
 					}

Patch from GCI student Daniel Marth, fixes custom cursor rememts when
the mouse is outside the work area.
Checked with student's provided testbed application.

Checked too against TuxPaint 0.9.21 (can't build 0.9.21-cvs behind my proxy),
which crash fast but without custom cursor rememts. So it may also fix #401, but
it remains to be confirmed.
I'll attach the testbed app mentioned above to #401 soon.


diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
index d2ce51f..33e2b9b 100644
--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
+++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
@@ -223,7 +223,7 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
         static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
         static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if 0
         ProviderInfo info = { cp, length, stringAttributes.get() };
         RetainPtr<CTTypesetterRef> typesetter(AdoptCF, WKCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
 #else

Add patch to fix building with libc++

Add patch to fix building with libc++


From 72064c30574df63d52c3d0baeb9f9b585064f548 Mon Sep 17 00:00:00 2001
From: Evgeni Raikhel <evgeni.raikhel@intel.com>
Date: Thu, 30 Aug 2018 17:29:13 +0300
Subject: [PATCH] Debug ioctl fmt desc

The patch is useful to profile kernel calls invocation after applying kernel patches

---
 drivers/media/v4l2-core/v4l2-ioctl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index cab63bb..e8b6590 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1105,6 +1105,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
 	const char *descr = NULL;
 	u32 flags = 0;

+	printk(KERN_DEBUG "LRS dbg: read format description for pixel_format: %x\n",
+					fmt->pixelformat);
+
 	/*
 	 * We depart from the normal coding style here since the descriptions
 	 * should be aligned so it is easy to see which descriptions will be
--
2.7.4

Add profyling commit for ioctl v4l_fill_fmtdesc call

Change-Id: I9d3408ef8f2f433792bf1fb4c15f8db9774588f8


Patch for C4::Letters - adding a <<pickupday>> tag for use in Notices and Slips
Use case: a printable pickup number with reserve_id can then be used as such

<<pickupday>>/<<reserves.reserve_id>>

diff --git a/Letters.pm b/lib/C4/Letters.pm
index 26f3e46..40fccf0 100644
--- a/Letters.pm
+++ b/lib/C4/Letters.pm
@@ -807,6 +807,11 @@ sub _parseletter {
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};

+        # Deichman mod: add a custom tag '<<pickupday>>' for hold pickup day to use in slips
+        if ($letter->{content} && $letter->{content} =~ /<<pickupday>>/) {
+            $letter->{content} =~ s/<<pickupday>>/$waitingdate[-1]/go;
+        }
+
         $values->{'expirationdate'} = '';
         if ( C4::Context->preference('ReservesMaxPickUpDelay') ) {
             my $dt = dt_from_string();

Add patch to Letters.pm for custom pickupday tag in notices


From f4410610f872c262d8afb883d2aef738acfbff17 Mon Sep 17 00:00:00 2001
From: Wieland Hoffmann <themineo@gmail.com>
Date: Fri, 29 May 2015 10:10:54 +0200
Subject: [PATCH] Wrap index_entity in profile.runctx(...) calls

---
 sir/indexing.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sir/indexing.py b/sir/indexing.py
index add455b..a2736b6 100644
--- a/sir/indexing.py
+++ b/sir/indexing.py
@@ -1,6 +1,7 @@
 # Copyright (c) 2014, 2015 Lukas Lalinsky, Wieland Hoffmann
 # License: MIT, see LICENSE for details
 import multiprocessing
+import profile

 from . import config, querying, util
@@ -8,6 +9,7 @@ from .schema import SCHEMA
 from ConfigParser import NoOptionError
 from functools import partial
 from logging import getLogger
+from os import getpid
 from solr import SolrException
 from sqlalchemy import and_
 from traceback import format_exc
@@ -125,7 +127,7 @@ def _index_entity_process_wrapper(args):
     :rtype: None or an Exception
     """
     try:
-        return index_entity(*args)
+        profile.runctx("index_entity(*args)", globals(), locals(), filename="profile-{}".format(getpid()))
     except Exception:
         logger.exception(format_exc())
         raise
--
2.4.1

Add a patch to apply for profiling

Add a patch to apply for profiling


*** /q/ports/security/py-m2crypto/work/m2crypto-0.11/M2Crypto/httpslib.py       Tue Jan  7 09:44:35 2003
--- /usr/local/lib/python2.3/site-packages/M2Crypto/httpslib.py Thu Sep  2 11:27:56 2004
***************
*** 22,28 ****

          default_port = HTTPS_PORT

!         if sys.version[:5] == '2.2.2':
              def __init__(self, host, port=None, strict=None, **ssl):
                  keys = ssl.keys()
                  try:
--- 22,28 ----

          default_port = HTTPS_PORT

!         if sys.version[:3] == '2.3':
              def __init__(self, host, port=None, strict=None, **ssl):
                  keys = ssl.keys()
                  try:

Add patch for the m2ctypto library.

Add patch for the m2ctypto library.


diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 95f2525..09a3b07 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1031,6 +1031,15 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForNavigation(
   SiteInstance* current_instance = render_frame_host_->GetSiteInstance();
   SiteInstance* new_instance = current_instance;

+  // Gives user a chance to pass a custom side instance.
+  GetContentClient()->browser()->OverrideSiteInstanceForNavigation(
+      delegate_->GetControllerForRenderManager().GetBrowserContext(),
+      current_instance,
+      dest_url,
+      &new_instance);
+  if (new_instance != current_instance)
+    return new_instance;
+
   // We do not currently swap processes for navigations in webview tag guests.
   if (current_instance->GetSiteURL().SchemeIs(kGuestScheme))
     return current_instance;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index a0ac3c2..5a8ec80 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -134,6 +134,13 @@ class CONTENT_EXPORT ContentBrowserClient {
  public:
   virtual ~ContentBrowserClient() {}

+  // Electron: Allows overriding the SiteInstance when navigating.
+  virtual void OverrideSiteInstanceForNavigation(
+      BrowserContext* browser_context,
+      SiteInstance* current_instance,
+      const GURL& dest_url,
+      SiteInstance** new_instance) {}
+
   // Allows the embedder to set any number of custom BrowserMainParts
   // implementations for the browser startup code. See comments in
   // browser_main_parts.h.

Add patch to allow restarting of renderer process on purpose.


--- include/CL/cl.hpp.in	2013-02-28 15:32:09.000000000 +0200
+++ include/CL/cl.hpp	2013-02-28 15:32:41.000000000 +0200
@@ -212,8 +212,6 @@
 #if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>

-#include <emmintrin.h>
-#include <xmmintrin.h>
 #endif // linux

 #include <cstring>
@@ -1035,7 +1033,7 @@
 #endif // !_WIN32
     }

-    inline void fence() { _mm_mfence(); }
+    inline void fence() { __sync_synchronize(); }
 }; // namespace detail

@@ -1128,7 +1129,9 @@
             return err;
         }

-        param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
+        for (std::size_t i=0; i<required/sizeof(cl_device_id); ++i) {
+            memcpy(&(*param)[i], &value[i], sizeof(cl_device_id));
+        }
         return CL_SUCCESS;
     }
 };

Correct C++11 issue in Khronos header files


Index: contrib/libamrwb/configure.ac
===================================================================
--- contrib/libamrwb/configure.ac	(revision 10951)
+++ contrib/libamrwb/configure.ac	(working copy)
@@ -43,10 +43,10 @@

 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT8_T
-AC_TYPE_UINT16_T
+#AC_TYPE_INT16_T
+#AC_TYPE_INT32_T
+#AC_TYPE_INT8_T
+#AC_TYPE_UINT16_T

 # Checks for library functions.
 AC_FUNC_MALLOC
Index: contrib/libamrnb/configure.ac
===================================================================
--- contrib/libamrnb/configure.ac	(revision 10951)
+++ contrib/libamrnb/configure.ac	(working copy)
@@ -43,10 +43,10 @@

 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT8_T
-AC_TYPE_UINT8_T
+#AC_TYPE_INT16_T
+#AC_TYPE_INT32_T
+#AC_TYPE_INT8_T
+#AC_TYPE_UINT8_T
 AC_C_VOLATILE

 # Checks for library functions.
Index: configure.ac
===================================================================
--- configure.ac	(revision 10951)
+++ configure.ac	(working copy)
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

-AC_PREREQ([2.60])
+AC_PREREQ([2.59])
 AC_INIT(sipXmediaLib, 3.3, sipxtapi-dev@list.sipfoundry.org)
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT([/usr/local/sipx])
Index: contrib/libspeex/doc/Makefile.am
===================================================================
--- contrib/libspeex/doc/Makefile.am	(revision 13928)
+++ contrib/libspeex/doc/Makefile.am	(working copy)
@@ -1,3 +1,5 @@
+docdir = ${datadir}/doc/${PACKAGE}
+
 doc_DATA = manual.pdf

 EXTRA_DIST = $(doc_DATA)

Patch file to allow sipXmediaLib to work with autoconf 2.59.

Apply this prior to running autoreconf --force --install

git-svn-id: f26ccc5efe72c2bd8e1c40f599fe313f2692e4de@10953 a612230a-c5fa-0310-af8b-88eea846685b


diff -r 0d4756e57224 src/video/bwindow/SDL_sysevents.cc
--- a/src/video/bwindow/SDL_sysevents.cc	Sun Sep 19 08:56:53 2010 -0700
+++ b/src/video/bwindow/SDL_sysevents.cc	Tue Nov 30 13:38:17 2010 +0000
@@ -386,9 +386,9 @@
 		case B_DIRECT_MODIFY:
 			{
 				int32 width = info->window_bounds.right -
-					info->window_bounds.left + 1;
+					info->window_bounds.left;
 				int32 height = info->window_bounds.bottom -
-					info->window_bounds.top + 1;
+					info->window_bounds.top;
 				SDL_PrivateResize(width, height);
 				break;
 			}

Patch from GCI student Daniel Marth, fixes an off-by-one issue.


diff --git a/nose/failure.py b/nose/failure.py
index d24401c..c5fabfd 100644
--- a/nose/failure.py
+++ b/nose/failure.py
@@ -1,6 +1,7 @@
 import logging
 import unittest
 from traceback import format_tb
+from nose.pyversion import is_base_exception

 log = logging.getLogger(__name__)

@@ -34,7 +35,7 @@ def address(self):

     def runTest(self):
         if self.tb is not None:
-            if isinstance(self.exc_val, BaseException):
+            if is_base_exception(self.exc_val):
                 raise self.exc_val, None, self.tb
             raise self.exc_class, self.exc_val, self.tb
         else:
diff --git a/nose/plugins/capture.py b/nose/plugins/capture.py
index 224f0a5..d9041d8 100644
--- a/nose/plugins/capture.py
+++ b/nose/plugins/capture.py
@@ -13,6 +13,7 @@
 import os
 import sys
 from nose.plugins.base import Plugin
+from nose.pyversion import is_base_exception
 from nose.util import ln
 from StringIO import StringIO

@@ -86,7 +87,7 @@ def formatFailure(self, test, err):
         return self.formatError(test, err)

     def addCaptureToErr(self, ev, output):
-        if isinstance(ev, BaseException):
+        if is_base_exception(ev):
             if hasattr(ev, '__unicode__'):
                 # 2.6+
                 try:
diff --git a/nose/pyversion.py b/nose/pyversion.py
index a6ec3f7..14a133e 100644
--- a/nose/pyversion.py
+++ b/nose/pyversion.py
@@ -9,7 +9,7 @@

 __all__ = ['make_instancemethod', 'cmp_to_key', 'sort_list', 'ClassType',
            'TypeType', 'UNICODE_STRINGS', 'unbound_method', 'ismethod',
-           'bytes_']
+           'bytes_', 'is_base_exception']

 # In Python 3.x, all strings are unicode (the call to 'unicode()' in the 2.x
 # source will be replaced with 'str()' when running 2to3, so this test will
@@ -147,3 +147,12 @@ def isgenerator(func):
             return func.func_code.co_flags & CO_GENERATOR != 0
         except AttributeError:
             return False
+
+# Make a function to help check if an exception is derived from BaseException.
+# In Python 2.4, we just use Exception instead.
+if sys.version_info[:2] < (2, 5):
+    def is_base_exception(exc):
+        return isinstance(exc, Exception)
+else:
+    def is_base_exception(exc):
+        return isinstance(exc, BaseException)

Patch reinstating nose 1.3.0 compatibility with python 2.4


diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index a0e7f61fab0c..fac728a729fb 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -623,13 +623,16 @@ class NSSInitSingleton {

     EnsureNSPRInit();

-    // We *must* have NSS >= 3.26 at compile time.
-    static_assert((NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || (NSS_VMAJOR > 3),
-                  "nss version check failed");
+    // We *must* have NSS >= 3.14.3.
+    static_assert(
+        (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) ||
+        (NSS_VMAJOR == 3 && NSS_VMINOR > 14) ||
+        (NSS_VMAJOR > 3),
+        "nss version check failed");
     // Also check the run-time NSS version.
     // NSS_VersionCheck is a >= check, not strict equality.
-    if (!NSS_VersionCheck("3.26")) {
-      LOG(FATAL) << "NSS_VersionCheck(\"3.26\") failed. NSS >= 3.26 is "
+    if (!NSS_VersionCheck("3.14.3")) {
+      LOG(FATAL) << "NSS_VersionCheck(\"3.14.3\") failed. NSS >= 3.14.3 is "
                     "required. Please upgrade to the latest NSS, and if you "
                     "still get this error, contact your distribution "
                     "maintainer.";
diff --git a/crypto/scoped_test_nss_db.cc b/crypto/scoped_test_nss_db.cc
index 03470c130371..b334109e0342 100644
--- a/crypto/scoped_test_nss_db.cc
+++ b/crypto/scoped_test_nss_db.cc
@@ -44,6 +44,15 @@ ScopedTestNSSDB::~ScopedTestNSSDB() {
     CERT_DestroyCertList(cert_list);
   }

+  // Don't close when NSS is < 3.15.1, because it would require an additional
+  // sleep for 1 second after closing the database, due to
+  // http://bugzil.la/875601.
+  if (!NSS_VersionCheck("3.15.1")) {
+    LOG(ERROR) << "NSS version is < 3.15.1, test DB will not be closed.";
+    temp_dir_.Take();
+    return;
+  }
+
   // NSS is allowed to do IO on the current thread since dispatching
   // to a dedicated thread would still have the affect of blocking
   // the current thread, due to NSS's internal locking requirements

Work around the old nss in sysroot

Work around the old nss in sysroot


From ffc2ce5a7dcff445bdf2b10a5e1f83e4a563be13 Mon Sep 17 00:00:00 2001
From: Evgeny Eltsin <eaeltsin@google.com>
Date: Fri, 24 Dec 2010 18:25:41 +0300
Subject: [PATCH 64/64] [gcc] Yet another gen_lowpart code confused by prt_mode != Pmode

Test from David Meyer, 64-bit mode with -O1:

typedef unsigned int size_t;

extern "C" {
  size_t strlen (const char *);
};

class StringRef {
private:
  const char *Data;
  size_t Length;

public:
 StringRef(const char *Str)
    : Data(Str), Length(::strlen(Str)) {}
};

StringRef GetDLLSuffix() {
  return &(".so"[1]);
}

Reports internal error while trying to replace Pmode register with ptr_mode CONST.

The change fixes the origin of such a CONST in gen_lowpart_for_combine. This is kinda hacky and clearly not upstreamable...

BUG=http://code.google.com/p/nativeclient/issues/detail?id=1279
TEST=see above

Review URL: http://codereview.chromium.org/5968010
---
 gcc/gcc/combine.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gcc/gcc/combine.c b/gcc/gcc/combine.c
index 5078f3e..3eb2123 100644
--- a/gcc/gcc/combine.c
+++ b/gcc/gcc/combine.c
@@ -9892,8 +9892,11 @@ gen_lowpart_for_combine (enum machine_mode omode, rtx x)
     return x;

   /* Return identity if this is a CONST or symbolic reference.  */
+  /* HACK?
+     When ptr_mode != Pmode, we should not return CONST:ptr_mode for Pmode
+     and vice versa as this confuses SUBST.  */
   if (omode == Pmode
-      && (GET_CODE (x) == CONST
+      && ((GET_CODE (x) == CONST && ptr_mode == Pmode)
 	  || GET_CODE (x) == SYMBOL_REF
 	  || GET_CODE (x) == LABEL_REF))
     return x;
--
1.7.3.1

Update gcc patches from git

Update gcc patches from git

Review URL=http://codereview.chromium.org/5968010

Review URL: http://codereview.chromium.org/6053004

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@4038 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2


From da141a8f16224a97a1a4093a3293f9bb6b15fa90 Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Tue, 9 Feb 2016 10:22:39 -0500
Subject: [PATCH] Temporarily disable unthrottled log message.

Signed-off-by: Dave Barach <dave@barachs.net>
---
 lib/librte_eal/linuxapp/eal/eal_interrupts.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 06b26a9..8d918a4 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -711,6 +711,8 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
 				if (errno == EINTR || errno == EWOULDBLOCK)
 					continue;

+                                /* $$$ disable to avoid filling /var/log */
+                                if (0)
 				RTE_LOG(ERR, EAL, "Error reading from file "
 					"descriptor %d: %s\n",
 					events[n].data.fd,
--
1.9.1

Disable EAL message spew which can easily fill /var/log

Change-Id: I63da892d1c4148a54ea33c172986c854932beb01
Signed-off-by: Dave Barach <bfcdf3e6ca6cef45543bfbb57509c92aec9a39fb@barachs.net>


Pull in r199571 from upstream clang trunk (by Ted Kremenek):

  Harden InitListExpr::isStringLiteralInit() against getInit()
  returning null.

  This led to a crash on invalid code (sorry, no good test case).

  Fixes <rdar://problem/15831804>.

This fixes an assertion when compiling certain incorrect code, as
reported upstream in http://llvm.org/PR22684 .

Introduced here: http://svnweb.freebsd.org/changeset/base/279289

Index: tools/clang/lib/AST/Expr.cpp
===================================================================
--- tools/clang/lib/AST/Expr.cpp
+++ tools/clang/lib/AST/Expr.cpp
@@ -1892,7 +1892,11 @@ bool InitListExpr::isStringLiteralInit() const {
   const ArrayType *AT = getType()->getAsArrayTypeUnsafe();
   if (!AT || !AT->getElementType()->isIntegerType())
     return false;
-  const Expr *Init = getInit(0)->IgnoreParens();
+  // It is possible for getInit() to return null.
+  const Expr *Init = getInit(0);
+  if (!Init)
+    return false;
+  Init = Init->IgnoreParens();
   return isa<StringLiteral>(Init) || isa<ObjCEncodeExpr>(Init);
 }

Add clang patches corresponding to r279289.


diff --git a/src/jvm/clojure/lang/SeqIterator.java b/src/jvm/clojure/lang/SeqIterator.java
index e6ad481..7b6a393 100644
--- a/src/jvm/clojure/lang/SeqIterator.java
+++ b/src/jvm/clojure/lang/SeqIterator.java
@@ -39,6 +39,10 @@ public boolean hasNext(){
 		}
 	else if(seq == next)
 		next = RT.next(seq);
+	else if (RT.seq(next) == null)
+		System.out.println("this shouldn't happen: " + (this == seq));
+	if (RT.seq(next) == null && next != null)
+		System.out.println("bug: " + next);
 	return next != null;
 }

Add Nicola Mometto's patch showing weird stuff at source of problem


--- google_appengine/dev_appserver.py	2014-08-25 15:24:44.000000000 -0700
+++ google_appengine/dev_appserver.py	2014-09-15 18:01:01.000000000 -0700
@@ -20,7 +20,8 @@
 import os
 import sys

-
+import logging
+logging.basicConfig( filename='logs/appengine.log', filemode='a' )

 sys_path = sys.path

Add missing patch for dev_appserver.py.

Add missing patch for dev_appserver.py.


diff -ruN libgestures/include/gestures/include/iir_filter_interpreter.h libgestures.new/include/gestures/include/iir_filter_interpreter.h
--- libgestures/include/gestures/include/iir_filter_interpreter.h	2015-05-03 21:53:49.979904775 -0400
+++ libgestures.new/include/gestures/include/iir_filter_interpreter.h	2015-05-03 20:52:04.102016136 -0400
@@ -78,6 +78,8 @@
   virtual void DoubleWasWritten(DoubleProperty* prop);

  private:
+  map<short, IoHistory, kMaxFingers> histories_;
+
   // y[0] = b[0]*x[0] + b[1]*x[1] + b[2]*x[2] + b[3]*x[3]
   //        - (a[1]*y[1] + a[2]*y[2])
   DoubleProperty b0_, b1_, b2_, b3_, a1_, a2_;
@@ -90,7 +92,6 @@
   // Whether IIR filter should be used. Put as a member varible for
   // unittest purpose.
   bool using_iir_;
-  map<short, IoHistory, kMaxFingers> histories_;
 };

 }  // namespace gestures

Fix for iir filter hanging xorg

Fix for iir filter hanging xorg


--- ../src_base/minecraft/net/minecraft/block/BlockPortal.java
+++ ../src_work/minecraft/net/minecraft/block/BlockPortal.java
@@ -118,7 +118,7 @@
         }
         else
         {
-            if (par1World.getBlockId(par2 - b0, par3, par4 - b1) == 0)
+            if (par1World.isAirBlock(par2 - b0, par3, par4 - b1))
             {
                 par2 -= b0;
                 par4 -= b1;

Fix isAir check to see if a portal can light. Should fix w/Railcraft and others


diff -urN libwmf-0.2.8.4/configure.ac libwmf-0.2.8.4-haiku/configure.ac
--- libwmf-0.2.8.4/configure.ac	2009-03-07 01:58:56.000000000 +0000
+++ libwmf-0.2.8.4-haiku/configure.ac	2009-03-07 02:18:00.000000000 +0000
@@ -124,6 +124,9 @@
     os_win32=yes
     SYS_LIBM=""
     ;;
+  *haiku*|*beos*)
+    SYS_LIBM=""
+    ;;
   *)
     os_win32=no
     SYS_LIBM="-lm"
@@ -528,7 +531,7 @@
 			WMF_PNG_LDFLAGS="-lpng"
 		fi
 	],[	AC_MSG_ERROR(* * * unable to find libpng which is required by libwmf * * *)
-	],-lz -lm)
+	],-lz $SYS_LIBM)
 ],[	AC_MSG_ERROR(* * * unable to find "png.h" which is required by libwmf * * *)
 ])

@@ -645,7 +648,7 @@

 	CPPFLAGS="$CPPFLAGS $WMF_FT_CFLAGS $WMF_PNG_CFLAGS $WMF_Z_CFLAGS"
 	LDFLAGS="$LDFLAGS $WMF_FT_LDFLAGS $WMF_PNG_LDFLAGS $WMF_Z_LDFLAGS"
-	other_libs="$other_libs -lfreetype -lpng -lz -lm"
+	other_libs="$other_libs -lfreetype -lpng -lz $SYS_LIBM"

 	AC_CHECK_HEADER(gd.h,[
 		AC_CHECK_LIB(gd,gdClipSetAdd,[
diff -urN libwmf-0.2.8.4/configure.in libwmf-0.2.8.4-haiku/configure.in
--- libwmf-0.2.8.4/configure.in	2009-03-07 01:58:56.000000000 +0000
+++ libwmf-0.2.8.4-haiku/configure.in	2009-03-07 01:49:01.000000000 +0000
@@ -123,6 +123,9 @@
     os_win32=yes
     SYS_LIBM=""
     ;;
+  haiku*|beos*)
+    SYS_LIBM=""
+    ;;
   *)
     os_win32=no
     SYS_LIBM="-lm"

Patch to fix -lm issue on libwmf on Haiku


Author: Alessio Treglia <quadrispro@ubuntu.com>
Description: Add device entry for
 Creative ZEN MicroPhoto (ID 041E:4133).
Forwarded: http://sourceforge.net/support/tracker.php?aid=3053793
Bug-Ubuntu: https://launchpad.net/bugs/537386
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594560
---
 src/music-players.h |    1 +
 1 file changed, 1 insertion(+)

--- libmtp.orig/src/music-players.h
+++ libmtp/src/music-players.h
@@ -52,6 +52,7 @@
   { "Creative", 0x041e, "ZEN Micro (MTP mode)", 0x4130, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "ZEN Touch (MTP mode)", 0x4131, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Dell", 0x041e, "Dell Pocket DJ (MTP mode)", 0x4132, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Creative", 0x041e, "ZEN MicroPhoto", 0x4133, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "ZEN Sleek (MTP mode)", 0x4137, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "ZEN MicroPhoto", 0x413c, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "ZEN Sleek Photo", 0x413d, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },

Add device entry for the device ID 041E:4133 (Creative ZEN MicroPhoto).


--- libpam/Makefile.in.orig	2015-03-18 00:45:11.326276530 +0100
+++ libpam/Makefile.in	2015-03-18 00:55:24.450764190 +0100
@@ -268,6 +268,7 @@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
+includesecuritydir = $(includedir)/security
 infodir = @infodir@
 install_sh = @install_sh@
 libc_cv_fpie = @libc_cv_fpie@
@@ -460,24 +461,24 @@
 	-rm -rf .libs _libs
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	test -z "$(includesecuritydir)" || $(MKDIR_P) "$(DESTDIR)$(includesecuritydir)"
+	@list='$(include_HEADERS)'; test -n "$(includesecuritydir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesecuritydir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesecuritydir)" || exit $$?; \
 	done

 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	@list='$(include_HEADERS)'; test -n "$(includesecuritydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(includesecuritydir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(includesecuritydir)" && rm -f $$files

 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

Patch for modify destination header

Patch for modify destination header


Index: tools/cling/lib/Interpreter/LookupHelper.cpp
===================================================================
--- tools/cling/lib/Interpreter/LookupHelper.cpp	(revision 46197)
+++ tools/cling/lib/Interpreter/LookupHelper.cpp	(working copy)
@@ -617,7 +617,7 @@
           //  Do template argument deduction and function argument matching.
           //
           FunctionDecl* Specialization;
-          sema::TemplateDeductionInfo TDI(Context, SourceLocation());
+          sema::TemplateDeductionInfo TDI( (SourceLocation()) );
           Sema::TemplateDeductionResult TDR
             = S.DeduceTemplateArguments(FTD,
                          const_cast<TemplateArgumentListInfo*>(FuncTemplateArgs),
Index: tools/cling/lib/Interpreter/InvocationOptions.cpp
===================================================================
--- tools/cling/lib/Interpreter/InvocationOptions.cpp	(revision 46197)
+++ tools/cling/lib/Interpreter/InvocationOptions.cpp	(working copy)
@@ -25,7 +25,7 @@
   static const OptTable::Info ClingInfoTable[] = {
 #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM,              \
                HELPTEXT, METAVAR)                                       \
-    { NAME, HELPTEXT, METAVAR, Option::KIND##Class, FLAGS, PARAM,       \
+    { NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, FLAGS, PARAM, \
       OPT_##GROUP, OPT_##ALIAS },
 #include "cling/Interpreter/ClingOptions.inc"
 #undef OPTION

  Add special folder in patches - ToT (Top of Tree) for LLVM. There will go the
patches, which make cling to work with llvm's trunk, before our vendor drop gets
in sync.
  EC picks the patches from there only for our nightlies.

git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@46211 27541ba8-7e3a-0410-8455-c3a389f83636


--- library/Makefile.orig	2011-07-13 13:25:36.000000000 +0200
+++ library/Makefile	2011-10-14 22:53:58.000000000 +0200
@@ -1,7 +1,7 @@

 # Also see "include/polarssl/config.h"

-CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W
 OFLAGS	= -O

 # MicroBlaze specific options:
--- programs/Makefile.orig	2011-10-14 22:54:37.000000000 +0200
+++ programs/Makefile	2011-10-14 22:54:50.000000000 +0200
@@ -3,7 +3,7 @@
 # To compile on MinGW: add "-lws2_32" to LDFLAGS
 # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS

-CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W
 OFLAGS	= -O
 LDFLAGS	+= -L../library -lpolarssl $(SYS_LDFLAGS)

Remove gcc -W option not supported on old versions.


Disable TTY modifications during bootup

Disable TTY modifications during bootup


diff --git a/runtime/m4/llnl_fortran_logical_test.m4 b/runtime/m4/llnl_fortran_logical_test.m4
index 5b55506..3968dbb 100644
--- a/runtime/m4/llnl_fortran_logical_test.m4
+++ b/runtime/m4/llnl_fortran_logical_test.m4
@@ -49,7 +49,7 @@ AC_COMPILE_IFELSE([
   AC_LANG_SOURCE([LLNL_FORTRAN_LOGICAL_TEST_PROLOGUE($2)
 void TESTFUNC(char *a, char *b)
 {
-  printf("%d\n", b - a);
+  printf("%ld\n", b - a);
   fflush(stdout); /* needed for gfortran */
 }
 ])],

Add patch for detecting F90 logical size.


--- ../src-base/minecraft/net/minecraft/src/ItemRenderer.java
+++ ../src-work/minecraft/net/minecraft/src/ItemRenderer.java
@@ -26,8 +26,12 @@
     public void func_78443_a(EntityLiving p_78443_1_, ItemStack p_78443_2_, int p_78443_3_)
     {
         GL11.glPushMatrix();
-        Block var4 = Block.field_71973_m[p_78443_2_.field_77993_c];
-
+
+        Block var4 = null;
+        if (p_78443_2_.field_77993_c < Block.field_71973_m.length)
+        {
+            var4 = Block.field_71973_m[p_78443_2_.field_77993_c];
+        }
         if (var4 != null && RenderBlocks.func_78597_b(var4.func_71857_b()))
         {
             GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.field_78455_a.field_71446_o.func_78341_b("/terrain.png"));

Add in an ItemRenderer null check so FML can run render adding mods


From 401c0003bf780ef2442f7b13eef65061f6d57201 Mon Sep 17 00:00:00 2001
From: Ronny Chan <ronny6993@gmail.com>
Date: Sun, 22 Feb 2015 17:43:04 -0500
Subject: [PATCH] JSAPI: Correct symbol names (emulatorBridge -> scraper)

---
 Snowflake.StandardAjax/StandardAjax.System.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Snowflake.StandardAjax/StandardAjax.System.cs b/Snowflake.StandardAjax/StandardAjax.System.cs
index 9f26ea5..85bdb32 100644
--- a/Snowflake.StandardAjax/StandardAjax.System.cs
+++ b/Snowflake.StandardAjax/StandardAjax.System.cs
@@ -41,8 +41,8 @@ public IJSResponse GetScrapers(IJSRequest request)
         {
             IDictionary<string, IDictionary<string, dynamic>> response = this.CoreInstance.PluginManager.LoadedScrapers.ToDictionary
                (
-                   emulatorBridge => emulatorBridge.Key,
-                   emulatorBridge => emulatorBridge.Value.PluginInfo
+                   scraper => scraper.Key,
+                   scraper => scraper.Value.PluginInfo
                );
             return new JSResponse(request, response);
         }

JSAPI: Correct symbol names (emulatorBridge -> scraper)

Signed-off-by: RonnChyran <7cf4f9d2afafbff5833f5517baf1a178ccd2de4f@gmail.com>


diff --git a/apol b/apol
index c3e58f9..d8f6496 100755
--- a/apol
+++ b/apol
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2015, Tresys Technology, LLC
 #
 # This file is part of SETools.
diff --git a/sediff b/sediff
index 34268ca..48b1a54 100755
--- a/sediff
+++ b/sediff
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2015-2016, Tresys Technology, LLC
 #
 # This file is part of SETools.
diff --git a/sedta b/sedta
index e4d4914..279019c 100755
--- a/sedta
+++ b/sedta
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2014-2015, Tresys Technology, LLC
 #
 # This file is part of SETools.
diff --git a/seinfo b/seinfo
index 2b50393..ad83496 100755
--- a/seinfo
+++ b/seinfo
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2014-2015, Tresys Technology, LLC
 #
 # This file is part of SETools.
diff --git a/seinfoflow b/seinfoflow
index 7a2d288..1c75f8e 100755
--- a/seinfoflow
+++ b/seinfoflow
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2014-2015, Tresys Technology, LLC
 #
 # This file is part of SETools.
diff --git a/sesearch b/sesearch
index 7bcdfd2..e2cd4c3 100755
--- a/sesearch
+++ b/sesearch
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2014-2015, Tresys Technology, LLC
 #
 # This file is part of SETools.

Add patch for explicitly using Python 3

Add patch for explicitly using Python 3


Index: lib/CodeGen/BackendUtil.cpp
===================================================================
--- lib/CodeGen/BackendUtil.cpp	(revision 191330)
+++ lib/CodeGen/BackendUtil.cpp	(working copy)
@@ -336,6 +336,9 @@
       MPM->add(createStripSymbolsPass(true));
   }

+  // Force MergeFunctions pass.
+  MPM->add(createMergeFunctionsPass());
+
   PMBuilder.populateModulePassManager(*MPM);
 }

Patch that forces MergeFunctions pass for clang.
It is temporary patch. We need to keep it in trunk, since it makes easer to test it on buildbots on different platforms.
Once we see stable MergeFunctions behaviour with satisfied perfomance, this patch will be removed.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@191331 91177308-0d34-0410-b5e6-96231b3b80d8


Make Nginx build on Snow Leopard

Make Nginx build on Snow Leopard


diff --git a/BUILD.gn b/BUILD.gn
index 3de144958d..83d9080d0b 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -356,6 +356,13 @@ if (is_component_ffmpeg) {
     # So we can append below and assume they're defined.
     ldflags = []

+    # Chromium's Mac toolchain sets the "install_name" linker parameter only
+    # when "is_component_build" is true, but we want to set even if it's false,
+    # because we are making a dylib which will be distributed inside a bundle.
+    if (!is_component_build && is_mac) {
+      ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
+    }
+
     if (is_posix && !is_mac) {
       # Fixes warnings PIC relocation when building as component.
       ldflags += [

Make sure that `libffmpeg.dylib` has the correct "install name" even in non-component builds.


--- Make_cyg_ming.mak.orig	2015-04-02 15:41:15.405829500 +0100
+++ Make_cyg_ming.mak	2015-04-02 15:42:19.857896300 +0100
@@ -39,10 +39,10 @@
 DIRECTX=no
 # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE]
 # Set to TINY to make minimal version (few features).
-FEATURES=BIG
+FEATURES=HUGE
 # Set to one of i386, i486, i586, i686 as the minimum target processor.
 # For amd64/x64 architecture set ARCH=x86-64 .
-ARCH=i386
+ARCH=x86-64
 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
 CROSS=no
 # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.

Patch for building vim editor

Patch for building vim editor


diff -ur react/lib/setInnerHTML.js new/lib/setInnerHTML.js
--- react/lib/setInnerHTML.js	2014-09-16 11:12:19.000000000 -0700
+++ new/lib/setInnerHTML.js	2014-10-08 21:18:58.000000000 -0700
@@ -52,11 +52,15 @@
         node.parentNode.replaceChild(node, node);
       }

+      // Setting innerHTML of raw text elements or manipulating child nodes
+      // can trigger `Unknown runtime error` in IE8.
+      if (node.tagName === 'SCRIPT' || node.tagName === 'STYLE') {
+        node.text = html;
       // We also implement a workaround for non-visible tags disappearing into
       // thin air on IE8, this only happens if there is no visible text
       // in-front of the non-visible tags. Piggyback on the whitespace fix
       // and simply check if any non-visible tags appear in the source.
-      if (html.match(/^[ \r\n\t\f]/) ||
+      } else if (html.match(/^[ \r\n\t\f]/) ||
           html[0] === '<' && (
             html.indexOf('<noscript') !== -1 ||
             html.indexOf('<script') !== -1 ||

Patch react to avoid IE8 error See https://github.com/facebook/react/pulls/2311


41c41
<     <TrapErrors>0</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
---
>     <TrapErrors>1</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
46c46
<     <UseHTTP>1</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->
---
>     <UseHTTP>0</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->

Add patch to run in Production mode under docker


--- a/src/signals.h	2017-08-23 14:07:05.000000000 +0100
+++ b/src/signals.h	2017-08-23 14:06:53.000000000 +0100
@@ -18,4 +18,4 @@
 /* List of signals that are sent when an invalid virtual memory address
    is accessed, or when the stack overflows.  */
 #define SIGSEGV_FOR_ALL_SIGNALS(var,body) \
-  { int var; var = SIGSEGV; { body } }
+  { int var; var = SIGSEGV; { body } var = SIGBUS; { body } }

Add patch to enable SIGBUS capture

Add patch to enable SIGBUS capture

Kernels older than 3.18.6 emit SIGBUS signal upon stackoverflow instead of SIGSEGV. This patch enables the capture of SIGBUS (just as it is done on Darwin).

Applying it fixes https://github.com/NixOS/nixpkgs/issues/6028 and https://github.com/NixOS/nixpkgs/issues/28464#issuecomment-324255704


From 9fd7e030db8e2b8d10fcce389c26325410486193 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Mon, 28 Nov 2011 23:55:33 -0200
Subject: [PATCH] Add O_TRUNC to open flags for DexOpt output.

Without O_TRUNC, DexOpt cannot overwrite existing output files.
---
 dexopt/OptMain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dexopt/OptMain.c b/dexopt/OptMain.c
index b8e5889..ab67e7f 100644
--- a/dexopt/OptMain.c
+++ b/dexopt/OptMain.c
@@ -367,7 +367,7 @@ static int preopt(int argc, char* const argv[])
         goto bail;
     }

-    outFd = open(outName, O_RDWR | O_EXCL | O_CREAT, 0666);
+    outFd = open(outName, O_RDWR | O_EXCL | O_CREAT | O_TRUNC, 0666);
     if (outFd < 0) {
         perror(argv[0]);
         goto bail;
--
1.7.3.1

Add patch for Android dexopt.

Add patch for Android dexopt.


--- Makefile.am.orig	2016-01-18 22:57:14.568966617 +0100
+++ Makefile.am	2016-01-18 22:57:25.012966536 +0100
@@ -1,5 +1,5 @@

-SUBDIRS = kernel caca src examples tools \
+SUBDIRS = kernel caca src tools \
           cxx caca-sharp python ruby java \
           doc test
 DIST_SUBDIRS = $(SUBDIRS) win32

Fix libcaca compile issue caused by imlib update


--- ../src-base/minecraft/net/minecraft/client/resources/SkinManager.java
+++ ../src-work/minecraft/net/minecraft/client/resources/SkinManager.java
@@ -129,7 +129,9 @@

                 if (hashmap.isEmpty() && p_152790_1_.getId().equals(Minecraft.func_71410_x().func_110432_I().func_148256_e().getId()))
                 {
-                    hashmap.putAll(SkinManager.this.field_152797_e.getTextures(SkinManager.this.field_152797_e.fillProfileProperties(p_152790_1_, false), false));
+                    // FORGE: Use already filled profile from session rather
+                    // than getting rate limited by filling the input profile
+                    hashmap.putAll(SkinManager.this.field_152797_e.getTextures(Minecraft.func_71410_x().func_110432_I().func_148256_e(), false));
                 }

                 Minecraft.func_71410_x().func_152344_a(new Runnable()

Use already provided profile for the player's own skin


# HG changeset patch
# Parent 5f659702021e2d505c40ac4d452e80fe0b7be590
# User Sukhbir Singh <sukhbir.in@gmail.com>
Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397)

diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -812,8 +812,15 @@ pref("mail.smtp.qos", 0);
 pref("mail.nntp.qos", 0);

 // default value for IMAP4
 // in a DSCP environment this should be 56 (0x38, or AF13), ibid.
 pref("mail.imap.qos", 0);

 // PgpMime Addon
 pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
+
+// Send emails with the Date header.
+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409).
+pref("mailnews.local_date_header_generation", true);
+
+// Allow a custom message-ID to be set through an extension.
+pref("mailnews.custom_message_id", false);

Add a patch for mailnews.js

Add a patch for mailnews.js


--- ../src-base/common/net/minecraft/src/RegionFileCache.java
+++ ../src-work/common/net/minecraft/src/RegionFileCache.java
@@ -4,8 +4,6 @@
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -18,17 +16,11 @@
     {
         File var3 = new File(p_76550_0_, "region");
         File var4 = new File(var3, "r." + (p_76550_1_ >> 5) + "." + (p_76550_2_ >> 5) + ".mca");
-        Reference var5 = (Reference)field_76553_a.get(var4);
-        RegionFile var6;
+        RegionFile var6 = (RegionFile) field_76553_a.get(var4);

-        if (var5 != null)
+        if (var6 != null)
         {
-            var6 = (RegionFile)var5.get();
-
-            if (var6 != null)
-            {
-                return var6;
-            }
+            return var6;
         }

         if (!var3.exists())
@@ -42,7 +34,7 @@
         }

         var6 = new RegionFile(var4);
-        field_76553_a.put(var4, new SoftReference(var6));
+        field_76553_a.put(var4, var6);
         return var6;
     }

@@ -52,11 +44,9 @@

         while (var0.hasNext())
         {
-            Reference var1 = (Reference)var0.next();
-
             try
             {
-                RegionFile var2 = (RegionFile)var1.get();
+                RegionFile var2 = (RegionFile)var0.next();

                 if (var2 != null)
                 {

Patch a file handle leak in RegionFileCache handling when under memory pressure.


commit 7587ef8c63327d862513f810f4a21eb1323bd3a1
Author: EXL <exlmotodev@gmail.com>
Date:   Sat Jul 2 12:22:15 2016 +0000

    Fix type errors

diff --git a/src/com/lavastorm/HiscoreFile.java b/src/com/lavastorm/HiscoreFile.java
index 6aef4d0..c9a9a27 100644
--- a/src/com/lavastorm/HiscoreFile.java
+++ b/src/com/lavastorm/HiscoreFile.java
@@ -193,7 +193,7 @@ public class HiscoreFile
     if (i == -1) {
       return -1;
     }
-    Object localObject = this.m_names[i];
+    String localObject = this.m_names[i];
     String str = null;
     int j = this.m_scores[i];
     int k = 0;
diff --git a/src/com/lavastorm/astrosmash/GameWorld.java b/src/com/lavastorm/astrosmash/GameWorld.java
index 951d8f3..8157006 100644
--- a/src/com/lavastorm/astrosmash/GameWorld.java
+++ b/src/com/lavastorm/astrosmash/GameWorld.java
@@ -178,7 +178,7 @@ public class GameWorld
       this.m_vecFlyingEnemies.removeElementAt(j);
       this.m_enemyFactory.putEnemy(localEnemy);
     }
-    for (i = this.m_vecFlyingBullets.size(); i > 0; i = this.m_vecFlyingBullets.size())
+    for (int i = this.m_vecFlyingBullets.size(); i > 0; i = this.m_vecFlyingBullets.size())
     {
       j = i - 1;
       Collidable localCollidable = (Collidable)this.m_vecFlyingBullets.elementAt(j);
diff --git a/src/com/lavastorm/astrosmash/HiScoreDisplay.java b/src/com/lavastorm/astrosmash/HiScoreDisplay.java
index d111bda..9206854 100644
--- a/src/com/lavastorm/astrosmash/HiScoreDisplay.java
+++ b/src/com/lavastorm/astrosmash/HiScoreDisplay.java
@@ -130,7 +130,7 @@ public class HiScoreDisplay
     localGraphics.setColor(AstrosmashVersion.BLACKCOLOR);
     for (int k = 0; k < 5; k++)
     {
-      localObject = "";
+      String localObject = "";
       if (this.m_highlightPosition == k) {
         localObject = ">";
       }

Add patch for decompiled source code

Add patch for decompiled source code


Index: twisted/web2/server.py
===================================================================
--- twisted/web2/server.py	(revision 18289)
+++ twisted/web2/server.py	(working copy)
@@ -156,7 +156,9 @@
         self.resources = []
         http.Request.__init__(self, *args, **kw)

-    def addResponseFilter(self, f, atEnd=False):
+    def addResponseFilter(self, f, atEnd=False, onlyOnce = False):
+        if onlyOnce and f in self.responseFilters:
+            return
         if atEnd:
             self.responseFilters.append(f)
         else:

Add patch that got lost during merge.

Add patch that got lost during merge.

git-svn-id: 81e381228600e5752b80483efd2b45b26c451ea2@198 e27351fd-9f3e-4f54-a53b-843176b1656c


diff --git a/src/replacements/fakepoll.c b/src/replacements/fakepoll.c
index a043438..b722c8a 100644
--- a/src/replacements/fakepoll.c
+++ b/src/replacements/fakepoll.c
@@ -24,6 +24,10 @@
 #include <stdarg.h>
 #include <stdio.h>

+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
 #include "replacements.h"

 #if HAVE_SYS_TYPES_H
@@ -34,10 +38,6 @@
 #include <errno.h>
 #endif /* HAVE_ERRNO_H */

-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-
 #include <freetds/time.h>

 #include <string.h>

Add patch to avoid problem with getpid definition. This is a backport of: FreeTDS/freetds@c5cd068


Patch that forces MergeFunctions pass for clang.
It is temporary patch. We need to keep it in trunk, since it makes easer to test it on buildbots on different platforms.
Once we see stable MergeFunctions behaviour with satisfied perfomance, this patch will be removed.

git-svn-id: a4a6f32337ebd29ad4763b423022f00f68d1c7b7@191331 91177308-0d34-0410-b5e6-96231b3b80d8


Index: __init__.py
===================================================================
--- __init__.py	(revision 19773)
+++ __init__.py	(working copy)
@@ -12,6 +12,6 @@
 """

 import os, sys
-__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path]
+__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path if not x.startswith('/System')]

 __all__ = []                    # nothing to see here, move along, move along

Patch our Twisted to not look in /System/ for directories to add twisted/plugins/ to

git-svn-id: 81e381228600e5752b80483efd2b45b26c451ea2@1499 e27351fd-9f3e-4f54-a53b-843176b1656c


--- ./configure
+++ ./configure
@@ -22221,12 +22221,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the SSL_get_certificate is buggy" >&5
 $as_echo_n "checking whether the SSL_get_certificate is buggy... " >&6; }
   if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiler, cannot test, assume no" >&5
+$as_echo "$as_me: cross-compiler, cannot test, assume no" >&2;}
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

@@ -22263,17 +22261,17 @@
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
+}
 fi

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the workaround for SSL_get_certificate works" >&5
 $as_echo_n "checking whether the workaround for SSL_get_certificate works... " >&6; }
   if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiler, cannot test, assume no" >&5
+$as_echo "$as_me: cross-compiler, cannot test, assume no" >&2;}
 else
+{
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

@@ -22313,6 +22311,7 @@
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
+}
 fi

Update squid to 3.4.9 an patch for cross compiling


diff --git a/source/common/unicode/unistr.h b/source/common/unicode/unistr.h
index c98aec7..85b035a 100644
--- a/source/common/unicode/unistr.h
+++ b/source/common/unicode/unistr.h
@@ -2851,7 +2851,7 @@ public:
   /** Construct an empty UnicodeString.
    * @stable ICU 2.0
    */
-  inline UnicodeString();
+  UnicodeString();

   /**
    * Construct a UnicodeString with capacity to hold <TT>capacity</TT> UChars
@@ -3602,16 +3602,6 @@ UnicodeString::getArrayStart() const
 { return (fFlags&kUsingStackBuffer) ? fUnion.fStackBuffer : fUnion.fFields.fArray; }

 //========================================
-// Default constructor
-//========================================
-
-inline
-UnicodeString::UnicodeString()
-  : fShortLength(0),
-    fFlags(kShortString)
-{}
-
-//========================================
 // Read-only implementation methods
 //========================================
 inline int32_t
diff --git a/source/common/unistr.cpp b/source/common/unistr.cpp
index f103e81..ce1452e 100644
--- a/source/common/unistr.cpp
+++ b/source/common/unistr.cpp
@@ -144,7 +144,10 @@ UnicodeString::releaseArray() {
 // Constructors
 //========================================

-// The default constructor is inline in unistr.h.
+UnicodeString::UnicodeString()
+  : fShortLength(0),
+    fFlags(kShortString)
+{}

 UnicodeString::UnicodeString(int32_t capacity, UChar32 c, int32_t count)
   : fShortLength(0),

Add patch to not line the default constructor of UnicodeString


diff --git a/arch/riscv64/core/swap.S b/arch/riscv64/core/swap.S
index b321aed..ba6f7f7 100644
--- a/arch/riscv64/core/swap.S
+++ b/arch/riscv64/core/swap.S
@@ -128,11 +128,11 @@ _IsrWrapper:
 	beqz a0,_IsrExit_ending         # _get_next_ready_thread() == 0 goto ending

 	## Do not reschedule coop threads (threads that have negative prio)
-	ld s1, _thread_offset_to_prio(a0)
+	lw s1, _thread_offset_to_prio(a0)
 	blt  s1,zero,_IsrExit_ending

 	## Do not reschedule if scheduler is locked
-	ld s1, _thread_offset_to_sched_locked(a0)
+	lw s1, _thread_offset_to_sched_locked(a0)
 	bne s1,zero,_IsrExit_ending

 	## Call into the kernel to see if a scheduling decision is necessary
diff --git a/arch/riscv64/core/swap_macros.h b/arch/riscv64/core/swap_macros.h
index f520918..95a4fb3 100644
--- a/arch/riscv64/core/swap_macros.h
+++ b/arch/riscv64/core/swap_macros.h
@@ -19,16 +19,13 @@
 #ifndef _SWAP_MACROS__H_
 #define _SWAP_MACROS__H_

-#define tNANO_FIBER_OFFSET   0
-#define tNANO_TASK_OFFSET    8
 #define tNANO_CURRENT_OFFSET 16

 #define _kernel_offset_to_irq_stack    8
 #define _kernel_offset_to_current      16

-#define _timeout_sizeof                48
-#define _thread_offset_to_prio         24
-#define _thread_offset_to_sched_locked 32
+#define _thread_offset_to_prio         20
+#define _thread_offset_to_sched_locked 24
 #define _thread_offset_to_callee_saved 96  //_thread_base_sizeof+caller_saved

 #define _callee_saved_offset_to_key        256  //(32*sizeof(uint64_t))

[+] Add patch file for zephyr 1.6.0 to support gcc 7.1 toolchain. In new gcc-versions was changed typeof(int) from 8 to 4 bytes like for x86 so this patch corrects structure offsets used in assembler


--- ../src-base/minecraft/net/minecraft/entity/EntityHanging.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityHanging.java
@@ -124,6 +124,9 @@
                 {
                     BlockPos blockpos1 = blockpos.func_177967_a(enumfacing, k).func_177981_b(l);
                     Block block = this.field_70170_p.func_180495_p(blockpos1).func_177230_c();
+
+                    if ( block.isSideSolid( this.field_70170_p, blockpos1, this.field_174860_b ))
+                        continue;

                     if (!block.func_149688_o().func_76220_a() && !BlockRedstoneDiode.func_149909_d(block))
                     {

Allow placing item frames on Solid Block Faces (isSideSolid)


Fix touchpad lagging issue. port from crrev.com/c/867070
---

diff --git a/gpu/ipc/in_process_command_buffer.cc b/gpu/ipc/in_process_command_buffer.cc
index f5ac52f17443..414a7f647028 100644
--- a/gpu/ipc/in_process_command_buffer.cc
+++ b/gpu/ipc/in_process_command_buffer.cc
@@ -1026,6 +1026,8 @@ void InProcessCommandBuffer::DidCreateAcceleratedSurfaceChildWindow(
     SurfaceHandle parent_window,
     SurfaceHandle child_window) {
   ::SetParent(child_window, parent_window);
+  ::SetWindowPos(child_window, HWND_BOTTOM, 0, 0, 0, 0,
+                 SWP_NOMOVE | SWP_NOSIZE);
 }
 #endif

diff --git a/ui/gfx/win/rendering_window_manager.cc b/ui/gfx/win/rendering_window_manager.cc
index a0528ecf9ab7..72ef021bedbe 100644
--- a/ui/gfx/win/rendering_window_manager.cc
+++ b/ui/gfx/win/rendering_window_manager.cc
@@ -49,6 +49,7 @@ void RenderingWindowManager::DoSetParentOnChild(HWND parent) {
   }

   ::SetParent(child, parent);
+  ::SetWindowPos(child, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 }

 void RenderingWindowManager::UnregisterParent(HWND parent) {


From c7734dd626a6d47bb946cfc1611e6c9d1dd67372 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Thu, 15 Dec 2016 16:24:55 +0000
Subject: [PATCH] kvmtool: p9: chown files and dirs upon creation

The protocol passes in a uid and gid, but we are not chowning
the files to them, just using our default upon creation.
Apply the passed in id's with a chown.

This was found by mounting /tmp over p9 with the S_ISVTX
'sticky' bit set, and finding that files created in /tmp
were not honoring the uid used to create them.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 virtio/9p.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/virtio/9p.c b/virtio/9p.c
index 49e7c5c..30100a5 100644
--- a/virtio/9p.c
+++ b/virtio/9p.c
@@ -286,6 +286,9 @@ static void virtio_p9_create(struct p9_dev *p9dev,
 	if (lstat(full_path, &st) < 0)
 		goto err_out;

+	if (lchown(full_path, dfid->uid, gid) < 0)
+		goto err_out;
+
 	ret = chmod(full_path, mode & 0777);
 	if (ret < 0)
 		goto err_out;
@@ -326,6 +329,9 @@ static void virtio_p9_mkdir(struct p9_dev *p9dev,
 	if (lstat(full_path, &st) < 0)
 		goto err_out;

+	if (lchown(full_path, dfid->uid, gid) < 0)
+		goto err_out;
+
 	ret = chmod(full_path, mode & 0777);
 	if (ret < 0)
 		goto err_out;
--
2.7.4

stage1/kvm/lkvm: Add patch to chown files and dirs on creation

Even though a uid/gid pair are passed over the protocol, they were
not being used for chmod'ing files or dirs being created. This
surfaced inside /tmp with the S_ISVTX 'sticky' bit set, where
all files ended up being owned by root.
Fix it by chmod'ing after creation.

Fixes #2576

As a side effect, it also seems to solve the remaining problems with
'apt-get update' in lkvm, so also:

Fixes #1917


Index: nslu2_protocol.h
===================================================================
--- nslu2_protocol.h	(revision 39)
+++ nslu2_protocol.h	(working copy)
@@ -183,7 +183,7 @@
 		MaxPacketLength = 1540-14,   /* at least 600 from the RedBoot code */
 		BaseAddress = 0x60000,       /* skip RedBoot and SysConf */
 		UpgradeProtocol = 0x8888,    /* defined in the RedBoot code */
-		Ln2FlashSize = 23,           /* 8MByte Flash memory */
+		Ln2FlashSize = 24,           /* 16MByte Flash memory */
 		FlashSize = (1<<Ln2FlashSize),
 		/* The MaxPendingPackets figure is the number of packets which will
 		 * be transmitted without receiving a response, this value should be

Patch for supporting 16MB flash slugs

Patch for supporting 16MB flash slugs


--- ../src_base/minecraft/net/minecraft/logging/LogAgent.java
+++ ../src_work/minecraft/net/minecraft/logging/LogAgent.java
@@ -72,7 +72,7 @@

     public void logWarningFormatted(String par1Str, Object ... par2ArrayOfObj)
     {
-        this.serverLogger.log(Level.WARNING, par1Str, par2ArrayOfObj);
+        this.serverLogger.log(Level.WARNING, String.format(par1Str, par2ArrayOfObj));
     }

     public void logWarningException(String par1Str, Throwable par2Throwable)

Format strings properly in MC's internal logger. Fixes resource pack case warnings.


diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pro b/src/assistant/lib/fulltextsearch/fulltextsearch.pro
index b212154..3394bd4 100644
--- a/src/assistant/lib/fulltextsearch/fulltextsearch.pro
+++ b/src/assistant/lib/fulltextsearch/fulltextsearch.pro
@@ -5,7 +5,7 @@ load(qt_module)
 QMAKE_TARGET_PRODUCT = QtCLucene
 QMAKE_TARGET_DESCRIPTION = QtCLucene full text search library wrapper.
 #if qt is built with frameworks in debug, we must build QtCLucene in debug and release
-#that's a similar logic as in qbase.pri
+#that''s a similar logic as in qbase.pri
 mac:!static:contains(QT_CONFIG, qt_framework) {
    CONFIG(debug, debug|release) {
       !build_pass:CONFIG += build_all
diff --git a/src/assistant/lib/lib.pro b/src/assistant/lib/lib.pro
index 1387820..7d63775 100644
--- a/src/assistant/lib/lib.pro
+++ b/src/assistant/lib/lib.pro
@@ -35,7 +35,8 @@ linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
     QtSql \
     QtXml
-LIBS_PRIVATE += -l$$qclucene
+FTS_LUCENE_LIB_DIR = fulltextsearch
+LIBS_PRIVATE += -L$$FTS_LUCENE_LIB_DIR -l$$qclucene
 RESOURCES += helpsystem.qrc
 SOURCES += qhelpenginecore.cpp \
     qhelpengine.cpp \

Add first build fix patch

Add first build fix patch

Linking libQtHelp fails because it can't find libQtCLucene.so ; it has
been built into fulltextsearch/ but this path is not searched for
libraries


diff --git a/third_party/WebKit/Source/core/fileapi/File.idl b/third_party/WebKit/Source/core/fileapi/File.idl
index 666b073..afc7de8 100644
--- a/third_party/WebKit/Source/core/fileapi/File.idl
+++ b/third_party/WebKit/Source/core/fileapi/File.idl
@@ -33,6 +33,7 @@
     Exposed=(Window,Worker),
 ] interface File : Blob {
     readonly attribute DOMString name;
+    readonly attribute DOMString path;
     readonly attribute long long lastModified;

     // Non-standard APIs

Add patch to expose "File" class's "path" attribute.


From c8af46e18d0acfef9db7e2edda052b3546236590 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 10 Jun 2015 14:03:57 +0800
Subject: [PATCH] cairo-polygon.c: Work Around MSVC 2010/2012 x64 Optimization
 Bug

Only assert top < bottom when one or both top and bottom are not 0, so that
the program does not assert when top = bottom = 0, likely due to an
optimization issue
---
 src/cairo-polygon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cairo-polygon.c b/src/cairo-polygon.c
index b0424f6..a27edc1 100644
--- a/src/cairo-polygon.c
+++ b/src/cairo-polygon.c
@@ -293,7 +293,8 @@ _add_edge (cairo_polygon_t *polygon,
 {
     cairo_edge_t *edge;

-    assert (top < bottom);
+    if (top != 0 || bottom != 0)
+      assert (top < bottom);

     if (unlikely (polygon->num_edges == polygon->edges_size)) {
 	if (! _cairo_polygon_grow (polygon))
--
2.3.5.windows.8

Add Patch for MSVC 2010/2012 on x64

cairo: Add Patch for MSVC 2010/2012 on x64

This patches cauro-polygon.c so that the code will not assert due to top >=
bottom, which happens to be an x64 optimization bug.


diff --git a/DEPS b/DEPS
index f2b3cc9..88557e8 100644
--- a/DEPS
+++ b/DEPS
@@ -72,6 +72,7 @@ vars = {
   'dart_oauth2_tag': '1.2.1',
   'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc',
   'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576',
+  'dart_package_config_v2_tag': '8e776a8b05951d4104aa101151df26a2c5ac931f',
   'dart_package_resolver_tag': '1.0.10',
   'dart_path_tag': '1.6.2',
   'dart_pedantic_tag': 'v1.8.0',
@@ -373,6 +374,9 @@ deps = {
   'src/third_party/dart/third_party/pkg_tested/package_config':
    Var('dart_git') + '/package_config.git' + '@' + Var('dart_package_config_tag'),

+  'src/third_party/dart/third_party/pkg/package_config_v2':
+   Var('dart_git') + '/package_config.git' + '@' + Var('dart_package_config_v2_tag'),
+
   'src/third_party/dart/third_party/pkg_tested/package_resolver':
    Var('dart_git') + '/package_resolver.git' + '@' + Var('dart_package_resolver_tag'),

Add patch after 'Use package config v2'

[CFE/VM] Add patch after 'Use package config v2'

After 81d4ac07d488fb48383586b29f6503b674a8b917 ([CFE] Use package config v2)
landed the HHH bot hasn't been able to compile.
Hopefully this CL fixes that issue.

Change-Id: Ia3bb983f5a2ccf2539e59452b58058970bb6af1e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135641
Reviewed-by: Jens Johansen <05223a3c6bdf76af6f84755eae231abeebcf4530@google.com>


diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp
index f338a95..cde934f 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

+#include "base/compiler_specific.h"
 #include "platform/graphics/paint/DisplayItemList.h"

 #include "platform/graphics/LoggingCanvas.h"
@@ -49,6 +50,7 @@
     json->SetInteger("index", i);

     bool show_client_debug_name = options & kShowClientDebugName;
+    ALLOW_UNUSED_LOCAL(show_client_debug_name);
 #if DCHECK_IS_ON()
     if (display_item.HasValidClient()) {
       if (display_item.Client().IsAlive())

Add patch for unused local var in DisplayItemList.cpp