diff -urN moab-5.2.1.orig/CMakeLists.txt moab-5.2.1/CMakeLists.txt
--- moab-5.2.1.orig/CMakeLists.txt	2020-08-23 04:59:23.000000000 +0200
+++ moab-5.2.1/CMakeLists.txt	2021-02-03 15:57:13.020620400 +0100
@@ -391,7 +391,7 @@
 add_subdirectory( src )
 message(STATUS "Adding itaps subdirectory.")
 add_subdirectory( itaps )
-if (NOT WIN32) # Need further work to prepare for windows
+if (NOT WIN32 OR MSYS OR MINGW) # Need further work to prepare for windows
   add_subdirectory( tools )
 endif ()
 if (ENABLE_PYMOAB)

Repair build tools for msys / mingw

Repair build tools for msys / mingw


--- /tmp/base-files/files/lib/network/config.sh	2011-06-30 10:07:56.649293323 -0400
+++ base-files/files/lib/network/config.sh	2011-06-30 10:25:14.993652898 -0400
@@ -362,6 +362,8 @@

 			[ -z "$ipaddr" ] || \
 				$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
+			[ -n "$hostname" ] || hostname=$(uci -q get system.@system[0].hostname)
+			[ "$hostname" = "none" ] && hostname=""

 			# additional request options
 			local opt dhcpopts

--- /tmp/base-files-network/files/lib/network/config.sh	2011-10-22 13:43:38.138311346 -0400
+++ base-files-network/files/lib/network/config.sh	2011-10-22 13:53:51.322778137 -0400
@@ -378,6 +378,8 @@

 			[ -z "$ipaddr" ] || \
 				$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
+			[ -n "$hostname" ] || hostname=$(uci -q get system.@system[0].hostname)
+			[ "$hostname" = "none" ] && hostname=""

 			# additional request options
 			local opt dhcpopts

Update hostname patch for r28522

[wrt] Update hostname patch for r28522


--- a/run.py
+++ b/run.py
@@ -476,7 +476,7 @@ def getScidbVersion (scidbEnv):
     curr_dir=os.getcwd()

     cmdList=[bin_path,
-             "usage", "|&", "grep", "\"SciDB version:\""]
+             "usage", "2>&1", "|", "grep", "\"SciDB version:\""]
     ret,out,err = executeIt(cmdList,
                             useShell=True,
                             collectOutput=True,

Add back patch for pipe in run.py

Add back patch for pipe in run.py


diff -urN libmad-0.15.1b/configure.ac libmad-0.15.1b-haiku/configure.ac
--- libmad-0.15.1b/configure.ac	2004-01-23 09:41:32.061341696 +0000
+++ libmad-0.15.1b-haiku/configure.ac	2010-09-16 12:16:45.656146432 +0000
@@ -140,8 +140,6 @@
     case "$optimize" in
 	-O|"-O "*)
 	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
-	    optimize="$optimize -fforce-addr"
 	    : #x optimize="$optimize -finline-functions"
 	    : #- optimize="$optimize -fstrength-reduce"
 	    optimize="$optimize -fthread-jumps"

Patch to allow libmad to build with gcc4.


diff --git chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
index 91674b9..8a4c391 100644
--- chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
+++ chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
@@ -116,7 +116,7 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
     return;

   // The menu item can still be activated by hotkeys even if it is disabled.
-  if (menu_model_->IsEnabledAt(id))
+  if (model->IsEnabledAt(id))
     ExecuteCommand(model, id);
 }

diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
index 91674b9..8a4c391 100644
--- a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
+++ b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
@@ -116,7 +116,7 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
     return;

   // The menu item can still be activated by hotkeys even if it is disabled.
-  if (menu_model_->IsEnabledAt(id))
+  if (model->IsEnabledAt(id))
     ExecuteCommand(model, id);
 }

Add missing a/b patch prefix

Add missing a/b patch prefix


Index: twisted/web2/dav/xattrprops.py
===================================================================
--- twisted/web2/dav/xattrprops.py	(revision 26899)
+++ twisted/web2/dav/xattrprops.py	(working copy)
@@ -123,6 +123,10 @@
         """
         try:
             data = self.attrs.get(self._encode(qname))
+        except KeyError:
+            raise HTTPError(StatusResponse(
+                    responsecode.NOT_FOUND,
+                    "No such property: {%s}%s" % qname))
         except IOError, e:
             if e.errno in _ATTR_MISSING:
                 raise HTTPError(StatusResponse(
@@ -198,6 +202,8 @@
         try:
             try:
                 self.attrs.remove(key)
+            except KeyError:
+                pass
             except IOError, e:
                 if e.errno not in _ATTR_MISSING:
                     raise
@@ -221,6 +227,8 @@
         key = self._encode(qname)
         try:
             self.attrs.get(key)
+        except KeyError:
+            return False
         except IOError, e:
             if e.errno in _ATTR_MISSING or e.errno == errno.ENOENT:
                 return False

Handle KeyError for missing xattr names.

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


diff --git a/node_modules/@react-native-community/cameraroll/ios/.RNCCameraRollManager.m.swp b/node_modules/@react-native-community/cameraroll/ios/.RNCCameraRollManager.m.swp
new file mode 100644
index 0000000..5f05a91
Binary files /dev/null and b/node_modules/@react-native-community/cameraroll/ios/.RNCCameraRollManager.m.swp differ
diff --git a/node_modules/@react-native-community/cameraroll/ios/RNCCameraRollManager.m b/node_modules/@react-native-community/cameraroll/ios/RNCCameraRollManager.m
index 566d8fc..862aa42 100644
--- a/node_modules/@react-native-community/cameraroll/ios/RNCCameraRollManager.m
+++ b/node_modules/@react-native-community/cameraroll/ios/RNCCameraRollManager.m
@@ -236,7 +236,7 @@ static void RCTResolvePromise(RCTPromiseResolveBlock resolve,

   // Predicate for fetching assets within a collection
   PHFetchOptions *const assetFetchOptions = [RCTConvert PHFetchOptionsFromMediaType:mediaType];
-  assetFetchOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:NO]];
+  assetFetchOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"modificationDate" ascending:NO]];

   BOOL __block foundAfter = NO;
   BOOL __block hasNextPage = NO;

[native] Order CameraRoll results on iOS by modification date


diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
index ebdfca0..bcbcb4a 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -1460,6 +1460,24 @@
       "features": [
         "webgl2"
       ]
+    },
+    {
+      "id": 150,
+      "description": "Macs with NVidia GPUs experience rendering issues on High Sierra",
+      "cr_bugs": [773705],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": ">=",
+          "value": "10.13"
+        }
+      },
+      "vendor_id": "0x10de",
+      "multi_gpu_category": "any",
+      "features": [
+        "accelerated_2d_canvas",
+        "gpu_rasterization"
+      ]
     }
   ],
   "comment": [

Add patch for nvidia GPU's on High Sierra


diff -Naur sharutils-4.6.3-original/configure.ac sharutils-4.6.3/configure.ac
--- sharutils-4.6.3-original/configure.ac	2009-04-07 00:40:07.000000000 -0400
+++ sharutils-4.6.3/configure.ac	2009-04-07 00:41:01.000000000 -0400
@@ -9,6 +9,7 @@
 AC_INIT([sharutils], sharutils_version, sharutils_eaddr)
 AC_CONFIG_SRCDIR([src/shar.c])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])

 AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2])
 AC_SUBST(DIST_ALPHA)
@@ -20,7 +21,7 @@
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+LT_INIT

 dnl FIXME: Check that it is GNU diff indeed.
 # Carefully avoid gdiff for X as found on SGI systems.

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


Index: tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	(版本 179269)
+++ tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	(工作副本)
@@ -5736,6 +5736,8 @@
 def warn_null_arg : Warning<
   "null passed to a callee which requires a non-null argument">,
   InGroup<NonNull>;
+def warn_null_ptr_deref: Warning<
+  "you are about to dereference null ptr, which probably will lead to seg violation. Do you want to proceed?[y/n]">;

 // CHECK: returning address/reference of stack memory
 def warn_ret_stack_addr : Warning<

Add the new diagnostic as a patch.

Add the new diagnostic as a patch.


Patch to compile with uclibcxx instead of libstdc++


From d77b4b1d3525b6b643d9b7b08aed120d1cf77266 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 24 Mar 2017 16:29:16 +0800
Subject: [PATCH] jmemmgr.c: Include stdint.h on Visual Studio 2010 or later

Visual Studio 2008 does not come with stdint.h, so just include it on
non-Visual Studio or when we are building on 2010 or later.
---
 jmemmgr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jmemmgr.c b/jmemmgr.c
index adccbdf..6415f77 100644
--- a/jmemmgr.c
+++ b/jmemmgr.c
@@ -32,7 +32,9 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jmemsys.h"            /* import the system-dependent declarations */
-#include <stdint.h>
+#if !defined (_MSC_VER) || (_MSC_VER >= 1600)
+# include <stdint.h>
+#endif

 #ifndef NO_GETENV
 #ifndef HAVE_STDLIB_H           /* <stdlib.h> should declare getenv() */
--
2.10.2.windows.1

libjpeg-turbo: Fix jmemmgr.c build on Visual Studio 2008

This ensures that we don't try to include stdint.h on Visual Studio
2008, which does not come with this header.  The test programs continue
to pass on 2008 builds.


--- modules/fork-module.c.orig	2010-12-13 07:18:53.000000000 +0000
+++ modules/fork-module.c	2011-01-26 10:40:11.000000000 +0000
@@ -35,6 +35,10 @@
 #include <string.h>
 #include <slang.h>

+#ifndef WCONTINUED
+#define WCONTINUED 8
+#endif
+
 SLANG_MODULE(fork);

 static int fork_intrinsic (void)

Patch WCONTINUED in slang for old toolchains


diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.5/subversion/libsvn_subr/config_impl.h	2009-01-27 13:23:50.000000000 +0000
+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h	2009-09-02 13:43:03.000000000 +0000
@@ -109,6 +109,9 @@
    or svn_config_get_user_config_path() instead. */
 #ifdef WIN32
 #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
+#elif defined __HAIKU__ /* HAIKU */
+#  define SVN_CONFIG__SYS_DIRECTORY   "/boot/common/etc/subversion"
+#  define SVN_CONFIG__USR_DIRECTORY   "/boot/home/config/settings/subversion"
 #else  /* ! WIN32 */
 #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
 #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"

Patch for subversion-1.6.5 to change the default location of the config-dir on Haiku from ~/.subversion to /boot/home/config/settings/subversion


diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk
--- comm-miramar/config/rules.mk	2011-06-24 22:13:31.000000000 +0200
+++ comm-miramar/config/rules.mk	2011-08-15 12:27:07.305556040 +0200
@@ -851,9 +851,13 @@

 ifndef _LIBNAME_RELATIVE_PATHS

-LIBS_DEPS += $(filter -l%, $(LIBS))
-HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
-DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS))))
+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS))))
+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS))))
+
+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS)))
+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS)))
+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS)))

 _LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
 ifneq (,$(_LIBDIRS))
Seulement dans comm-miramar.after/config: rules.mk~

Fix Thunderbird 5.0: Add missing patch of the build system.

svn path=/nixpkgs/trunk/; revision=28713


diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 674b0e9a909c..a1bff6e40f56 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -886,9 +886,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
 }

 void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
-  DCHECK(clipboard_owner_->hwnd() != NULL);
+  // DCHECK(clipboard_owner_->hwnd() != NULL);
   if (handle && !::SetClipboardData(format, handle)) {
-    DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
+    // DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
     FreeData(format, handle);
   }
 }

Add patch to remove DCHECK in clipboard_win.cc

We are using ui::Clipboard in renderer process, which causes DCHECK
errors.


diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 4a11081..556d4b0 100644
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=fstools
-PKG_VERSION:=2016-04-30
+PKG_VERSION:=2016-05-12

 PKG_RELEASE=$(PKG_SOURCE_VERSION)

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(OPENWRT_GIT)/project/fstools.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=bb92c29fc4cd90d396fc79078eba75fcb01c92ae
+PKG_SOURCE_VERSION:=ed224f0b1f9cfb3f8c5766cba3a60343c0eda586
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1

Add patch for openwrt to fix mount_root

Add patch for openwrt to fix mount_root


diff --git a/node_modules/@oclif/parser/lib/errors.js b/node_modules/@oclif/parser/lib/errors.js
index 93912ca..c4cac1d 100644
--- a/node_modules/@oclif/parser/lib/errors.js
+++ b/node_modules/@oclif/parser/lib/errors.js
@@ -10,7 +10,8 @@ const m = deps_1.default()
     .add('list', () => require('./list'));
 class CLIParseError extends errors_1.CLIError {
     constructor(options) {
-        options.message += '\nSee more help with --help';
+        const help = options.command ? `\`${options.command} --help\`` : '--help';
+        options.message += `\nSee more help with ${help}`;
         super(options.message);
         this.parse = options.parse;
     }
@@ -31,22 +32,24 @@ class InvalidArgsSpecError extends CLIParseError {
 exports.InvalidArgsSpecError = InvalidArgsSpecError;
 class RequiredArgsError extends CLIParseError {
     constructor({ args, parse }) {
-        let message = `Missing ${args.length} required arg${args.length === 1 ? '' : 's'}`;
+        const command = 'balena ' + parse.input.context.id.replace(/:/g, ' ');
+        let message = `Missing ${args.length} required argument${args.length === 1 ? '' : 's'}`;
         const namedArgs = args.filter(a => a.name);
         if (namedArgs.length) {
             const list = m.list.renderList(namedArgs.map(a => [a.name, a.description]));
             message += `:\n${list}`;
         }
-        super({ parse, message });
+        super({ parse, message, command });
         this.args = args;
     }
 }
 exports.RequiredArgsError = RequiredArgsError;
 class RequiredFlagError extends CLIParseError {
     constructor({ flag, parse }) {
+        const command = 'balena ' + parse.input.context.id.replace(/:/g, ' ');
         const usage = m.list.renderList(m.help.flagUsages([flag], { displayRequired: false }));
         const message = `Missing required flag:\n${usage}`;
-        super({ parse, message });
+        super({ parse, message, command });
         this.flag = flag;
     }
 }
diff --git a/node_modules/@oclif/parser/lib/list.js b/node_modules/@oclif/parser/lib/list.js
index 3907cc0..b689ca1 100644
--- a/node_modules/@oclif/parser/lib/list.js
+++ b/node_modules/@oclif/parser/lib/list.js
@@ -21,7 +21,7 @@ function renderList(items) {
         }
         left = left.padEnd(maxLength);
         right = linewrap(maxLength + 2, right);
-        return `${left}  ${right}`;
+        return `${left} : ${right}`;
     });
     return lines.join('\n');
 }

Improve oclif missing argument/flag errors

Change-type: patch
Resolves: #1776
Signed-off-by: Scott Lowe <625600233cb3bcab32268c17610882e0fdaed295@balena.io>


From 729f8b83b1002ae272e75a6139631846946f728f Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 10 Sep 2009 15:19:13 +0200
Subject: [PATCH] Add more info when SD connection refused

as mentioned in bug #1371
---
 bacula/src/stored/dircmd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index 4f4a2d7..b011802 100644
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -152,7 +152,7 @@ void *handle_connection_request(void *arg)
    char tbuf[100];

    if (bs->recv() <= 0) {
-      Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
+      Emsg1(M_ERROR, 0, _("Connection request from %s failed.\n"), bs->who());
       bs->close();
       return NULL;
    }
@@ -162,7 +162,7 @@ void *handle_connection_request(void *arg)
     */
    if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)) {
       Dmsg1(000, "<filed: %s", bs->msg);
-      Emsg1(M_ERROR, 0, _("Invalid connection. Len=%d\n"), bs->msglen);
+      Emsg2(M_ERROR, 0, _("Invalid connection from %s. Len=%d\n"), bs->who(), bs->msglen);
       bs->close();
       return NULL;
    }
--
1.6.4.2

Add patch for more SD info fix

Add patch for more SD info fix


diff --git a/db/schema.rb b/db/schema.rb
index 32e62d2..83a9de8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -44,7 +44,7 @@ ActiveRecord::Schema.define(version: 20170227152008) do
   create_table "salt_events", force: :cascade do |t|
     t.string   "tag",          limit: 255,      null: false
     t.text     "data",         limit: 16777215, null: false
-    t.datetime "alter_time",                    null: false
+    t.column   "alter_time",   "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP"
     t.string   "master_id",    limit: 255,      null: false
     t.datetime "taken_at"
     t.datetime "processed_at"
@@ -60,7 +60,7 @@ ActiveRecord::Schema.define(version: 20170227152008) do
     t.string   "id",         limit: 255,      null: false
     t.string   "success",    limit: 10,       null: false
     t.text     "full_ret",   limit: 16777215, null: false
-    t.datetime "alter_time",                  null: false
+    t.column   "alter_time", "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP"
   end

   add_index "salt_returns", ["fun"], name: "fun", using: :btree

Set default `alter_time` column value on `salt_events` table


--- 8192cu/include/autoconf.h.orig	2012-12-27 15:42:26.265902118 -0500
+++ 8192cu/include/autoconf.h	2012-12-27 15:43:09.750503696 -0500
@@ -253,9 +253,9 @@
 //#define CONFIG_DEBUG_RTL871X

 #define DBG	0
-#define CONFIG_DEBUG_RTL819X
+//#define CONFIG_DEBUG_RTL819X

-#define CONFIG_PROC_DEBUG	1
+//#define CONFIG_PROC_DEBUG	1

 //#define DBG_IO
 //#define DBG_DELAY_OS

[wrt] Disable more debug spam in the 8192cu drier


From 8956b4fa10af0df2f8912f6116aa1e970dc0283a Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 18 Aug 2019 17:44:47 +0200
Subject: [PATCH] Workaround rust regression

---
 src/liballoc/macros.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs
index 0b5e186..250c419 100644
--- a/src/liballoc/macros.rs
+++ b/src/liballoc/macros.rs
@@ -98,5 +98,5 @@ macro_rules! vec {
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 macro_rules! format {
-    ($($arg:tt)*) => ($crate::fmt::format(::core::format_args!($($arg)*)))
+    ($($arg:tt)*) => ($crate::fmt::format(format_args!($($arg)*)))
 }
--
2.20.1 (Apple Git-117)

Add patch for rustc regression

Add patch for rustc regression

Filled as 63687


#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~fix-qgfxraster
+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp
@@ -3876,14 +3876,15 @@
 	for( loopc2=0;loopc2<frontadd;loopc2++ )
 	    *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos);

-	PackType temp2;
-	unsigned char * cp;
+	volatile PackType temp2;
+	volatile unsigned short int * cp;
 	for( loopc2=0;loopc2<count;loopc2++ ) {
-	    temp2=*((PackType *)temppos);
-	    cp=(unsigned char *)&temp2;
-	    *(alphaptr++)=get_value_32(16,&cp);
-	    *(alphaptr++)=get_value_32(16,&cp);
-	    temppos += 2;
+           temp2=*reinterpret_cast<PackType *>(temppos);
+           cp=reinterpret_cast<volatile unsigned short int *>(&temp2);
+           *(alphaptr++)=qt_conv16ToRgb(*cp);
+           cp++;
+           *(alphaptr++)=qt_conv16ToRgb(*cp);
+	    temppos += 2;
 	}

 	for( loopc2=0;loopc2<backadd;loopc2++ )

Fix font rendering on first display of controls

BKrev: 41471f83xuYAsS6b6iA3_7bcVlgtfw


diff --git a/src/d_fft_fftsg.c b/src/d_fft_fftsg.c
index 22d14bc..04cd7aa 100644
--- a/src/d_fft_fftsg.c
+++ b/src/d_fft_fftsg.c
@@ -21,6 +21,8 @@ for another, more permissive-sounding copyright notice.  -MSP
 /* ---------- Pd interface to OOURA FFT; imitate Mayer API ---------- */
 #include "m_pd.h"

+#include <malloc.h>
+
 #ifdef HAVE_ALLOCA_H        /* ifdef nonsense to find include for alloca() */
 # include <alloca.h>        /* linux, mac, mingw, cygwin */
 #elif defined _MSC_VER
diff --git a/src/x_array.c b/src/x_array.c
index 6a9e2eb..1ee1694 100644
--- a/src/x_array.c
+++ b/src/x_array.c
@@ -16,6 +16,8 @@
 #endif
 extern t_pd *newest;    /* OK - this should go into a .h file now :) */

+#include <malloc.h>
+
 #ifdef HAVE_ALLOCA_H        /* ifdef nonsense to find include for alloca() */
 # include <alloca.h>        /* linux, mac, mingw, cygwin */
 #elif defined _MSC_VER
diff --git a/src/x_list.c b/src/x_list.c
index 8b84f18..b148dcc 100644
--- a/src/x_list.c
+++ b/src/x_list.c
@@ -5,6 +5,8 @@
 #include "m_pd.h"
 /* #include <string.h> */

+#include <malloc.h>
+
 #ifdef HAVE_ALLOCA_H        /* ifdef nonsense to find include for alloca() */
 # include <alloca.h>        /* linux, mac, mingw, cygwin */
 #elif defined _MSC_VER
diff --git a/src/x_text.c b/src/x_text.c
index 852dbc8..5df8bf8 100644
--- a/src/x_text.c
+++ b/src/x_text.c
@@ -19,6 +19,8 @@ moment it also defines "text" but it may later be better to split this off. */
 extern t_pd *newest;    /* OK - this should go into a .h file now :) */
 static t_class *text_define_class;

+#include <malloc.h>
+
 #ifdef HAVE_ALLOCA_H        /* ifdef nonsense to find include for alloca() */
 # include <alloca.h>        /* linux, mac, mingw, cygwin */
 #elif defined _MSC_VER

Add mingw patch for pure-data

Add mingw patch for pure-data


--- ../src-base/minecraft/net/minecraft/src/IntegratedServerListenThread.java
+++ ../src-work/minecraft/net/minecraft/src/IntegratedServerListenThread.java
@@ -4,6 +4,12 @@
 import cpw.mods.fml.common.asm.SideOnly;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
 import net.minecraft.server.MinecraftServer;

 @SideOnly(Side.CLIENT)
@@ -48,7 +54,32 @@

             try
             {
-                this.field_71757_g = new ServerListenThread(this, InetAddress.getLocalHost(), var1);
+                InetAddress add = null;
+                NetworkInterface notLocal = null;
+                for (NetworkInterface ni : Collections.list(NetworkInterface.getNetworkInterfaces()))
+                {
+                    if (!ni.isLoopback() && ni.isUp())
+                    {
+                        notLocal = ni;
+                        break;
+                    }
+                }
+                if (notLocal != null)
+                {
+                    for (InetAddress inadd : Collections.list(notLocal.getInetAddresses()))
+                    {
+                        if (inadd.getAddress().length == 4)
+                        {
+                            add = inadd;
+                            break;
+                        }
+                    }
+                }
+                if (add == null)
+                {
+                    add = InetAddress.getLocalHost();
+                }
+                this.field_71757_g = new ServerListenThread(this, add, var1);
                 this.field_71757_g.start();
             }
             catch (IOException var3)

Fix LAN to try hard to find a real network interface, not just localhost most of the time


--- ../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.