From ad4690306c4a0c322abb7f098a0f539740660b4a Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging

diff --git a/api/pom.xml b/api/pom.xml
index 2a3c5eae..25d870d1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -43,5 +43,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- Waterfall - Add SLF4J -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
index e85b4914..2e5ae4fb 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
@@ -27,6 +27,12 @@ public class Plugin
     @Getter
     private Logger logger;

+    // Waterfall start - Allow plugins to use SLF4J for logging
+    public org.slf4j.Logger getSLF4JLogger() {
+        return org.slf4j.LoggerFactory.getLogger(logger.getName());
+    }
+    // Waterfall end
+
     /**
      * Called when the plugin has just been loaded. Most of the proxy will not
      * be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 78045e1d..d078cd68 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>log4j-jul</artifactId>
             <version>2.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.9.1</version>
+        </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
--
2.14.1

Allow plugins to use SLF4J for logging

Allow plugins to use SLF4J for logging


--- ../src_base/common/net/minecraft/src/SlotCrafting.java
+++ ../src_work/common/net/minecraft/src/SlotCrafting.java
@@ -1,4 +1,8 @@
 package net.minecraft.src;
+
+import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;

 import cpw.mods.fml.common.registry.GameRegistry;

@@ -122,9 +126,15 @@

                 if (var3.getItem().hasContainerItem())
                 {
-                    ItemStack var4 = new ItemStack(var3.getItem().getContainerItem());
+                    ItemStack var4 = var3.getItem().getContainerItemStack(var3);
+
+                    if (var4.isItemStackDamageable() && var4.getItemDamage() >= var4.getMaxDamage())
+                    {
+                        MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, var4));
+                        var4 = null;
+                    }

-                    if (!var3.getItem().doesContainerItemLeaveCraftingGrid(var3) || !this.thePlayer.inventory.addItemStackToInventory(var4))
+                    if (var4 != null && (!var3.getItem().doesContainerItemLeaveCraftingGrid(var3) || !this.thePlayer.inventory.addItemStackToInventory(var4)))
                     {
                         if (this.craftMatrix.getStackInSlot(var2) == null)
                         {

--- ../src_base/common/net/minecraft/src/SlotCrafting.java
+++ ../src_work/common/net/minecraft/src/SlotCrafting.java
@@ -1,4 +1,8 @@
 package net.minecraft.src;
+
+import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;

 import cpw.mods.fml.common.registry.GameRegistry;

@@ -122,9 +126,15 @@

                 if (var3.getItem().hasContainerItem())
                 {
-                    ItemStack var4 = new ItemStack(var3.getItem().getContainerItem());
+                    ItemStack var4 = var3.getItem().getContainerItemStack(var3);
+
+                    if (var4.isItemStackDamageable() && var4.getItemDamage() > var4.getMaxDamage())
+                    {
+                        MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, var4));
+                        var4 = null;
+                    }

-                    if (!var3.getItem().doesContainerItemLeaveCraftingGrid(var3) || !this.thePlayer.inventory.addItemStackToInventory(var4))
+                    if (var4 != null && (!var3.getItem().doesContainerItemLeaveCraftingGrid(var3) || !this.thePlayer.inventory.addItemStackToInventory(var4)))
                     {
                         if (this.craftMatrix.getStackInSlot(var2) == null)
                         {

Change the Crafting damage check to be the same as the usage damage check. (>= -> >)


From cbd799612eb1da02cefc6d43fe304e4434cdf8e5 Mon Sep 17 00:00:00 2001
From: John Lo <loj@cisco.com>
Date: Fri, 26 Feb 2016 12:54:27 -0500
Subject: [PATCH 2/2] Fix ENIC PMD problem with not sending the first packet on
 TX.

---
 drivers/net/enic/base/enic_vnic_wq.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/enic/base/enic_vnic_wq.h b/drivers/net/enic/base/enic_vnic_wq.h
index e3ea574..75fad22 100644
--- a/drivers/net/enic/base/enic_vnic_wq.h
+++ b/drivers/net/enic/base/enic_vnic_wq.h
@@ -48,7 +48,7 @@ static inline void enic_vnic_post_wq_index(struct vnic_wq *wq)
 	 * stale descriptor fields.
 	*/
 	wmb();
-	iowrite32(buf->index, &wq->ctrl->posted_index);
+	iowrite32(buf->next->index, &wq->ctrl->posted_index);
 }

 static inline void enic_vnic_post_wq(struct vnic_wq *wq,
--
1.9.1

Fix ENIC PMD not sending the first packet on TX.

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


Index: visit/CMake/FindHDF5.cmake
===================================================================
--- visit/CMake/FindHDF5.cmake	(revision 21259)
+++ visit/CMake/FindHDF5.cmake	(working copy)
@@ -47,9 +47,10 @@

 INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)

-IF (WIN32)
+OPTION(HDF5_LIBNAMES_AFFIX_DLL "Whether HDF5 library base names end with dll" ON)
+IF (WIN32 AND HDF5_LIBNAMES_AFFIX_DLL)
  SET_UP_THIRD_PARTY(HDF5 lib include hdf5dll hdf5_hldll)
-ELSE (WIN32)
+ELSE ()
   SET_UP_THIRD_PARTY(HDF5 lib include hdf5)
-ENDIF (WIN32)
+ENDIF ()

Index: visit/CMake/PluginMacros.cmake
===================================================================
--- visit/CMake/PluginMacros.cmake	(revision 21259)
+++ visit/CMake/PluginMacros.cmake	(working copy)
@@ -68,26 +68,15 @@
             # not configure, so the dollar sign must be escaped in the string
             # below.  Then during install, ${BUILD_TYPE} will be expanded.
             FOREACH(target ${ARGN})
-                IF(MSVC_IDE)
-                  SET(filename "${VISIT_BINARY_DIR}/exe/\${BUILD_TYPE}/${type}/${target}.dll")
-                  INSTALL(FILES ${filename}
-                    DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/${type}
-                    COMPONENT RUNTIME
-                    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                                GROUP_READ GROUP_WRITE GROUP_EXECUTE
+                SET(filename "${VISIT_BINARY_DIR}/exe/\${BUILD_TYPE}/${type}/${target}.dll")
+                INSTALL(FILES ${filename}
+                  DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/${type}
+                  COMPONENT RUNTIME
+                  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                                GROUP_READ GROUP_WRITE GROUP_EXECUTE
                                 WORLD_READ             WORLD_EXECUTE
-                    CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
-                  )
-                ELSE()  # For no IDE, installed straight into exe
-                  SET(filename "${VISIT_BINARY_DIR}/exe/${target}.dll")
-                  INSTALL(FILES ${filename}
-                    DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/${type}
-                    COMPONENT RUNTIME
-                    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                                GROUP_READ GROUP_WRITE GROUP_EXECUTE
-                                WORLD_READ             WORLD_EXECUTE
-                  )
-                ENDIF()
+                  CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
+                )
             ENDFOREACH(target)
         ENDIF(NOT WIN32)
         IF(APPLE)

Put patch back in while waiting on visit.

git-svn-id: 06aac1f7aa6783202dd435920b98a457d633d0b0@200 a9e16012-fd73-49ee-95cb-036de7809213


diff -ur bison-2.4.orig/lib/config.charset bison-2.4/lib/config.charset
--- bison-2.4.orig/lib/config.charset	2008-11-02 21:59:28.000000000 +0000
+++ bison-2.4/lib/config.charset	2008-11-09 14:56:56.000000000 +0000
@@ -478,8 +478,8 @@
 	# space nevertheless.
 	echo "* UTF-8"
 	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
+    beos*|haiku*)
+	# BeOS has a single locale, and it has UTF-8 encoding. Same for Haiku.
 	echo "* UTF-8"
 	;;
     msdosdjgpp*)
diff -ur bison-2.4.orig/src/location.c bison-2.4/src/location.c
--- bison-2.4.orig/src/location.c	2008-08-17 06:15:28.000000000 +0000
+++ bison-2.4/src/location.c	2008-11-09 15:03:06.000000000 +0000
@@ -121,11 +121,11 @@
   /* Must search in reverse since the file name field may
    * contain `.' or `:'.  */
   char *delim = strrchr (loc_str, '.');
-  aver (delim);
+  aver (delim != NULL);
   *delim = '\0';
   bound->column = atoi (delim+1);
   delim = strrchr (loc_str, ':');
-  aver (delim);
+  aver (delim != NULL);
   *delim = '\0';
   bound->line = atoi (delim+1);
   bound->file = uniqstr_new (loc_str);
diff -ur bison-2.4.orig/src/muscle_tab.c bison-2.4/src/muscle_tab.c
--- bison-2.4.orig/src/muscle_tab.c	2008-08-17 06:15:28.000000000 +0000
+++ bison-2.4/src/muscle_tab.c	2008-11-09 15:11:17.000000000 +0000
@@ -336,7 +336,7 @@
 {
   location loc;
   char const *value = muscle_find_const (key);
-  aver (value);
+  aver (value != NULL);
   aver (*value == '[');
   aver (*++value == '[');
   while (*++value)

Patch for bison 2.4, Haiku.

Patch for bison 2.4, Haiku.


From 923ea820a0d2285569e92da14c5b35e675589600 Mon Sep 17 00:00:00 2001
From: Jun He <jun.he@linaro.org>
Date: Thu, 9 Aug 2018 05:49:09 +0000
Subject: [PATCH] CRUNCH-671: Failed to generate reports using "mvn site"

Crunch build failed due to "ClassNotFound" in doxia.
This is caused by maven-project-info-reports-plugin updated to 3.0.0, depends on
doxia-site-renderer 1.8 (which has org.apache.maven.doxia.siterenderer.DocumentContent
this class), while maven-site-plugin:3.3 depends on doxia-site-renderer:1.4 (which
doesn't have org.apache.maven.doxia.siterenderer.DocumentContent)
Specify maven-site-plugin to 3.7 can resolve this.

Signed-off-by: Jun He <jun.he@linaro.org>
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index e3b6d8d..11b87fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,6 +839,11 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.7.1</version>
+      </plugin>
       </plugins>
     </pluginManagement>
   </build>
--
2.7.4

BIGTOP-3061: Fix ClassNotFound issue for crunch build

Pick patch from upstream.

This closes #378

Change-Id: I3c2a2bf717fa070b61b4c1788a52874361910dbc
Signed-off-by: Jun He <36f0efb77d5be14f4007823fc455798bfd9bad36@apache.org>


--- libisoburn-1.3.2.orig/xorriso/misc_funct.c
+++ libisoburn-1.3.2/xorriso/misc_funct.c
@@ -463,6 +463,7 @@ int Decode_ecma119_format(struct tm *erg
 /* 2010040711405800 */
 {
  int i, l, num, utc= 1;
+ time_t normalized;

  memset(erg, 0, sizeof(*erg));
  erg->tm_isdst= -1;
@@ -499,6 +500,8 @@ int Decode_ecma119_format(struct tm *erg
  erg->tm_sec= 10*(text[12]-'0')+text[13]-'0';
  if(erg->tm_sec > 59)
    return(0);
+ normalized = mktime(erg);
+ erg = gmtime(&normalized);
  return(1 + !utc);
 }

Add non-essential patch for libisoburn - only used for debugging output

Misleading otherwise.


--- a/node_modules/lottie-react-native/src/js/LottieView.js
+++ b/node_modules/lottie-react-native/src/js/LottieView.js
@@ -149,11 +149,17 @@ class LottieView extends React.Component {
       sizeStyle = autoSize && sourceJson ? { width: source.w } : StyleSheet.absoluteFill;
     }

+    const speed =
+      this.props.duration && sourceJson && this.props.source.fr
+        ? Math.round(this.props.source.op / this.props.source.fr * 1000 / this.props.duration)
+        : this.props.speed;
+
     return (
       <View style={[aspectRatioStyle, sizeStyle, style]}>
         <AnimatedNativeLottieView
           ref={this.refRoot}
           {...rest}
+          speed={speed}
           style={[aspectRatioStyle, sizeStyle || { width: '100%', height: '100%' }, style]}
           sourceName={sourceName}
           sourceJson={sourceJson}

Fix duration of animation in About page

Fix duration of animation in About page

Add patch while waiting for PR to be merged


diff --git a/openssh.rb b/openssh.rb
index 260ee93..c07aacf 100644
--- a/openssh.rb
+++ b/openssh.rb
@@ -16,6 +16,7 @@ class Openssh < Formula
   # Please don't resubmit the keychain patch option. It will never be accepted.
   # https://github.com/Homebrew/homebrew-dupes/pull/482#issuecomment-118994372
   option "with-libressl", "Build with LibreSSL instead of OpenSSL"
+  option "with-ssh1", "Build with ssh1 support"

   depends_on "openssl" => :recommended
   depends_on "libressl" => :optional
@@ -43,6 +44,12 @@ class Openssh < Formula
       url "https://raw.githubusercontent.com/Homebrew/patches/d8b2d8c2/OpenSSH/launchd.patch"
       sha256 "df61404042385f2491dd7389c83c3ae827bf3997b1640252b018f9230eab3db3"
     end
+
+    # Patch for macOS
+    patch do
+      url "https://raw.githubusercontent.com/boltomli/MyMacScripts/master/homebrew/openssh.macOS.patch"
+      sha256 "546464d165dfeb1ec261dd81447aeee06ac875960f32031f623cb49aaa1074e3"
+    end
   end

   def install
@@ -65,6 +72,8 @@ class Openssh < Formula

     args << "--with-ldns" if build.with? "ldns"

+    args << "--with-ssh1" if build.with? "ssh1"
+
     system "./configure", *args
     system "make"
     system "make", "install"

Add the diff for homebrew-dupes

Add the diff for homebrew-dupes


diff -ru dos2unix-7.3.4.orig/common.c dos2unix-7.3.4/common.c
--- dos2unix-7.3.4.orig/common.c	2016-05-24 22:11:15.000000000 +0200
+++ dos2unix-7.3.4/common.c	2016-05-25 21:05:33.862572800 +0200
@@ -800,6 +800,7 @@
   return path;
 }

+#ifdef NO_MKSTEMP
 char *basename(char *path)
 {
   char *ptr;
@@ -821,6 +822,7 @@
    return ptr ;
 }
 #endif
+#endif

 /* Standard mktemp() is not safe to use (See mktemp(3)).
  * On Windows it is recommended to use GetTempFileName() (See MSDN).

Update to 7.3.4 (patch file)

dos2unix: Update to 7.3.4 (patch file)


From cad98b18fc17a636c2068b47d9dc909fab082498 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Fri, 18 Dec 2015 14:18:18 -0800
Subject: [PATCH] Make sure we turn off all heaters when we shut down.

---
 PrinterCommunication/PrinterConnectionAndCommunication.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs
index e4b5125..103024b 100644
--- a/PrinterCommunication/PrinterConnectionAndCommunication.cs
+++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs
@@ -2785,8 +2785,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication

 		private void TurnOffBedAndExtruders()
 		{
-			SetTargetExtruderTemperature(0, 0);
-			SetTargetExtruderTemperature(1, 0);
+            SetTargetExtruderTemperature(0, 0);
+            for (int i = 1; i < ActiveSliceSettings.Instance.ExtruderCount; i++)
+            {
+                SetTargetExtruderTemperature(i, 0);
+            }
 			TargetBedTemperature = 0;
 		}

--
1.8.3.msysgit.0


diff -r cc96f8c51ec0 src/NpapiPlugin/NPObjectAPI.cpp
--- a/src/NpapiPlugin/NPObjectAPI.cpp	Thu Jul 15 13:49:51 2010 -0600
+++ b/src/NpapiPlugin/NPObjectAPI.cpp	Wed Jul 21 22:03:17 2010 +0300
@@ -21,6 +21,8 @@
     : BrowserObjectAPI(h), browser(h), obj(o)
 {
     if (h != NULL && o != NULL) {
+        // Do a double-retain to detect browser errors
+        browser->RetainObject(obj);
         browser->RetainObject(obj);
     }
 }
@@ -28,7 +30,23 @@
 NPObjectAPI::~NPObjectAPI(void)
 {
     if (browser.ptr() != NULL && obj != NULL) {
-        browser->ReleaseObject(obj);
+        if(obj->referenceCount < 2) {
+            printf("NPObjectAPI: Buggy browser detected: our RetainObject was not honoured\n");
+            /* In theory we could check if referenceCount == 1 and
+             * do a release, but in practice this will cause Firefox
+             * to crash at times. According to common sense, it's not a good idea
+             * to try to Release something that has it's reference count
+             * fucked up already: a potential memory leak is a lot better
+             * than a crash so we just leave it alone. */
+        } else {
+            browser->ReleaseObject(obj);
+            if(obj->referenceCount < 1) {
+                printf("NPObjectAPI(): Buggy browser detected: race condition in ReleaseObject\n");
+            } else {
+                browser->ReleaseObject(obj);
+            }
+        }
+        obj = NULL;
     }
 }

@@ -148,4 +166,4 @@
         browser->ReleaseVariantValue(&retVal);  // Always release the return value!
         return ret;
     }
-}
\ No newline at end of file
+}
diff -r cc96f8c51ec0 src/NpapiPlugin/NpapiPluginModule_NPP.cpp
--- a/src/NpapiPlugin/NpapiPluginModule_NPP.cpp	Thu Jul 15 13:49:51 2010 -0600
+++ b/src/NpapiPlugin/NpapiPluginModule_NPP.cpp	Wed Jul 21 22:03:17 2010 +0300
@@ -112,8 +112,6 @@
 NPError NpapiPluginModule::NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
                                    char* argn[], char* argv[], NPSavedData* saved)
 {
-    printf("NPP_New()\n");
-
     if (instance == NULL) {
         return NPERR_INVALID_INSTANCE_ERROR;
     }

esteid-browser-plugin: Add an experimental patch to windows build

git-svn-id: 804e3bcc3d5e1f71d31da0afe626cb969e0fc117@2925 0d7e1ef0-d974-fc83-f0b3-ccc071561e0e


--- src/editline/readline.h	2019-07-03 09:09:00.000000000 +0200
+++ src/editline/readline.h	2019-11-30 16:56:47.213858800 +0100
@@ -46,6 +46,10 @@
 */
 #define DEFAULT_HISTORY_SIZE    200  /* default number of history entries */

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef char **rl_completion_func_t(const char *, int, int);
 typedef char *rl_compentry_func_t(const char *, int);
 typedef void rl_compentryfree_func_t(void *);

Fix missing "extern c" in header

wineditline: Fix missing "extern c" in header


Index: flourish/fTemplating.php
===================================================================
--- flourish/fTemplating.php	(revision 1042)
+++ flourish/fTemplating.php	(working copy)
@@ -833,12 +833,14 @@
 	 * preserving /*! comment blocks for things like licenses. Some other
 	 * versions of JSMin change the contents of special comment blocks, but
 	 * this version does not.
+	 *
+	 * @internal
 	 *
 	 * @param string $code  The code to minify
 	 * @param string $type  The type of code, 'css' or 'js'
 	 * @return string  The minified code
 	 */
-	protected function minify($code, $type)
+	public function minify($code, $type)
 	{
 		$output = '';
 		$buffer = '';
@@ -907,6 +909,17 @@

 		return $output;
 	}
+
+	/**
+	 * Minifies JS (static version).
+	 *
+	 * @param string   $code JavaScript code.
+	 * @return string  The minified code.
+	 */
+	public static function minifyJavaScript($code) {
+		$temp = new self('.');
+		return $temp->minify($code, 'js');
+	}

 	/**
@@ -1516,4 +1529,4 @@
  * 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.
- */
\ No newline at end of file
+ */

Add patch to add a static JavaScript minification method


--- vbcc/datatypes/dtgen.c.orig	2013-04-24 00:45:50.000000000 +0200
+++ vbcc/datatypes/dtgen.c	2015-04-28 10:54:11.828847716 +0200
@@ -130,23 +130,14 @@
 int askyn(char *def)
 {
   char in[8];
-  do{
-    printf("Type y or n [%s]: ",def);
-    fflush(stdout);
-    fgets(in,sizeof(in),stdin);
-    if(*in=='\n') strcpy(in,def);
-  }while(*in!='y'&&*in!='n');
+  strcpy(in,def);
   return *in=='y';
 }

 char *asktype(char *def)
 {
   char *in=mymalloc(128);
-  printf("Enter that type[%s]: ",def);
-  fflush(stdout);
-  fgets(in,127,stdin);
-  if(in[strlen(in)-1]=='\n') in[strlen(in)-1]=0;
-  if(!*in) strcpy(in,def);
+  strcpy(in,def);
   return in;
 }

Add patch for vbcc build - make it non-interactive and accept defaults.


--- a/i18n/Makefile.in	2009-05-18 13:55:49.000000000 +0200
+++ b/i18n/Makefile.in	2009-05-18 13:55:49.000000000 +0200
@@ -105,6 +105,9 @@

 all-local: $(ALL_TARGETS)

+rematch.o: $(srcdir)/rematch.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -c -o $@ $<
+
 install-local: install-headers install-library

 install-library: all-local

--- a/i18n/Makefile.in	2009-05-18 13:55:49.000000000 +0200
+++ b/i18n/Makefile.in	2009-05-18 13:55:49.000000000 +0200
@@ -105,6 +105,9 @@

 all-local: $(ALL_TARGETS)

+rematch.o: $(srcdir)/rematch.cpp
+	$(CXX) -fPIC $(CPPFLAGS) $(DEFS) -c -o $@ $<
+
 install-local: install-headers install-library

 install-library: all-local

icu: Fix compilation for mips using -fPIC on the rematch.o

/home/grg/oe/tmp/cross/mipsel/lib/gcc/mipsel-angstrom-linux/4.4.1/../../../../mipsel-angstrom-linux/bin/ld: rematch.o: relocation R_MIPS_HI16 against `__gnu_local_gp' can not be used when making a shared object; recompile with -fPIC

http://patchwork.openembedded.org/patch/920/

Signed-Off-By: Holger Hans Peter Freyther <100e68ee9b4821ba21791f94c53e61236ff440a4@selfish.org>


From 5753fa36cb3e51ea5896c767f468b3a8ec821444 Mon Sep 17 00:00:00 2001
From: Dominique Hazael-Massieux <dom@w3.org>
Date: Thu, 24 Feb 2022 08:27:25 +0100
Subject: [PATCH] Fix IDL for CanvasPath.roundRect

Following expected resolution of https://github.com/whatwg/html/issues/7634
---
 ed/idl/html.idl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ed/idl/html.idl b/ed/idl/html.idl
index db4495ef9..b844dcc32 100644
--- a/ed/idl/html.idl
+++ b/ed/idl/html.idl
@@ -1480,7 +1480,7 @@ interface mixin CanvasPath {
   undefined bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
   undefined arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
   undefined rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  undefined roundRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h, (unrestricted double or DOMPointInit or sequence<(unrestricted double or DOMPointInit)>) radii);
+  undefined roundRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h, optional (unrestricted double or DOMPointInit or sequence<(unrestricted double or DOMPointInit)>) radii = {});
   undefined arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean counterclockwise = false);
   undefined ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean counterclockwise = false);
 };
--
2.35.1

Patch invalid WebIDL in HTML for CanvasPath.roundRect

see also https://github.com/w3c/webref/pull/506#issuecomment-1046557530 and https://github.com/whatwg/html/issues/7634


From ecc5669223457ceaba6bd94c2947ae99ddfa8f10 Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@greiz-reinsdorf.de>
Date: Fri, 27 Dec 2019 15:57:07 +0100
Subject: [PATCH] Load encrypted private key using
 ENV['GEM_PRIVATE_KEY_PASSPHRASE'] as passphrase.

This way the password can be avoided to be entered several times when building multiple gems.
It also allows parallel builds which are incompatible to interactive password prompts.

The same feature has been implemented in rubygems:
  https://github.com/rubygems/rubygems/commit/c1a114396fcec124d3feabf74708b4bdec02eac3
---
 lib/hoe/signing.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/hoe/signing.rb b/lib/hoe/signing.rb
index 4833c55..11c8c2f 100644
--- a/lib/hoe/signing.rb
+++ b/lib/hoe/signing.rb
@@ -70,7 +70,8 @@ module Hoe::Signing
     end

     if signing_key and cert_chain then
-      spec.signing_key = OpenSSL::PKey::RSA.new File.read signing_key
+      passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
+      spec.signing_key = OpenSSL::PKey::RSA.new(File.read(signing_key), passphrase)
       spec.cert_chain = cert_chain
     end
   end
--
2.20.1

Add a patch to hoe to respect GEM_PRIVATE_KEY_PASSPHRASE

See upstream pull request: https://github.com/seattlerb/hoe/pull/101


--- /home/mark/converters.py.orig	2009-12-20 00:47:58.000000000 -0500
+++ ./converters.py	2009-12-20 00:48:16.000000000 -0500
@@ -42,8 +42,8 @@
             type_codes.WRD: int,
             type_codes.BIGINT: int,
             type_codes.SERIAL: int,
-            type_codes.REAL: int,
-            type_codes.DOUBLE: int,
+            type_codes.REAL: float,
+            type_codes.DOUBLE: float,
             type_codes.BOOLEAN: self.__bool,
             type_codes.DATE: self.__date,
             type_codes.TIME: self.__time,

Fix mapping of MonetDB types to Python types in Monet DB Python client lib.


Index: tools/clang/lib/Basic/FileManager.cpp
===================================================================
--- tools/clang/lib/Basic/FileManager.cpp	(revision 160036)
+++ tools/clang/lib/Basic/FileManager.cpp	(working copy)
@@ -112,7 +112,13 @@

   size_t size() const { return UniqueFiles.size(); }

-  void erase(const FileEntry *Entry) { UniqueFiles.erase(Entry->getName()); }
+  void erase(const FileEntry *Entry) {
+    std::string FullPath(GetFullPath(Entry->getName()));
+
+    // Lowercase string because Windows filesystem is case insensitive.
+    FullPath = StringRef(FullPath).lower();
+    UniqueFiles.erase(FullPath);
+  }
 };

 //===----------------------------------------------------------------------===//

Check Windows patch for clang.

Check Windows patch for clang.

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


diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart
index 7d450be42..e158e33af 100644
--- a/packages/flutter_test/lib/src/binding.dart
+++ b/packages/flutter_test/lib/src/binding.dart
@@ -1763,9 +1763,10 @@ class _MockHttpResponse extends Stream<List<int>> implements HttpClientResponse
   @override
   int get contentLength => -1;

-  // @override
-  // TODO(tvolkert): Uncomment @override annotation once SDK change lands.
-  bool get autoUncompress => true;
+  @override
+  HttpClientResponseCompressionState get compressionState {
+    return HttpClientResponseCompressionState.decompressed;
+  }

   @override
   List<Cookie> get cookies => null;
diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart
index b5453cbb1..f7cdf6164 100644
--- a/packages/flutter_tools/test/commands/create_test.dart
+++ b/packages/flutter_tools/test/commands/create_test.dart
@@ -1172,6 +1172,11 @@ class MockHttpClientResponse extends Stream<List<int>> implements HttpClientResp
   @override
   String get reasonPhrase => '<reason phrase>';

+  @override
+  HttpClientResponseCompressionState get compressionState {
+    return HttpClientResponseCompressionState.decompressed;
+  }
+
   @override
   StreamSubscription<List<int>> listen(
     void onData(List<int> event), {

Add patch to fix Flutter

Add patch to fix Flutter

This patch file updates Flutter's mocks of HttpClientResponse to add
a new `compressionState` getter that was added in
https://github.com/dart-lang/sdk/commit/aa2ce7cfbfaca5439b86b6ee4ad503691b8ce0ac

Bug: dartbug.com/36971
Change-Id: I69296ab7a9365f74402975875048cc8d1fec965c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104262
Commit-Queue: Todd Volkert <cb9a415726d7a79af5483ebf0b489c766d617d5d@google.com>
Reviewed-by: Zach Anderson <9f8b31e960a68dade71618f1ff6da6e23a1edfc9@google.com>


diff --git toolchain/uClibc/config-0.9.33.2/common toolchain/uClibc/config-0.9.33.2/common
index 457d21f..679d924 100644
--- toolchain/uClibc/config-0.9.33.2/common
+++ toolchain/uClibc/config-0.9.33.2/common
@@ -186,7 +186,7 @@ UCLIBC_HAS_TZ_FILE_READ_MANY=y
 # UCLIBC_HAS_UTMPX is not set
 UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_WORDEXP=y
-# UCLIBC_HAS_XATTR is not set
+UCLIBC_HAS_XATTR=y
 # UCLIBC_HAS_XLOCALE is not set
 UCLIBC_HAS___PROGNAME=y
 # UCLIBC_LINUX_MODULE_24 is not set

Add patch for openwrt to enable xattr flag in uclibc


Fix Mesa compatibility with clang

Fix Mesa compatibility with clang


diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5896d0..cc2ac7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ INCLUDE(CPack)
 INCLUDE(GNUInstallDirs)

 SET(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

 OPTION(ENABLE_SHARED "Build shared library" ON)
 OPTION(ENABLE_STATIC "Build static library" OFF)
diff --git a/libffmpegthumbnailer/videothumbnailerc.cpp b/libffmpegthumbnailer/videothumbnailerc.cpp
index 497a1ce..a326c3d 100644
--- a/libffmpegthumbnailer/videothumbnailerc.cpp
+++ b/libffmpegthumbnailer/videothumbnailerc.cpp
@@ -25,9 +25,10 @@ using namespace ffmpegthumbnailer;

 struct thumbnailer_data
 {
+    thumbnailer_data() : log_cb(0) {}
     VideoThumbnailer thumbnailer;
     FilmStripFilter filter;
-    thumbnailer_log_callback log_cb = nullptr;
+    thumbnailer_log_callback log_cb;
 };

 static void trace_message(video_thumbnailer* thumbnailer, ThumbnailerLogLevel lvl, const char* message)

sailfish: Add a patch to fix C++11 flags with our old g++


Index: ui/gfx/win/dpi.cc
===================================================================
--- ui/gfx/win/dpi.cc	(revision 274914)
+++ ui/gfx/win/dpi.cc	(working copy)
@@ -191,12 +191,8 @@
 }

 Point ScreenToDIPPoint(const Point& pixel_point) {
-  static float scaling_factor =
-      GetDeviceScaleFactor() > GetUnforcedDeviceScaleFactor() ?
-      1.0f / GetDeviceScaleFactor() :
-      1.0f;
   return ToFlooredPoint(ScalePoint(pixel_point,
-      scaling_factor));
+      1.0f / GetDeviceScaleFactor()));
 }

 Point DIPToScreenPoint(const Point& dip_point) {

Add patch to fix ScreenToDIPPoint.

Add patch to fix ScreenToDIPPoint.

Imported from:
https://chromium.googlesource.com/chromium/src/+/d0cb4cedfc146e1c29e525d37c2cdaf088426967%5E%21/#F0


diff --git a/node_modules/app-builder-lib/electron-osx-sign/sign.js b/node_modules/app-builder-lib/electron-osx-sign/sign.js
index 3b85d83c..87da4e57 100644
--- a/node_modules/app-builder-lib/electron-osx-sign/sign.js
+++ b/node_modules/app-builder-lib/electron-osx-sign/sign.js
@@ -119,6 +119,17 @@ async function verifySignApplicationAsync (opts) {
 function signApplicationAsync (opts) {
   return walkAsync(getAppContentsPath(opts))
     .then(async function (childPaths) {
+      /**
+       * Sort the child paths by how deep they are in the file tree.  Some arcane apple
+       * logic expects the deeper files to be signed first otherwise strange errors get
+       * thrown our way
+       */
+      childPaths = childPaths.sort((a, b) => {
+        const aDepth = a.split(path.sep).length
+        const bDepth = b.split(path.sep).length
+        return bDepth - aDepth
+      })
+
       function ignoreFilePath (opts, filePath) {
         if (opts.ignore) {
           return opts.ignore.some(function (ignore) {

Patch electron-builder to fix signing on macos

Remove this once
https://github.com/electron-userland/electron-builder/pull/4993 is
merged

Change-type: patch


diff --git a/gme/Fir_Resampler.cpp b/gme/Fir_Resampler.cpp
index 7a6600b..471443f 100644
--- a/gme/Fir_Resampler.cpp
+++ b/gme/Fir_Resampler.cpp
@@ -188,6 +188,8 @@ int Fir_Resampler_::skip_input( long count )
 {
 	int remain = write_pos - buf.begin();
 	int max_count = remain - width_ * stereo;
+	if ( max_count < 0 )
+		return 0;
 	if ( count > max_count )
 		count = max_count;

project: Add patch showing changes made in this repo.


diff --git a/src/main/scala/Configuration.scala b/src/main/scala/Configuration.scala
index 0df825e..39a0b78 100644
--- a/src/main/scala/Configuration.scala
+++ b/src/main/scala/Configuration.scala
@@ -8,5 +8,5 @@ object CompilationOptions {
 	type CONVERT_REAL_TO_INT = TRUE
         type USE_MINIMAL_CORE = FALSE
 	val THREAD_NUMBER = 1
-	val Z3_PATH = """tools/Z3/z3.exe"""
+	val Z3_PATH = """/usr/bin/z3"""
 }

Add patch for setting the correct Z3 path on Linux


Index: git/docs/reference/Makefile.am
===================================================================
--- git.orig/docs/reference/Makefile.am	2008-04-24 17:29:49.000000000 +0100
+++ git/docs/reference/Makefile.am	2008-04-24 17:29:56.000000000 +0100
@@ -1,3 +1,3 @@
-SUBDIRS = addressbook calendar libedataserver
+SUBDIRS = addressbook libedataserver
 MKDB_OPTIONS=--output-format=xml

Add patch to only build relevant documentation.


diff --git a/rldefs.h b/rldefs.h
index 0257754..099420c 100644
--- a/rldefs.h
+++ b/rldefs.h
@@ -34,6 +34,14 @@
 #  undef HAVE_STRCOLL
 #endif

+#if defined (__native_client__) && !defined (_POSIX_VERSION)
+/* Currently the newlib toolchain in NaCl doesn't define _POSIX_VERSION
+ * which causes readline to fall back to using ioctl() rather than
+ * tcgetattr().  TODO(sbc): remove this patch once either ioctl() is
+ * supported on tty nodes or _POSIX_VERSION is defined by newlib headers. */
+#define _POSIX_VERSION 199309L
+#endif
+
 #if defined (_POSIX_VERSION) && !defined (TERMIOS_MISSING)
 #  define TERMIOS_TTY_DRIVER
 #else

diff --git a/rldefs.h b/rldefs.h
index 0257754..991f308 100644
--- a/rldefs.h
+++ b/rldefs.h
@@ -34,6 +34,22 @@
 #  undef HAVE_STRCOLL
 #endif

+#if defined (__native_client__) && !defined (_POSIX_VERSION)
+/* Currently the newlib toolchain in NaCl doesn't define _POSIX_VERSION
+ * which causes readline to fall back to using ioctl() rather than
+ * tcgetattr().  TODO(sbc): remove this patch once either ioctl() is
+ * supported on tty nodes or _POSIX_VERSION is defined by newlib headers. */
+#define _POSIX_VERSION 199309L
+#endif
+
+#if defined (__native_client__) && !defined (__GLIBC__) && !defined TCOON
+// TODO(sbc): remove once these are added to termios.h in NaCl
+#define TCOOFF    0
+#define TCOON     1
+#define TCIOFF    2
+#define TCION     3
+#endif
+
 #if defined (_POSIX_VERSION) && !defined (TERMIOS_MISSING)
 #  define TERMIOS_TTY_DRIVER
 #else

Fix newlib build of readline.

Fix newlib build of readline.

R=binji@chromium.org

Review URL: https://codereview.chromium.org/22986023

git-svn-id: 84b3587ce119b778414dcb50e18b7479aacf4f1d@874 7dad1e8b-422e-d2af-fbf5-8013b78bd812


--- introspect.py.orig	Thu Jul 15 10:28:08 2004
+++ introspect.py	Thu Jul 15 10:29:13 2004
@@ -61,6 +61,10 @@
     for item in attributes:
         dict[item] = None
     attributes = dict.keys()
+    # we have to remove all non-string items from the attributes list
+    # some wrappings (e.g. ITK + CableSwig) add non-string attribute names
+    attributes = [attribute for attribute in attributes
+                  if type(attribute) == types.StringType]
     attributes.sort(lambda x, y: cmp(x.upper(), y.upper()))
     if not includeSingle:
         attributes = filter(lambda item: item[0]!='_' \

Patch required to wxPython 2.4.2.4 so that ITK introspection doesn't break.


--- misc/build/xmlsec1-1.2.14/config.sub
+++ misc/build/xmlsec1-1.2.14/config.sub
@@ -120,7 +120,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -1275,7 +1275,7 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

Add the xmlsec1 Android patch

Add the xmlsec1 Android patch


diff --git i/core/src/main/resources/logback.xml w/core/src/main/resources/logback.xml
index adcc481..4190fe8 100644
--- i/core/src/main/resources/logback.xml
+++ w/core/src/main/resources/logback.xml
@@ -8,7 +8,7 @@
         </encoder>
     </appender>

-    <logger name="org.mapfish" level="ALL" />
+    <logger name="org.mapfish" level="INFO" />
     <!-- Set spec logger to INFO to log all print spec json data -->
     <logger name="org.mapfish.print.servlet.BaseMapServlet.spec" level="OFF" />
     <logger name="com.codahale.metrics.JmxReporter" level="INFO" />

Add patch to reduce MFP log level

Add patch to reduce MFP log level


--- include/syno.h.orig	2013-02-25 08:13:25.000000000 +0100
+++ include/syno.h	2013-03-07 23:53:16.000000000 +0100
@@ -52,11 +52,11 @@
 #define SDCOPY_PORT_LOCATION 98
 #endif

-#if 0 || defined(1)
+#if 1
 #define SYNO_USB_BACKPORT_BY_ETRON
 #endif

-#if 0 || defined(1)
+#if 1
 #define SYNO_FIX_IN_ETRON
 #endif

--- powerpc-none-linux-gnuspe/include/linux/syno.h.orig	2013-02-25 08:13:25.000000000 +0100
+++ powerpc-none-linux-gnuspe/include/linux/syno.h	2013-03-08 11:09:23.000000000 +0100
@@ -52,11 +52,11 @@
 #define SDCOPY_PORT_LOCATION 98
 #endif

-#if 0 || defined(1)
+#if 1
 #define SYNO_USB_BACKPORT_BY_ETRON
 #endif

-#if 0 || defined(1)
+#if 1
 #define SYNO_FIX_IN_ETRON
 #endif

Fix syno.h in qoriq toolchain

Fix syno.h in qoriq toolchain


Index: twisted/test/test_tcp.py
===================================================================
--- twisted/test/test_tcp.py	(revision 19773)
+++ twisted/test/test_tcp.py	(working copy)
@@ -1294,6 +1294,8 @@
             self.client.transport.loseConnection()
             log.flushErrors(RuntimeError)
         return d.addCallback(check)
+
+    testReadNotificationRaises.todo = "self.f.protocol is None"

     def testWriteNotificationRaises(self):
         self.client.writeConnectionLost = self.aBug

Disable testReadNotificationRaises, which is buggy

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


Index: common.gypi
===================================================================
diff --git a/trunk/build/common.gypi
--- a/trunk/build/common.gypi	(revision 277350)
+++ b/trunk/build/common.gypi	(working copy)
@@ -1231,7 +1231,7 @@
     # '1', uses the version of clang that ships with Xcode.  If set to '0', uses
     # the version of clang that ships with the Chromium source.  This variable
     # is automatically set to '1' when using the Xcode generator.
-    'clang_xcode%': 0,
+    'clang_xcode%': 1,

     # These two variables can be set in GYP_DEFINES while running
     # |gclient runhooks| to let clang run a plugin in every compilation.

PATCH Use xcode's clang instead of google's prebuilt


--- source/include/curl/curl.h	2017-08-07 15:42:29.000000000 -0700
+++ build/include/curl/curl.h	2018-09-20 14:27:20.462414020 -0700
@@ -74,6 +74,7 @@
 #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
     defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
+    defined(__redox__) || \
    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
 #include <sys/select.h>
 #endif

Add patch for curl missing sys/select.h

Add patch for curl missing sys/select.h


diff --git a/albequerque/__init__.py b/albequerque/__init__.py
index 3bc66f9..9924eee 100644
--- a/albequerque/__init__.py
+++ b/albequerque/__init__.py
@@ -4,25 +4,20 @@ from .people import PersonScraper

 class Example(Jurisdiction):
-    jurisdiction_id = 'ocd-jurisdiction/country:us/state:ex/place:example'
+    jurisdiction_id = 'ocd-jurisdiction/country:us/state:nm/place:albequerque/council'

     def get_metadata(self):
         return {
-            'name': 'Example',
-            'legislature_name': 'Example Legislature',
-            'legislature_url': 'http://example.com',
+            'name': 'Albequerque City Council',
+            'legislature_name': 'Albequerque City Council',
+            'legislature_url': 'http://www.cabq.gov/council/',
             'terms': [{
-                'name': '2013-2014',
-                'sessions': ['2013'],
+                'name': '2013-2015',
                 'start_year': 2013,
-                'end_year': 2014
+                'end_year': 2015,
+                'sessions': ['2013'],
                 }],
             'provides': ['people'],
-            'parties': [
-                {'name': 'Independent' },
-                {'name': 'Green' },
-                {'name': 'Bull-Moose'}
-               ],
             'session_details': {
                 '2013': {'_scraped_name': '2013'}
                 },

Fix misspelling of Alb name

Fix misspelling of Alb name


diff -ruN orig/kan-extensions.cabal new/kan-extensions.cabal
--- orig/kan-extensions.cabal	2014-08-25 17:24:28.206498700 +0300
+++ new/kan-extensions.cabal	2014-08-25 17:24:28.000000000 +0300
@@ -51,6 +51,7 @@
     mtl           >= 2.0.1   && < 2.3,
     pointed       >= 4       && < 5,
     semigroupoids >= 4       && < 5,
+    tagged,
     transformers  >= 0.2     && < 0.5

   exposed-modules:

Patch for kan-extensions on GHC 7.6.3

Patch for kan-extensions on GHC 7.6.3


Index: src/java/org/dellroad/stuff/vaadin/ContextApplication.java
===================================================================
--- src/java/org/dellroad/stuff/vaadin/ContextApplication.java	(revision 360)
+++ src/java/org/dellroad/stuff/vaadin/ContextApplication.java	(working copy)
@@ -10,9 +10,11 @@
 import com.vaadin.Application;
 import com.vaadin.terminal.Terminal;
 import com.vaadin.terminal.gwt.server.HttpServletRequestListener;
-import com.vaadin.ui.Window;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.Root;

 import java.net.SocketException;
+import java.util.Collection;
 import java.util.EventObject;
 import java.util.HashSet;
 import java.util.List;
@@ -122,15 +124,19 @@
     public void showError(String title, String description) {

         // Get window
-        Window window = this.getMainWindow();
-        if (window == null)
-            return;
+        Root root = Root.getCurrentRoot();
+        if (root == null) {
+            Collection<Root> roots = this.getRoots();
+            if (roots.isEmpty())
+                return;
+            root = roots.iterator().next();
+        }

         // Show error
-        Window.Notification notification = new Window.Notification(title, description, Window.Notification.TYPE_ERROR_MESSAGE);
+        Notification notification = new Notification(title, description, Notification.TYPE_ERROR_MESSAGE);
         notification.setStyleName("warning");
         notification.setDelayMsec(this.getNotificationDelay());
-        window.showNotification(notification);
+        root.showNotification(notification);
     }

     /**
Index: src/ivy/ivy.xml
===================================================================
--- src/ivy/ivy.xml	(revision 360)
+++ src/ivy/ivy.xml	(working copy)
@@ -15,7 +15,7 @@
     </configurations>

     <dependencies>
-        <dependency force="true" org="com.vaadin" name="vaadin" rev="6.7+" conf="build->default"/>
+        <dependency force="true" org="com.vaadin" name="vaadin" rev="7.0.0.alpha2" conf="build->default"/>
         <dependency force="true" org="javax.servlet" name="servletapi" rev="3.0" conf="build->default"/>
         <dependency force="true" org="javax.persistence" name="persistence-api" rev="2.0" conf="build->default"/>
         <dependency force="true" org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="build->default"/>

Save working patch for Vaadin 7.

Save working patch for Vaadin 7.


Index: tools/clang/lib/Sema/Sema.cpp
===================================================================
--- tools/clang/lib/Sema/Sema.cpp	(revision 47812)
+++ tools/clang/lib/Sema/Sema.cpp	(working copy)
@@ -572,7 +572,8 @@

   if (TUKind == TU_Prefix) {
     // Translation unit prefixes don't need any of the checking below.
-    TUScope = 0;
+    if (!PP.isIncrementalProcessingEnabled())
+       TUScope = 0;
     return;
   }

@@ -754,7 +755,8 @@
   assert(ParsingInitForAutoVars.empty() &&
          "Didn't unmark var as having its initializer parsed");

-  TUScope = 0;
+  if (!PP.isIncrementalProcessingEnabled())
+     TUScope = 0;
 }

Index: tools/clang/lib/Parse/Parser.cpp
===================================================================
--- tools/clang/lib/Parse/Parser.cpp	(revision 47812)
+++ tools/clang/lib/Parse/Parser.cpp	(working copy)
@@ -564,8 +564,7 @@
     // Late template parsing can begin.
     if (getLangOpts().DelayedTemplateParsing)
       Actions.SetLateTemplateParser(LateTemplateParserCallback, this);
-    if (!PP.isIncrementalProcessingEnabled())
-      Actions.ActOnEndOfTranslationUnit();
+    Actions.ActOnEndOfTranslationUnit();
     //else don't tell Sema that we ended parsing: more input might come.

     return true;

Add correspoding patch ready to go in clang's mainline.

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


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5af7109..6ac72f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,10 +384,29 @@ endif(OCE_VISU_DEP)
 if(OCE_VISU_DEP)
 	## TKService requires FreeType
 	if(NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
-		find_package(Freetype REQUIRED)
+# FindFreetype.cmake no longer works with the freetype include dirs reorg,
+# so, we will find as much as we can and repair later
+                # find_package(Freetype REQUIRED)
+		find_package(Freetype)
 	else (NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
 		find_library(FREETYPE_LIBRARY freetype)
 	endif(NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
+# Repair
+        if (NOT FREETYPE_INCLUDE_DIRS)
+          set(FREETYPE_INCLUDE_DIRS)
+          if (FREETYPE_INCLUDE_DIR_ft2build)
+            set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIR_ft2build})
+          endif ()
+          if (FREETYPE_INCLUDE_DIR_freetype2)
+            set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIR_freetype2})
+          endif ()
+        endif ()
+        if (NOT FREETYPE_LIBRARIES AND FREETYPE_LIBRARY)
+          set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+        endif ()
+        if (NOT FREETYPE_INCLUDE_DIRS OR NOT FREETYPE_LIBRARIES)
+          message(FATAL_ERROR "Unable to find freetype.")
+        endif ()

 	if(CMAKE_CONFIGURATION_TYPES OR NMAKE)
 		find_library(FREETYPE_LIBRARY_DEBUG freetyped "Location of freetype debug library")

Update experimental patch for current master of oce.

git-svn-id: 06aac1f7aa6783202dd435920b98a457d633d0b0@1144 a9e16012-fd73-49ee-95cb-036de7809213


From 7af25985e802eafec2307307e1703f9191b49b9f Mon Sep 17 00:00:00 2001
From: Mike Ovsiannikov <movsiannikov@quantcast.com>
Date: Thu, 1 Nov 2018 17:50:30 -0700
Subject: [PATCH] Java build: work around new oracle SDK problem by setting use
 system class loader property for sure fire plugin.

---
 src/java/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/java/pom.xml b/src/java/pom.xml
index ca4a7f4e..ae28ff72 100644
--- a/src/java/pom.xml
+++ b/src/java/pom.xml
@@ -42,6 +42,14 @@ permissions and limitations under the License.
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3</version>
       </plugin>
+    <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.1</version>
+        <configuration>
+            <useSystemClassLoader>false</useSystemClassLoader>
+        </configuration>
+    </plugin>
     </plugins>
   </build>

BIGTOP-3107: Patch from upstream correcting the Maven surefire break from newer Java SDK


--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
@@ -60,6 +60,7 @@
     public void func_94305_f()
     {
         Stitcher.Holder[] aholder = (Stitcher.Holder[])this.field_94319_a.toArray(new Stitcher.Holder[this.field_94319_a.size()]);
+        cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture stitching", aholder.length);
         Arrays.sort(aholder);
         Stitcher.Holder[] aholder1 = aholder;
         int i = aholder.length;
@@ -67,6 +68,7 @@
         for (int j = 0; j < i; ++j)
         {
             Stitcher.Holder holder = aholder1[j];
+            bar.step(holder.func_98150_a().func_94215_i());

             if (!this.func_94310_b(holder))
             {
@@ -80,6 +82,7 @@
             this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c);
             this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d);
         }
+        cpw.mods.fml.common.ProgressManager.pop(bar);
     }

     public List func_94309_g()

Add the stitching allocation stage to loading screen.


diff --git a/node_modules/balena-preload/src/preload.py b/node_modules/balena-preload/src/preload.py
index 887eaf3..0c5cc7f 100755
--- a/node_modules/balena-preload/src/preload.py
+++ b/node_modules/balena-preload/src/preload.py
@@ -489,8 +489,13 @@ def start_docker_daemon(storage_driver, docker_dir):
         if running_dockerd.process.exit_code is not None:
             # There is no reason for dockerd to exit with a 0 status now.
             assert running_dockerd.process.exit_code != 0
-            # This will raise an sh.ErrorReturnCode_X exception.
-            running_dockerd.wait()
+            try:
+                # This will raise an sh.ErrorReturnCode_X exception.
+                running_dockerd.wait()
+            except:
+                print("An error has occurred executing 'dockerd':\n{}".format(
+                    running_dockerd.stderr.decode("utf8")), file=sys.stderr, flush=True)
+                raise
         # Check that we can connect to dockerd.
         output = docker("version", _ok_code=[0, 1])
         ok = output.exit_code == 0

preload: Expand dockerd stderr logs in case of errors

Change-type: patch


--- 8192cu-3.4.3/os_dep/linux/os_intfs.c.orig	2013-04-23 12:26:07.924661436 -0400
+++ 8192cu-3.4.3/os_dep/linux/os_intfs.c	2013-04-23 12:26:57.552661891 -0400
@@ -639,11 +639,12 @@
 		//DBG_8192C("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3],
 		//addr->sa_data[4], addr->sa_data[5]);
 		_rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
-		//_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN);
+		_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN);
 		//padapter->bset_hwaddr = _TRUE;
+		return 0;
 	}
-
-	return 0;
+	else
+		return -EBUSY;
 }

 static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)
@@ -1528,7 +1529,8 @@
 	rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), _TRUE);
 	padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; //set this at the end
 #endif
-
+
+	padapter->bup = _FALSE;
 	RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n"));
 	DBG_8192C("-871x_drv - drv_close, bup=%d\n", padapter->bup);

[wrt] Fix non-working SIOCSIFHWADDR which broke wifi between OpenWrt r36354-36409


From 48c4fed7ba3b22298a71aca1b80eb0dfb56a3da8 Mon Sep 17 00:00:00 2001
From: Samuel Stirtzel <s.stirtzel@googlemail.com>
Date: Fri, 25 May 2012 10:54:17 +0200
Subject: [PATCH] Disable doctools

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 CMakeLists.txt |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040a24f..becc585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,8 @@ endif (KHTML_BUILD_TESTREGRESSION)

 option(STATIC_LIBRARY "Build kdelibs as static libraries." FALSE)

+set (OPENEMBEDDED "we need no doctools" TRUE)
+
 ################# write platform profile file which will be installed #################
 include(CreateKDEPlatformProfile.cmake)

@@ -295,9 +297,9 @@ if (QT_QT3SUPPORT_FOUND)
 endif (QT_QT3SUPPORT_FOUND)
 add_subdirectory( kfile )
 add_subdirectory( kconf_update )
-if(NOT WINCE)
+if(NOT WINCE AND NOT OPENEMBEDDED)
 add_subdirectory( kdoctools  )
-endif(NOT WINCE)
+endif(NOT WINCE AND NOT OPENEMBEDDED)
 add_subdirectory( kioslave   )
 add_subdirectory( knewstuff  )
 add_subdirectory( kparts     )
--
1.7.5.4

Add slightly changed patch to enable strigi for kdelibs4 but keep the old patch for kdelibs4-native

Signed-off-by: Samuel Stirtzel <5e7b27e76d616174d4c71d96463fdd2f7e57e559@googlemail.com>


diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f831fba..a59b5b0 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4114,6 +4114,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {

   if (rfhi->IsWaitingForBeforeUnloadACK() ||
       rfhi->IsWaitingForUnloadACK()) {
+#if 0
     // Hang occurred while firing the beforeunload/unload handler.
     // Pretend the handler fired so tab closing continues as if it had.
     rvhi->set_sudden_termination_allowed(true);
@@ -4133,6 +4134,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {
     }
     if (close)
       Close(rvhi);
+#endif
     return;
   }

Add patch to disable renderer hang monitor when page is unloading.

We're doing some GUI work like asking for confirmation in the
beforeunload handler, so it's very likely that the renderer may seem
unresponsive. The default behavior of chromium is to close page, which
is of course not the thing we want.


From b241077ba9afb80d72d93fb1437ba25bb011af99 Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Sun, 12 Jun 2011 18:29:47 -0400
Subject: [PATCH] Allow mingw-w64 commctrl header.

---
 tk8.5.9/win/tkWinX.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tk8.5.9/win/tkWinX.c b/tk8.5.9/win/tkWinX.c
index d99f1ec..ae31ee9 100644
--- a/tk8.5.9/win/tkWinX.c
+++ b/tk8.5.9/win/tkWinX.c
@@ -30,7 +30,7 @@
  */

 #ifndef _WIN32_IE
-#define _WIN32_IE 0x0300
+#define _WIN32_IE 0x0700
 #endif

 #include <commctrl.h>
--
1.7.4.msysgit.0

Add patch to allow mingw-w64 to build Tk.

The commctrl.h header from the 32bit mingw-w64 toolkit errors out
if the _WIN32_IE macro is below 0x0500. This patch to the Tk source
fixes the problem by setting the macro to the value corresponding
to IE7.


Add workaround for glibc compile problem

Link error: undefined reference to `fstatat64'
Appears due to the combination of "-Os" compiler option and inlining
some system calls.
http://sourceware.org/bugzilla/show_bug.cgi?id=5203

Patch is not applied by default, modify the bb recipe if you need it


diff --git a/DEPS b/DEPS
index 6205f1b6d..5c1cbf3bc 100644
--- a/DEPS
+++ b/DEPS
@@ -72,7 +72,7 @@ vars = {
   'dart_mustache_tag': '5e81b12215566dbe2473b2afd01a8a8aedd56ad9',
   'dart_oauth2_tag': '1.2.1',
   'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc',
-  'dart_package_config_tag': '1.0.5',
+  'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576',
   'dart_package_resolver_tag': '1.0.10',
   'dart_path_tag': '1.6.2',
   'dart_pedantic_tag': 'v1.8.0',

Apply flutter-engine patch to dump dart_package_config_tag version

Change-Id: Ie877cb35e9784804a4d7a39ef7bc95a6bb7bcf06
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/113823
Reviewed-by: Johnni Winther <0f64ef784d57ffb064b634040f9eeba0d33d0be4@google.com>
Reviewed-by: Martin Kustermann <a35dd5b79fac84b2bb3b026a16b8becc55af5961@google.com>
Commit-Queue: Jens Johansen <05223a3c6bdf76af6f84755eae231abeebcf4530@google.com>


From 45cd32b2caf6c3a092a5425b7c7d563f44127fa9 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
 setup

Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml.

diff --git a/log4j/src/main/resources/log4j2-bungee.xml b/log4j/src/main/resources/log4j2-bungee.xml
new file mode 100644
index 00000000..38befc0a
--- /dev/null
+++ b/log4j/src/main/resources/log4j2-bungee.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Log4j configuration that replicates the old BungeeCord logging setup -->
+<Configuration status="warn">
+    <Appenders>
+        <TerminalConsole name="TerminalConsole">
+            <PatternLayout>
+                <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level]: [%logger] %minecraftFormatting{%msg}%n%xEx}">
+                    <!-- Log root and BungeeCord loggers without prefix -->
+                    <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level]: %minecraftFormatting{%msg}%n%xEx}" />
+                </LoggerNamePatternSelector>
+            </PatternLayout>
+        </TerminalConsole>
+        <RollingRandomAccessFile name="File" fileName="proxy.log.0" filePattern="proxy.log.%i" immediateFlush="false">
+            <PatternLayout>
+                <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
+                    <!-- Log root and BungeeCord loggers without prefix -->
+                    <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level]: %minecraftFormatting{%msg}{strip}%n" />
+                </LoggerNamePatternSelector>
+            </PatternLayout>
+            <Policies>
+                <OnStartupTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="8 MB" />
+            </Policies>
+            <DefaultRolloverStrategy fileIndex="min" max="8" />
+        </RollingRandomAccessFile>
+    </Appenders>
+
+    <Loggers>
+        <AsyncRoot level="info">
+            <AppenderRef ref="TerminalConsole" />
+            <AppenderRef ref="File" />
+        </AsyncRoot>
+    </Loggers>
+</Configuration>
--
2.14.1


--- ../src-base/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
+++ ../src-work/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
@@ -58,7 +58,7 @@

     protected void func_110594_c(String p_110594_1_)
     {
-        field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: %s in %s", new Object[] {p_110594_1_, this.field_110597_b});
+        field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] {p_110594_1_, this.field_110597_b});
     }

     public IMetadataSection func_135058_a(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException

Fix broken log message in vanilla.

Fix broken log message in vanilla.


diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 6850cd460b1d..6d652cca59b4 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -102,17 +102,16 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
   objects_[Clipboard::CBF_SMBITMAP] = parameters;
 }

-void ScopedClipboardWriter::WritePickledData(
-    const base::Pickle& pickle,
-    const Clipboard::FormatType& format) {
+void ScopedClipboardWriter::WriteData(const char* data,
+                                      int size,
+                                      const Clipboard::FormatType& format) {
   std::string format_string = format.Serialize();
   Clipboard::ObjectMapParam format_parameter(format_string.begin(),
                                              format_string.end());
   Clipboard::ObjectMapParam data_parameter;

-  data_parameter.resize(pickle.size());
-  memcpy(const_cast<char*>(&data_parameter.front()),
-         pickle.data(), pickle.size());
+  data_parameter.resize(size);
+  memcpy(const_cast<char*>(&data_parameter.front()), data, size);

   Clipboard::ObjectMapParams parameters;
   parameters.push_back(format_parameter);
@@ -120,6 +119,13 @@ void ScopedClipboardWriter::WritePickledData(
   objects_[Clipboard::CBF_DATA] = parameters;
 }

+void ScopedClipboardWriter::WritePickledData(
+    const base::Pickle& pickle,
+    const Clipboard::FormatType& format) {
+  WriteData(reinterpret_cast<const char*>(pickle.data()), pickle.size(),
+            format);
+}
+
 void ScopedClipboardWriter::Reset() {
   url_text_.clear();
   objects_.clear();
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index a7e064561ca9..d5a1b76bc6a7 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -61,6 +61,11 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
   // Used by WebKit to determine whether WebKit wrote the clipboard last
   void WriteWebSmartPaste();

+  // Adds arbitrary data to clipboard.
+  void WriteData(const char* data,
+                 int size,
+                 const Clipboard::FormatType& format);
+
   // Adds arbitrary pickled data to clipboard.
   void WritePickledData(const base::Pickle& pickle,
                         const Clipboard::FormatType& format);

Add patch to expose ScopedClipboardWriter::WriteData

This is required to implement `clipboard.writeBuffer()` in Electron.

This patch has also been upstreamed:
https://codereview.chromium.org/2777723002


From f38aa8fc5ed649da242aea3d7b09e4f6878d05df Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mseaborn@chromium.org>
Date: Tue, 24 Aug 2010 15:39:50 +0100
Subject: [PATCH] [gcc] Remove old "nc" cases from libstdc++'s configure script

These cases are not used, and were apparently added by changing the
generated file rather than editing the source, configure.ac.
Re-running autoconf 2.59 undoes them.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=660

Review URL: http://codereview.chromium.org/3186025
---
 gcc/libstdc++-v3/configure |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/libstdc++-v3/configure b/gcc/libstdc++-v3/configure
index 454b721..20803a6 100755
--- a/gcc/libstdc++-v3/configure
+++ b/gcc/libstdc++-v3/configure
@@ -4989,7 +4989,7 @@ freebsd* | dragonfly*)
   fi
   ;;

-gnu* | nc)
+gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;

@@ -5027,7 +5027,7 @@ irix5* | irix6* | nonstopux*)
   ;;

 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | nc)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;

@@ -15124,7 +15124,7 @@ fi;
   # Default to "generic".
   if test $enable_clocale_flag = auto; then
     case ${target_os} in
-      linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu | nc)
+      linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
         enable_clocale_flag=gnu
         ;;
       darwin* | freebsd*)
@@ -15870,7 +15870,7 @@ fi;
   # Default to "new".
   if test $enable_libstdcxx_allocator_flag = auto; then
     case ${target_os} in
-      linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu | nc)
+      linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
         enable_libstdcxx_allocator_flag=new
         ;;
       *)
--
1.6.0.4

[gcc] Remove old "nc" cases from libstdc++'s configure script

These cases are not used, and were apparently added by changing the
generated file rather than editing the source, configure.ac.
Re-running autoconf 2.59 undoes them.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=660

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

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


diff --git a/node_modules/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js b/node_modules/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js
index 5dc03df..e526092 100644
--- a/node_modules/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js
+++ b/node_modules/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -338,7 +338,7 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
 }

 const getBackgroundProp =
-  Platform.OS === 'android'
+  Platform.OS === 'android' && Platform.Version >= 21
     ? (background, useForeground) =>
         useForeground && TouchableNativeFeedback.canUseNativeForeground()
           ? {nativeForegroundAndroid: background}

[native] Patch TouchableNativeFeedback for Android 4

Summary:
I noticed that Android 4 was crashing on startup after the RN0.63 upgrade. Turns out it's [this issue](https://github.com/facebook/react-native/issues/29983).

Android 4 support is going away in React Native 0.64, but for now it's still supported. I figure we might as well keep it working until we have to upgrade.

Test Plan: Make sure Android 4 doesn't crash on startup anymore

Reviewers: palys-swm

Reviewed By: palys-swm

Subscribers: KatPo, zrebcu411, Adrian

Differential Revision: https://phabricator.ashoat.com/D332


diff --git a/boards/nordic/nrf52840_dongle/layout.ld b/boards/nordic/nrf52840_dongle/layout.ld
index 657b0d26..f86b2321 100644
--- a/boards/nordic/nrf52840_dongle/layout.ld
+++ b/boards/nordic/nrf52840_dongle/layout.ld
@@ -1,6 +1,6 @@
 MEMORY
 {
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 128K
+  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 192K
   prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
   ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
 }
diff --git a/boards/nordic/nrf52840dk/layout.ld b/boards/nordic/nrf52840dk/layout.ld
index 657b0d26..f86b2321 100644
--- a/boards/nordic/nrf52840dk/layout.ld
+++ b/boards/nordic/nrf52840dk/layout.ld
@@ -1,6 +1,6 @@
 MEMORY
 {
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 128K
+  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 192K
   prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
   ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
 }

Increase ROM size in layout.ld so that boards build on long build directories.


--- ../src-base/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
+++ ../src-work/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
@@ -2,20 +2,21 @@

 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
-import gnu.trove.map.hash.TIntIntHashMap;
 import java.util.ArrayList;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;

 public class ObjectIntIdentityMap implements IObjectIntIterable
 {
-    protected TIntIntHashMap field_148749_a = new TIntIntHashMap(256, 0.5F, -1, -1);
+    protected Map<Object, Integer> field_148749_a = new IdentityHashMap<Object, Integer>(512);
     protected List field_148748_b = new ArrayList();
     private static final String __OBFID = "CL_00001203";

     public void func_148746_a(Object p_148746_1_, int p_148746_2_)
     {
-        this.field_148749_a.put(System.identityHashCode(p_148746_1_), p_148746_2_);
+        this.field_148749_a.put(p_148746_1_, p_148746_2_);

         while (this.field_148748_b.size() <= p_148746_2_)
         {
@@ -27,7 +28,8 @@

     public int func_148747_b(Object p_148747_1_)
     {
-        return this.field_148749_a.get(System.identityHashCode(p_148747_1_));
+        Integer ret = this.field_148749_a.get(p_148747_1_);
+        return ret != null ? ret : -1;
     }

     public Object func_148745_a(int p_148745_1_)

Fix ObjectIntIdentityMap sporadically matching non-identical objects.


--- OpenIGTLink/Source/CMakeLists.txt.original	2017-06-28 12:28:12.000000000 +0200
+++ OpenIGTLink/Source/CMakeLists.txt	2019-03-31 04:04:46.392945177 +0200
@@ -71,12 +71,11 @@
   igtlTransformMessage.cxx
   )

-SET(OpenIGTLink_INCLUDE_FILES)
-IF( MSVC OR ${CMAKE_GENERATOR} MATCHES "Xcode" )
-  LIST(APPEND OpenIGTLink_INCLUDE_FILES
+SET(OpenIGTLink_INCLUDE_FILES
     igtlutil/igtl_header.h
     igtlutil/igtl_image.h
     igtlutil/igtl_position.h
+    igtlutil/igtl_status.h
     igtlutil/igtl_transform.h
     igtlutil/igtl_types.h
     igtlutil/igtl_util.h
@@ -117,7 +116,6 @@
     igtlWindows.h
     igtlCommon.h
   )
-ENDIF()

 # Add support for OpenIGTLink version 2
 IF (${OpenIGTLink_PROTOCOL_VERSION} GREATER "1" )
@@ -150,7 +148,7 @@
     igtlBindMessage.cxx
     igtlNDArrayMessage.cxx
     )
-  IF( MSVC OR ${CMAKE_GENERATOR} MATCHES "Xcode" )
+
     LIST(APPEND OpenIGTLink_INCLUDE_FILES
       igtlutil/igtl_colortable.h
       igtlutil/igtl_imgmeta.h
@@ -180,7 +178,6 @@
       igtlBindMessage.h
       igtlNDArrayMessage.h
       )
-  ENDIF()
 ENDIF()

 # Add support for OpenIGTLink version 3
@@ -191,14 +188,13 @@
     igtlutil/igtl_command.c
     igtlutil/igtl_query.c
     )
-  IF( MSVC OR ${CMAKE_GENERATOR} MATCHES "Xcode" )
+
     LIST(APPEND OpenIGTLink_INCLUDE_FILES
       igtlCommandMessage.h
       igtlQueryMessage.h
       igtlutil/igtl_command.h
       igtlutil/igtl_query.h
       )
-  ENDIF()
 ENDIF()

 ADD_LIBRARY(OpenIGTLink ${OpenIGTLink_SOURCES} ${OpenIGTLink_INCLUDE_FILES})
@@ -227,4 +223,4 @@
 INSTALL(TARGETS OpenIGTLink EXPORT OpenIGTLink
   RUNTIME DESTINATION ${OpenIGTLink_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
   LIBRARY DESTINATION ${OpenIGTLink_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-  ARCHIVE DESTINATION ${OpenIGTLink_INSTALL_LIB_DIR} COMPONENT Development)
\ No newline at end of file
+  ARCHIVE DESTINATION ${OpenIGTLink_INSTALL_LIB_DIR} COMPONENT Development)

Add patch for OpenIGTLink v3.0

Add patch for OpenIGTLink v3.0


diff --git a/gin/BUILD.gn b/gin/BUILD.gn
index 72d0125..bdf9ff9 100644
--- a/gin/BUILD.gn
+++ b/gin/BUILD.gn
@@ -86,11 +86,6 @@ component("gin") {
     "//base/third_party/dynamic_annotations",
     "//crypto",
   ]
-  if (v8_use_external_startup_data && is_win) {
-    public_deps += [ ":gin_v8_snapshot_fingerprint" ]
-    sources += [ "$target_gen_dir/v8_snapshot_fingerprint.cc" ]
-    defines += [ "V8_VERIFY_EXTERNAL_STARTUP_DATA" ]
-  }

   if (is_mac) {
     libs = [ "CoreFoundation.framework" ]

Add patch to disable snapshot verification on Windows


Set hostname and FQDN in /etc/hosts from DHCP.

Some software do not rely on nsswitch to retrieve local hostname.

--- /lib/dhcpcd/dhcpcd-hooks/30-hostname	2014-10-17 11:29:02.000000000 +0200
+++ /lib/dhcpcd/dhcpcd-hooks/30-hostname	2014-10-17 11:29:32.000000000 +0200
@@ -49,6 +49,10 @@
 		# with an error to stdout
 		hostname "$1"
 	fi
+
+	# Set hostname in configuration file
+	sed "s/\(hostname=\)\".*\"/\1\"$1\"/" -i /etc/conf.d/hostname
+	sed "/127.0.0.1[ \t]\+localhost/ s/\(localhost\).*/\1 $1/" -i /etc/hosts
 }

 need_hostname()

Add customized dhcpcd hook for /etc/hosts


This patch causes Tor to ignore bridge reachability failures. This is
helpful when the bridge is only intermittently available, as when
connecting through a flash proxy.

diff --git src/or/circuitbuild.c src/or/circuitbuild.c
index ac0df91..1794634 100644
--- src/or/circuitbuild.c
+++ src/or/circuitbuild.c
@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded,
   int idx = -1;
   char buf[HEX_DIGEST_LEN+1];

+  /* Ignore bridge reachability problems. */
+  if (! succeeded)
+    return 0;
+
   if (! entry_guards)
     return 0;

Add Tor patch to ignore bridge reachability failures.


From 0f2752ad4d7ea65c80d76493899aca67e90be524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>
Date: Mon, 5 Apr 2021 16:51:59 +0000
Subject: [PATCH] Don't attempt to build tests, documentation and Python
 bindings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
 Makefile.am | 2 +-
 Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2ab67ed..c7fafeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4

 EXTRA_DIST = MAINT

-SUBDIRS = src magic tests doc python
+SUBDIRS = src magic

 # This variable must have 'exec' in its name, in order to be installed
 # by 'install-exec' target (instead of default 'install-data')
diff --git a/Makefile.in b/Makefile.in
index e19b15e..dcb5ce6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,7 +358,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = MAINT
-SUBDIRS = src magic tests doc python
+SUBDIRS = src magic

 # This variable must have 'exec' in its name, in order to be installed
 # by 'install-exec' target (instead of default 'install-data')
--
2.31.0

Add patch against libmagic that removes unnecessary build targets

Signed-off-by: Krzysztof Wilczyński <5f1c0be89013f8fde969a8dcb2fa1d522e94ee00@linux.com>


diff -ruN sogo.orig/Makefile sogo/Makefile
--- sogo.orig/Makefile	2016-03-10 11:28:55.935778517 +0800
+++ sogo/Makefile	2016-03-10 11:29:12.168773815 +0800
@@ -3,6 +3,7 @@

 PORTNAME=		sogo
 PORTVERSION=		2.3.8
+PORTREVISION=		1
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
@@ -42,6 +43,7 @@
 post-patch:
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
+	@${REINPLACE_CMD} -e 's|/usr/lib/GNUstep|${GNUSTEP_LOCAL_ROOT}/Library|' ${WRKSRC}/Apache/SOGo.conf

 post-patch-ACTIVESYNC-on:
 	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile

Fix paths in Apache conf file to suit FreeBSD.


From b31a2ce9ab6d3f5cf744c8234fd145ae5c14a786 Mon Sep 17 00:00:00 2001
From: Mark Reid <mreid@mozilla.com>
Date: Wed, 4 Feb 2015 17:10:10 -0400
Subject: [PATCH] Update build to include heka-s3list and heka-s3cat

---
 CMakeLists.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5cdd21..705d223 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,8 @@ set(INJECT_EXE "${PROJECT_PATH}/bin/heka-inject${CMAKE_EXECUTABLE_SUFFIX}")
 set(LOGSTREAMER_EXE "${PROJECT_PATH}/bin/heka-logstreamer${CMAKE_EXECUTABLE_SUFFIX}")
 set(HEKA_CAT_EXE "${PROJECT_PATH}/bin/heka-cat${CMAKE_EXECUTABLE_SUFFIX}")
 set(HEKA_EXPORT_EXE "${PROJECT_PATH}/bin/heka-export${CMAKE_EXECUTABLE_SUFFIX}")
+set(HEKA_S3LIST_EXE "${PROJECT_PATH}/bin/heka-s3list${CMAKE_EXECUTABLE_SUFFIX}")
+set(HEKA_S3CAT_EXE "${PROJECT_PATH}/bin/heka-s3cat${CMAKE_EXECUTABLE_SUFFIX}")

 option(INCLUDE_SANDBOX "Include Lua sandbox" on)
 option(INCLUDE_MOZSVC "Include the Mozilla services plugins" on)
@@ -225,6 +227,20 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

 install(PROGRAMS "${HEKA_EXPORT_EXE}" DESTINATION bin)

+add_custom_target(heka-s3list ALL
+${GO_EXECUTABLE} install ${LDFLAGS} github.com/mozilla-services/heka/cmd/heka-s3list
+DEPENDS hekad
+WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+install(PROGRAMS "${HEKA_S3LIST_EXE}" DESTINATION bin)
+
+add_custom_target(heka-s3cat ALL
+${GO_EXECUTABLE} install ${LDFLAGS} github.com/mozilla-services/heka/cmd/heka-s3cat
+DEPENDS hekad
+WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+install(PROGRAMS "${HEKA_S3CAT_EXE}" DESTINATION bin)
+
 add_custom_target(sbmgr ALL
 ${GO_EXECUTABLE} install ${LDFLAGS} github.com/mozilla-services/heka/cmd/heka-sbmgr
 DEPENDS hekad)
--
1.9.4 (Apple Git-50.2)

Add a new patch to build heka-s3{cat|list}


Index: cef3/libcef/browser/browser_host_impl.h
===================================================================
--- cef3/libcef/browser/browser_host_impl.h	(revision 769)
+++ cef3/libcef/browser/browser_host_impl.h	(working copy)
@@ -240,6 +240,11 @@
       content::WebContents* web_contents,
       const content::MediaStreamRequest* request,
       const content::MediaResponseCallback& callback) OVERRIDE;
+  virtual bool AddMessageToConsole(content::WebContents* source,
+                                   int32 level,
+                                   const string16& message,
+                                   int32 line_no,
+                                   const string16& source_id) OVERRIDE;

   // content::WebContentsObserver methods.
   virtual void RenderViewCreated(
Index: cef3/libcef/browser/browser_host_impl.cc
===================================================================
--- cef3/libcef/browser/browser_host_impl.cc	(revision 769)
+++ cef3/libcef/browser/browser_host_impl.cc	(working copy)
@@ -1125,7 +1125,22 @@
   callback.Run(devices);
 }

+bool CefBrowserHostImpl::AddMessageToConsole(
+    content::WebContents* source,
+    int32 level,
+    const string16& message,
+    int32 line_no,
+    const string16& source_id) {
+  if (client_.get()) {
+    CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
+    if (handler.get()) {
+      return handler->OnConsoleMessage(this, message, source_id, line_no);
+    }
+  }
+  return false;
+};

+
 // content::WebContentsObserver methods.
 // -----------------------------------------------------------------------------

Add a patch to cef3 that makes sensing console messages work.


diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 82b1363..ac06294 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -305,6 +305,7 @@ class NET_EXPORT URLRequestJob
   void OnCallToDelegate();
   void OnCallToDelegateComplete();

+ public:
   // Called to read raw (pre-filtered) data from this Job.
   // If returning true, data was read from the job.  buf will contain
   // the data, and bytes_read will receive the number of bytes read.

Add patch to expose necessary members of URLRequestJob.


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