From 6b0f139f7bb1f3b24d321949230d3419a7aaba87 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Wed, 4 Nov 2020 21:47:51 +0100
Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 configs/nanopi_neo_air_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index 01bf61d4c6b5..1a06f14b0e9f 100644
--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
@@ -15,3 +15,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.25.1

From b1e4b9672d7bdd4a6a4d08b1514b46af25996cc8 Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@resin.io>
Date: Wed, 12 Sep 2018 14:22:49 +0200
Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support

Upstream-status: Pending
Signed-off-by: Florin Sarbu <florin@resin.io>
---
 configs/nanopi_neo_air_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index baaccf145e..77fa1489e4 100644
--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
@@ -9,3 +9,4 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2

Revert "u-boot: rebase nanopi_neo_air emmc patch"

This reverts commit 58d382d59892f48b1a36f225cf87b47be80cf76a.

This change was not needed on master. The patch was already correctly
refreshed on the dunfell branch to be compatible with the v2020.01
U-Boot release. It was done in the following commit: d0bbc7334d42


Index: v8/include/v8.h
===================================================================
--- v8/include/v8.h	(revision 14861)
+++ v8/include/v8.h	(working copy)
@@ -4168,7 +4168,7 @@
  * be performed.
  */
 class V8EXPORT AssertNoGCScope {
-#ifndef DEBUG
+#ifdef NDEBUG
   // TODO(yangguo): remove isolate argument.
   V8_INLINE(AssertNoGCScope(Isolate* isolate)) { }
 #else
Index: v8/src/api.cc
===================================================================
--- v8/src/api.cc	(revision 14861)
+++ v8/src/api.cc	(working copy)
@@ -6411,7 +6411,7 @@
 }

-#ifdef DEBUG
+#ifndef NDEBUG
 v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate) {
   disallow_heap_allocation_ = new i::DisallowHeapAllocation();
 }

Index: v8/include/v8.h
===================================================================
--- v8/include/v8.h	(revision 14861)
+++ v8/include/v8.h	(working copy)
@@ -4325,7 +4325,7 @@
  * be performed.
  */
 class V8_EXPORT AssertNoGCScope {
-#ifndef DEBUG
+#ifdef NDEBUG
   // TODO(yangguo): remove isolate argument.
   V8_INLINE(AssertNoGCScope(Isolate* isolate)) { }
 #else
Index: v8/src/api.cc
===================================================================
--- v8/src/api.cc	(revision 14861)
+++ v8/src/api.cc	(working copy)
@@ -6694,7 +6694,7 @@
 }

-#ifdef DEBUG
+#ifndef NDEBUG
 v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate) {
   disallow_heap_allocation_ = new i::DisallowHeapAllocation();
 }

Update v8::AssertNoGCScope patch for Chrome 30


Index: libchewing/include/config.h.in
===================================================================
--- libchewing.orig/include/config.h.in	2012-04-02 14:11:15.726807284 +0800
+++ libchewing/include/config.h.in	2012-04-02 14:11:38.910922257 +0800
@@ -107,6 +107,10 @@
 /* Version number of package */
 #undef VERSION

+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Index: libchewing/include/config.h.in
===================================================================
--- libchewing.orig/include/config.h.in	2012-04-02 14:11:15.726807284 +0800
+++ libchewing/include/config.h.in	2012-04-02 14:11:38.910922257 +0800
@@ -107,6 +107,10 @@
 /* Version number of package */
 #undef VERSION

+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Increase the fallback PATH_MAX to 4096.

Increase the fallback PATH_MAX to 4096.


diff --git a/tests/incremental/01-restart/01-global-nochange.c b/tests/incremental/01-restart/01-global-nochange.c
@@ -2,7 +2,7 @@
 #include <pthread.h>

 int g = 1;
-
+// cmt
 void* t_fun(void *arg) {
     g = 2;
     return NULL;

Add a space to supress patch warnings.

Add a space to supress patch warnings.


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

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

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

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

030-reserves-pickupnumber.patch
Patch for C4::Reserves - adding pickupnumber column to GetReserveInfo used in holds slip

Now available in template:
<<reserves.pickupnumber>>

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 68c608d..8991491 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -1428,6 +1428,7 @@ sub GetReserveInfo {
                    reserves.biblionumber,
                    reserves.branchcode,
                    reserves.waitingdate,
+                   reserves.pickupnumber,
                    notificationdate,
                    reminderdate,
                    priority,

Add pickupnumber to GetReserveInfo used in ReserveSlip


Fix M_PI_2 (pi/2) not defined

Fix M_PI_2 (pi/2) not defined


diff -aurN node-v0.8.16.orig/configure node-v0.8.16/configure
--- node-v0.8.16.orig/configure	2012-12-28 22:44:59.000000000 +0900
+++ node-v0.8.16/configure	2012-12-28 22:45:23.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python26
 import optparse
 import os
 import pprint

diff -aurN node-v0.8.18.orig/configure node-v0.8.18/configure
--- node-v0.8.18.orig/configure	2012-12-28 22:44:59.000000000 +0900
+++ node-v0.8.18/configure	2012-12-28 22:45:23.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python26
 import optparse
 import os
 import pprint

Update versions of patch to point to node v0.8.18


# Description: Use reasonable default settings at installation
# Author: Jon Bernard <jbernard@debian.org>

Index: libcgroup/samples/cgconfig.conf
===================================================================
--- libcgroup.orig/samples/cgconfig.conf	2009-08-25 18:57:09.194240159 -0400
+++ libcgroup/samples/cgconfig.conf	2009-08-25 18:57:18.350237575 -0400
@@ -42,7 +42,7 @@
 #	}
 #}
 #
-#mount {
-#	cpu = /mnt/cgroups/cpu;
-#	cpuacct = /mnt/cgroups/cpuacct;
-#}
+mount {
+	cpu = /mnt/cgroups/cpu;
+	cpuacct = /mnt/cgroups/cpuacct;
+}

# Description: Use reasonable default settings at installation
# Author: Jon Bernard <jbernard@debian.org>

--- a/samples/cgconfig.conf
+++ b/samples/cgconfig.conf
@@ -42,7 +42,8 @@
 #	}
 #}
 #
-#mount {
-#	cpu = /mnt/cgroups/cpu;
-#	cpuacct = /mnt/cgroups/cpuacct;
-#}
+mount {
+	cpu = /mnt/cgroups/cpu;
+	cpuacct = /mnt/cgroups/cpuacct;
+	devices = /mnt/cgroups/devices;
+}

Add device controller to the default configuration

When the cgroup-bin package is installed, it mounts two cgroups.  Then
whenever libvirt tries to fire up a VM, it sees cgroups are mounted, and
wants to lock the VM into a devices cgroup to stop it accessing devices.
However the default config does not mount the devices cgroup, so libvirt
refuses to start up the VM.

LP: #607849
Thanks: Serge Hallyn


diff -Nurd -X.diff_ignore freeciv/common/map.h freeciv/common/map.h
--- freeciv/common/map.h	2012-07-18 01:55:33.000000000 +0300
+++ freeciv/common/map.h	2012-07-18 02:21:11.000000000 +0300
@@ -572,9 +572,9 @@
 /* Size of the map in thousands of tiles. If MAP_MAX_SIZE is increased,
  * MAX_DBV_LENGTH in bitvector.c must be checked; see the static assertion
  * below. */
-#define MAP_DEFAULT_SIZE         4
+#define MAP_DEFAULT_SIZE         3
 #define MAP_MIN_SIZE             0
-#define MAP_MAX_SIZE             2048
+#define MAP_MAX_SIZE             15

 FC_STATIC_ASSERT(MAP_MAX_SIZE * 1000 <= MAX_DBV_LENGTH,
                  map_too_big_for_bitvector);

diff -Nurd -X.diff_ignore freeciv/common/map.h freeciv/common/map.h
--- freeciv/common/map.h	2012-07-18 01:55:33.000000000 +0300
+++ freeciv/common/map.h	2012-07-18 02:21:11.000000000 +0300
@@ -572,9 +572,9 @@
 /* Size of the map in thousands of tiles. If MAP_MAX_SIZE is increased,
  * MAX_DBV_LENGTH in bitvector.c must be checked; see the static assertion
  * below. */
-#define MAP_DEFAULT_SIZE         4
+#define MAP_DEFAULT_SIZE         3
 #define MAP_MIN_SIZE             0
-#define MAP_MAX_SIZE             2048
+#define MAP_MAX_SIZE             18

 FC_STATIC_ASSERT(MAP_MAX_SIZE * 1000 <= MAX_DBV_LENGTH,
                  map_too_big_for_bitvector);

Make maximum map size 18, so that the Europe scenario can be loaded.


From 40731af98d8a1ad6a2c8dfb4ee9641ecb90dfe4c Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@resin.io>
Date: Wed, 1 Mar 2017 23:53:02 +0100
Subject: Integrate machine independent resin environment configuration

This patch integrates resin default environment configuration in an u-boot which
has a version with Kconfig support.

Signed-off-by: Andrei Gherzan <andrei@resin.io>

Upstream-Status: Inappropriate [configuration]

---
 include/env_default.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/env_default.h b/include/env_default.h
index ea6704a..09cd81a 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -10,6 +10,8 @@

 #include <env_callback.h>

+#include <env_resin.h>
+
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
 env_t environment __PPCENV__ = {
 	ENV_CRC,	/* CRC Sum */
@@ -22,6 +24,7 @@ static char default_environment[] = {
 #else
 const uchar default_environment[] = {
 #endif
+    RESIN_ENV
 #ifdef	CONFIG_ENV_CALLBACK_LIST_DEFAULT
 	ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0"
 #endif
--
2.7.4

u-boot: Implement integration with kconfig uboots

Signed-off-by: Andrei Gherzan <8dc7c09356db0b1762fb140617d7375c0a5a4131@resin.io>


diff --git a/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp b/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
index 7ee2fa858b93..a4db35011714 100644
--- a/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
+++ b/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
@@ -51,7 +51,7 @@ v8::Isolate* MainThreadIsolate() {
 static V8PerIsolateData* g_main_thread_per_isolate_data = 0;

 static void BeforeCallEnteredCallback(v8::Isolate* isolate) {
-  CHECK(!ScriptForbiddenScope::IsScriptForbidden());
+  DCHECK(!ScriptForbiddenScope::IsScriptForbidden());
 }

 static void MicrotasksCompletedCallback(v8::Isolate* isolate) {

diff --git a/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp b/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
index 7ee2fa858b93..a4db35011714 100644
--- a/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
+++ b/third_party/WebKit/Source/platform/bindings/V8PerIsolateData.cpp
@@ -51,7 +51,7 @@ v8::Isolate* MainThreadIsolate() {
 static V8PerIsolateData* g_main_thread_per_isolate_data = 0;

 static void BeforeCallEnteredCallback(v8::Isolate* isolate) {
-  CHECK(!ScriptForbiddenScope::IsScriptForbidden());
+  // CHECK(!ScriptForbiddenScope::IsScriptForbidden());
 }

 static void MicrotasksCompletedCallback(v8::Isolate* isolate) {

Disable ScriptForbiddenScope check in BeforeCallEnteredCallback

Got crash in Electron:
[22964:0312/160427.139779:FATAL:V8PerIsolateData.cpp(54)] Check failed: !ScriptForbiddenScope::IsScriptForbidden().
0 0x7f52de54eb2d base::debug::StackTrace::StackTrace()
1 0x7f52de54cf5c base::debug::StackTrace::StackTrace()
2 0x7f52de5d3dba logging::LogMessage::~LogMessage()
3 0x7f52e10ddd40 <unknown>
4 0x7f52ee73c505 <unknown>
5 0x7f52ee75e938 v8::Function::Call()
6 0x7f52ef0c9c61 node::InternalMakeCallback()
7 0x7f52ef0ca0ae node::MakeCallback()
8 0x7f52ef0c9ff4 node::MakeCallback()
9 0x7f52ef0c9ec2 node::MakeCallback()
10 0x000000e5e617 mate::internal::CallMethodWithArgs()
11 0x000000fc3f61 _ZN4mate9EmitEventIA15_cJEEEN2v85LocalINS2_5ValueEEEPNS2_7IsolateENS3_INS2_6ObjectEEERKT_DpRKT0_
12 0x000000fc2c6f atom::AtomRendererClient::RunScriptsAtDocumentStart()
13 0x7f52db3390eb content::RenderFrameImpl::RunScriptsAtDocumentElementAvailable()


--- misc/libvisio-0.0.9/src/lib/libvisio_utils.h
+++ misc/build/libvisio-0.0.9/src/lib/libvisio_utils.h
@@ -41,17 +41,8 @@

 #else

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#endif

 #endif

--- misc/libvisio-0.0.9/src/lib/makefile.mk	2011-10-16 21:23:32.000000000 +0200
+++ misc/build/libvisio-0.0.9/src/lib/makefile.mk	2011-10-23 09:50:39.110165001 +0200
@@ -41,6 +41,7 @@
 	$(SLO)$/VSDXGeometryList.obj \
 	$(SLO)$/VSDXOutputElementList.obj \
 	$(SLO)$/VSDXPages.obj \
+	$(SLO)$/VSDXParagraphList.obj \
 	$(SLO)$/VSDXParser.obj \
 	$(SLO)$/VSDXShapeList.obj \
 	$(SLO)$/VSDXStencils.obj \

Fix the build of Visio import filter

Fix the build of Visio import filter


Description: Provide useful information via libudev to userspace programs
 to determine what device is plugged in.
Origin: upstream, commit:1174
From: http://bazaar.launchpad.net/~vcs-imports/libmtp/trunk/revision/1174#examples/hotplug.c
---
 examples/hotplug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- libmtp.orig/examples/hotplug.c
+++ libmtp/examples/hotplug.c
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   extern int optind;
   extern char *optarg;
   char *udev_action = NULL;
-  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\"";
+  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\" ENV{ID_MEDIA_PLAYER}=\"1\"";
   char *action; // To hold the action actually used.
   uint16_t last_vendor = 0x0000U;

Description: Provide useful information via libudev to userspace programs
 to determine what device is plugged in.
Origin: upstream, commit:1174
Bug: http://sourceforge.net/support/tracker.php?aid=3109858
From: http://bazaar.launchpad.net/~vcs-imports/libmtp/trunk/revision/1174#examples/hotplug.c
---
 examples/hotplug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- libmtp.orig/examples/hotplug.c
+++ libmtp/examples/hotplug.c
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   extern int optind;
   extern char *optarg;
   char *udev_action = NULL;
-  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\"";
+  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\" ENV{ID_MEDIA_PLAYER}=\"1\"";
   char *action; // To hold the action actually used.
   uint16_t last_vendor = 0x0000U;

Add upstream's bug as reference

Add upstream's bug as reference


From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 16 Jan 2018 13:26:57 +0000
Subject: [PATCH] Link with libexecinfo on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 src/plugins/debugger/debugger.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index acbf5136b9..159139eb2b 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -139,3 +139,4 @@ include(console/console.pri)
 include(analyzer/analyzer.pri)

 include(shared/shared.pri)
+LIBS  *= -lexecinfo

From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 16 Jan 2018 13:26:57 +0000
Subject: [PATCH] Link with libexecinfo on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 src/plugins/debugger/debugger.pro | 1 +
 1 file changed, 1 insertion(+)

--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -139,3 +139,4 @@ include(console/console.pri)
 include(analyzer/analyzer.pri)

 include(shared/shared.pri)
+LIBS  *= -lexecinfo
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -3,7 +3,7 @@ CONFIG += exceptions

 INCLUDEPATH += $$PWD

-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
+unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory

 include(../../qtcreatorplugin.pri)

qt5-creator: Update musl patch to link qmldesigner with -lexecinfo

Fixes link failures like below

src/plugins/qmldesigner/designercore/exceptions/exception.cpp:116: undefined reference to `backtrace'

Signed-off-by: Khem Raj <729d64b6f67515e258459a5f6d20ec88b2caf8df@gmail.com>


--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
@@ -551,6 +551,12 @@ public class EntityFishHook extends Entity
         float f = this.field_70170_p.field_73012_v.nextFloat();
         int i = EnchantmentHelper.func_151386_g(this.field_146042_b);
         int j = EnchantmentHelper.func_151387_h(this.field_146042_b);
+        if (true)
+        {
+            this.field_146042_b.func_71064_a(net.minecraftforge.common.FishingHooks.getFishableCategory(f, i, j).stat, 1);
+            return net.minecraftforge.common.FishingHooks.getRandomFishable(this.field_70146_Z, f, i, j);
+        }
+
         float f1 = 0.1F - (float)i * 0.025F - (float)j * 0.01F;
         float f2 = 0.05F + (float)i * 0.01F - (float)j * 0.01F;
         f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);

--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
@@ -551,6 +551,12 @@
         float f = this.field_70170_p.field_73012_v.nextFloat();
         int i = EnchantmentHelper.func_151386_g(this.field_146042_b);
         int j = EnchantmentHelper.func_151387_h(this.field_146042_b);
+        if (true)
+        {
+            this.field_146042_b.func_71064_a(net.minecraftforge.common.FishingHooks.getFishableCategory(f, i, j).stat, 1);
+            return net.minecraftforge.common.FishingHooks.getRandomFishable(this.field_70146_Z, f, i, j);
+        }
+
         float f1 = 0.1F - (float)i * 0.025F - (float)j * 0.01F;
         float f2 = 0.05F + (float)i * 0.01F - (float)j * 0.01F;
         f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);

Fix patch screwup in Skyboy's Fishing PR -.-


--- a/setup.py
+++ b/setup.py
@@ -212,7 +212,7 @@
     cflags = os.environ.get(
         'OVERRIDE_CFLAGS', (
             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
-            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+            ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
         ).format(
             optimize,
             ' '.join(sanitize_args),

--- a/setup.py
+++ b/setup.py
@@ -217,7 +217,7 @@ def init_env(
     cflags = os.environ.get(
         'OVERRIDE_CFLAGS', (
             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11'
-            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+            ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
         ).format(
             float_conversion, std,
             optimize,

Fix patch that doesn't apply in v0.15.0

kitty: Fix patch that doesn't apply in v0.15.0


Index: webkit/plugins/ppapi/content_decryptor_delegate.cc
===================================================================
--- webkit/plugins/ppapi/content_decryptor_delegate.cc	(revision 194718)
+++ webkit/plugins/ppapi/content_decryptor_delegate.cc	(working copy)
@@ -285,6 +285,9 @@
       weak_this_(weak_ptr_factory_.GetWeakPtr()) {
 }

+ContentDecryptorDelegate::~ContentDecryptorDelegate() {
+}
+
 void ContentDecryptorDelegate::SetKeyEventCallbacks(
     const media::KeyAddedCB& key_added_cb,
     const media::KeyErrorCB& key_error_cb,
Index: webkit/plugins/ppapi/content_decryptor_delegate.h
===================================================================
--- webkit/plugins/ppapi/content_decryptor_delegate.h	(revision 194718)
+++ webkit/plugins/ppapi/content_decryptor_delegate.h	(working copy)
@@ -37,6 +37,7 @@
   ContentDecryptorDelegate(
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
+  ~ContentDecryptorDelegate();

   void SetKeyEventCallbacks(const media::KeyAddedCB& key_added_cb,
                             const media::KeyErrorCB& key_error_cb,

Index: webkit/plugins/ppapi/content_decryptor_delegate.cc
===================================================================
--- webkit/plugins/ppapi/content_decryptor_delegate.cc	(revision 194718)
+++ webkit/plugins/ppapi/content_decryptor_delegate.cc	(working copy)
@@ -285,6 +285,9 @@
       weak_this_(weak_ptr_factory_.GetWeakPtr()) {
 }

+ContentDecryptorDelegate::~ContentDecryptorDelegate() {
+}
+
 void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
   // TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
   DCHECK(!key_system.empty());
   key_system_ = key_system;
Index: webkit/plugins/ppapi/content_decryptor_delegate.h
===================================================================
--- webkit/plugins/ppapi/content_decryptor_delegate.h	(revision 194718)
+++ webkit/plugins/ppapi/content_decryptor_delegate.h	(working copy)
@@ -38,6 +38,7 @@
   ContentDecryptorDelegate(
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
+  ~ContentDecryptorDelegate();

   void Initialize(const std::string& key_system);

Update ContentDecryptorDelegate patch for Chrome 29


--- libgltf/src/RenderScene.h
+++ libgltf/src/RenderScene.h
@@ -16,7 +16,8 @@
 #include "FPSCounter.h"
 #include "Timer.h"

-#define OPENMPENABLE   1
+// Needs a configure / etc. detection to see if omp.h is on the system ...
+#define OPENMPENABLE   0
 #if OPENMPENABLE
 #include <omp.h>
 #define WAVESIZE 4

--- libgltf/src/RenderScene.h
+++ libgltf/src/RenderScene.h
@@ -16,7 +16,8 @@
 #define TRACE_TIME
 #endif

-#define OPENMPENABLE   1
+// Needs a configure / etc. detection to see if omp.h is on the system ...
+#define OPENMPENABLE   0
 #if OPENMPENABLE
 #include <omp.h>
 #define WAVESIZE 4

libgltf: Update openmp-related patch to newer libgltf.

Change-Id: I6f7e8d974030169bb00fbd81a0e2190640702729


diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ecc7d44
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:latest
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  git \
+  unzip \
+  wget \
+  zip
+
+WORKDIR /app
+
+COPY . .
+
+RUN php artisan key:generate
+
+CMD php artisan serve --port=8000 --host=0.0.0.0

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ecc7d44
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:latest
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  git \
+  unzip \
+  wget \
+  zip
+
+WORKDIR /app
+
+COPY . .
+
+RUN php artisan key:generate
+
+CMD php -S 0.0.0.0:8000 -t public/

Use PHP's built in webserver directly

Use PHP's built in webserver directly

This fixes an issue where the environment variables aren't visible
to PHP


diff --git a/tempest/lib/services/network/security_groups_client.py b/tempest/lib/services/network/security_groups_client.py
index 1f30216..793c6d9 100644
--- a/tempest/lib/services/network/security_groups_client.py
+++ b/tempest/lib/services/network/security_groups_client.py
@@ -11,7 +11,7 @@
 #    under the License.

 from tempest.lib.services.network import base
-
+import time

 class SecurityGroupsClient(base.BaseNetworkClient):

@@ -55,6 +55,7 @@ class SecurityGroupsClient(base.BaseNetworkClient):
         http://developer.openstack.org/api-ref/networking/v2/index.html#delete-security-group
         """
         uri = '/security-groups/%s' % security_group_id
+        time.sleep(5)
         return self.delete_resource(uri)

     def list_security_groups(self, **filters):

diff --git a/tempest/lib/services/network/security_groups_client.py b/tempest/lib/services/network/security_groups_client.py
index d3ebf20..9daba65 100644
--- a/tempest/lib/services/network/security_groups_client.py
+++ b/tempest/lib/services/network/security_groups_client.py
@@ -12,6 +12,7 @@

 from tempest.lib import exceptions as lib_exc
 from tempest.lib.services.network import base
+import time

 class SecurityGroupsClient(base.BaseNetworkClient):
@@ -56,6 +57,7 @@ class SecurityGroupsClient(base.BaseNetworkClient):
         http://developer.openstack.org/api-ref/networking/v2/index.html#delete-security-group
         """
         uri = '/security-groups/%s' % security_group_id
+        time.sleep(5)
         return self.delete_resource(uri)

     def list_security_groups(self, **filters):

Update patch file after merge from latest upstream code


Index: tools/clang/lib/Sema/SemaLookup.cpp
===================================================================
--- tools/clang/lib/Sema/SemaLookup.cpp	(revision 47284)
+++ tools/clang/lib/Sema/SemaLookup.cpp	(working copy)
@@ -1207,8 +1207,14 @@
       }
   } else {
     // Perform C++ unqualified name lookup.
-    if (CppLookupName(R, S))
+    if (CppLookupName(R, S)) {
+      if (R.isSingleResult())
+        if (const TagDecl *TD = dyn_cast<TagDecl>(R.getFoundDecl())) {
+          if (!TD->isThisDeclarationADefinition() && ExternalSource)
+            ExternalSource->LookupUnqualified(R, S);
+        }
       return true;
+    }
   }

   // If we didn't find a use of this identifier, and if the identifier

Index: tools/clang/lib/Sema/SemaLookup.cpp
===================================================================
--- tools/clang/lib/Sema/SemaLookup.cpp	(revision 47284)
+++ tools/clang/lib/Sema/SemaLookup.cpp	(working copy)
@@ -1207,8 +1207,14 @@
       }
   } else {
     // Perform C++ unqualified name lookup.
-    if (CppLookupName(R, S))
+    if (CppLookupName(R, S)) {
+      if (R.isSingleResult())
+        if (const TagDecl *TD = dyn_cast<TagDecl>(R.getFoundDecl())) {
+          if (!TD->getDefinition() && ExternalSource)
+            ExternalSource->LookupUnqualified(R, S);
+        }
       return true;
+    }
   }

   // If we didn't find a use of this identifier, and if the identifier

Update the patch corresponding to the latest change in the vendor drop.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@47561 27541ba8-7e3a-0410-8455-c3a389f83636


diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d938c07..e1dd4ec 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -353,7 +353,7 @@
 }

 isEmpty(BDB_LIB_PATH) {
-    macx:BDB_LIB_PATH = /opt/local/lib/db48
+    macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
 }

 isEmpty(BDB_LIB_SUFFIX) {
@@ -361,15 +361,15 @@
 }

 isEmpty(BDB_INCLUDE_PATH) {
-    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+    macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
 }

 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /opt/local/lib
+    macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib
 }

 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /opt/local/include
+    macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include
 }

 win32:DEFINES += WIN32

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d938c07..e1dd4ec 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -352,7 +352,7 @@
 }

 isEmpty(BDB_LIB_PATH) {
-    macx:BDB_LIB_PATH = /opt/local/lib/db48
+    macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
 }

 isEmpty(BDB_LIB_SUFFIX) {
@@ -360,15 +360,15 @@
 }

 isEmpty(BDB_INCLUDE_PATH) {
-    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+    macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
 }

 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /opt/local/lib
+    macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib
 }

 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /opt/local/include
+    macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include
 }

 win32:DEFINES += WIN32

Update homebrew patches to account for code drift.


diff --git a/python/setup.py b/python/setup.py
index 98457ae..ed9bf87 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -75,7 +75,7 @@ if compile_with_sources:
     include_dirs += [source_dir, ]
     sources = [os.path.join(source_dir, s) for s in cpp_files]
     sources += ['_alm.c', 'alm_wrapper.cpp']
-    extra_link_args.append(os.path.join(spglib_dir, "libsymspg.a"))
+    extra_link_args.append("-lsymspg")
 else:  # compile with library
     sources = ['_alm.c', 'alm_wrapper.cpp']
     # static link library

diff --git a/python/setup.py b/python/setup.py
index 98457ae..ed9bf87 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -75,7 +75,7 @@ if compile_with_sources:
     include_dirs += [source_dir, ]
     sources = [os.path.join(source_dir, s) for s in cpp_files]
     sources += ['_alm.c', 'alm_wrapper.cpp']
-    extra_link_args.append(os.path.join(spglib_dir, "libsymspg.a"))
+    extra_link_args.append("-lsymspg -lgomp")
 else:  # compile with library
     sources = ['_alm.c', 'alm_wrapper.cpp']
     # static link library

Add -lgomp to link line

Add -lgomp to link line


--- a/patch.cabal	2015-02-03 10:43:23.000000000 +0100
+++ b/patch.cabal	2015-02-03 10:46:26.000000000 +0100
@@ -21,6 +21,7 @@
                      Settings.StaticFiles
                      Handler.Common
                      Handler.Home
+                     Roles

     if flag(dev) || flag(library-only)
         cpp-options:   -DDEVELOPMENT
@@ -80,6 +81,8 @@
                  , containers
                  , vector
                  , time
+                 , lambdacms-core                >= 0.0.7      && < 0.1
+                 , wai                           >= 3.0.2      && < 3.1

 executable         patch
     if flag(library-only)

--- a/project_name.cabal	2015-02-03 10:43:23.000000000 +0100
+++ b/project_name.cabal	2015-02-03 10:46:26.000000000 +0100
@@ -21,6 +21,7 @@
                      Settings.StaticFiles
                      Handler.Common
                      Handler.Home
+                     Roles

     if flag(dev) || flag(library-only)
         cpp-options:   -DDEVELOPMENT
@@ -80,6 +81,8 @@
                  , containers
                  , vector
                  , time
+                 , lambdacms-core                >= 0.0.7      && < 0.1
+                 , wai                           >= 3.0.2      && < 3.1

 executable         patch
     if flag(library-only)

Change the cabal file name

Change the cabal file name


--- a/tests/incremental/11-restart/04-global-add.c
+++ b/tests/incremental/11-restart/04-global-add.c
@@ -4,7 +4,7 @@
 int g = 1;

 void* t_fun(void *arg) {
-
+    g = 2;
     return NULL;
 }

@@ -12,6 +12,6 @@ int main() {
     pthread_t id;
     pthread_create(&id, NULL, t_fun, NULL); // just go multithreaded

-    assert(g == 1); // SUCCESS before, unknown after
+    assert(g == 1); // success before, UNKNOWN after
     return 0;
 }
\ No newline at end of file

--- tests/incremental/11-restart/04-global-add.c
+++ tests/incremental/11-restart/04-global-add.c
@@ -4,7 +4,7 @@
 int g = 1;

 void* t_fun(void *arg) {
-
+    g = 2;
     return NULL;
 }

@@ -12,6 +12,6 @@ int main() {
     pthread_t id;
     pthread_create(&id, NULL, t_fun, NULL); // just go multithreaded

-    assert(g == 1); // SUCCESS before, unknown after
+    assert(g == 1); // success before, UNKNOWN after
     return 0;
 }
\ No newline at end of file

Fix header (how did this escape??)

Fix header (how did this escape??)


diff -Naur -x '*~' -x '*.orig' include/grpc/impl/codegen/port_platform.h include/grpc/impl/codegen/port_platform.h
--- include/grpc/impl/codegen/port_platform.h
+++ include/grpc/impl/codegen/port_platform.h
@@ -198,6 +198,8 @@
 #define GPR_POSIX_TIME 1
 #define GPR_POSIX_ENV 1
 #define GPR_ASYLO 1
+#define GRPC_HAVE_UNIX_SOCKET 1
+#define GRPC_IF_NAMETOINDEX 0
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR
 #define GRPC_POSIX_SOCKETUTILS 1
diff -Naur -x '*~' -x '*.orig' test/core/end2end/generate_tests.bzl test/core/end2end/generate_tests.bzl
--- test/core/end2end/generate_tests.bzl
+++ test/core/end2end/generate_tests.bzl
@@ -390,6 +390,7 @@
             "end2end_tests.h",
         ],
         language = "C++",
+        visibility = ["//visibility:public"],
         deps = [
             ":cq_verifier",
             ":ssl_test_data",

diff -Naur -x '*~' -x '*.orig' include/grpc/impl/codegen/port_platform.h include/grpc/impl/codegen/port_platform.h
--- include/grpc/impl/codegen/port_platform.h
+++ include/grpc/impl/codegen/port_platform.h
@@ -198,6 +198,9 @@
 #define GPR_POSIX_TIME 1
 #define GPR_POSIX_ENV 1
 #define GPR_ASYLO 1
+#define GRPC_HAVE_MSG_NOSIGNAL 1
+#define GRPC_HAVE_UNIX_SOCKET 1
+#define GRPC_IF_NAMETOINDEX 0
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR
 #define GRPC_POSIX_SOCKETUTILS 1
diff -Naur -x '*~' -x '*.orig' test/core/end2end/generate_tests.bzl test/core/end2end/generate_tests.bzl
--- test/core/end2end/generate_tests.bzl
+++ test/core/end2end/generate_tests.bzl
@@ -390,6 +390,7 @@
             "end2end_tests.h",
         ],
         language = "C++",
+        visibility = ["//visibility:public"],
         deps = [
             ":cq_verifier",
             ":ssl_test_data",

Add support for MSG_NOSIGNAL in gRPC platform

This change updates the gRPC patch file to indicate support for
MSG_NOSIGNAL in the Asylo platform.

PiperOrigin-RevId: 281818011
Change-Id: I72504e0f8742b259d800c048b33317620451ff36


Description: Provide useful information via libudev to userspace programs
 to determine what device is plugged in.
Origin: upstream, commit:1174
Bug: http://sourceforge.net/support/tracker.php?aid=3109858
From: http://bazaar.launchpad.net/~vcs-imports/libmtp/trunk/revision/1174#examples/hotplug.c
---
 examples/hotplug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- libmtp.orig/examples/hotplug.c
+++ libmtp/examples/hotplug.c
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   extern int optind;
   extern char *optarg;
   char *udev_action = NULL;
-  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\"";
+  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\", ENV{ID_MEDIA_PLAYER}=\"1\"";
   char *action; // To hold the action actually used.
   uint16_t last_vendor = 0x0000U;

Description: Provide useful information via libudev to userspace programs
 to determine what device is plugged in.
Origin: upstream, commit:1174, commit:1175
Bug: http://sourceforge.net/support/tracker.php?aid=3109858
From: http://bazaar.launchpad.net/~vcs-imports/libmtp/trunk/revision/1174#examples/hotplug.c
---
 examples/hotplug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- libmtp.orig/examples/hotplug.c
+++ libmtp/examples/hotplug.c
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   extern int optind;
   extern char *optarg;
   char *udev_action = NULL;
-  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\"";
+  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\", ENV{ID_MTP_DEVICE}=\"1\", ENV{ID_MEDIA_PLAYER}=\"1\"";
   char *action; // To hold the action actually used.
   uint16_t last_vendor = 0x0000U;

Tag on ID_MTP_DEVICE and ID_MEDIA_PLAYER to the udev environment from hotplug.c.


--- node_modules/grunt-contrib-uglify/package.json	2017-01-19 12:48:34.672225217 -0500
+++ node_modules/grunt-contrib-uglify/package.json.new	2017-01-19 12:48:15.695558378 -0500
@@ -67,7 +67,7 @@
     "chalk": "^1.0.0",
     "lodash": "^3.2.0",
     "maxmin": "^1.0.0",
-    "uglify-js": "^2.4.24",
+    "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
     "uri-path": "0.0.2"
   },
   "description": "Minify files with UglifyJS",

--- node_modules/grunt-contrib-uglify/package.json	2017-01-19 12:48:34.672225217 -0500
+++ node_modules/grunt-contrib-uglify/package.json.new	2017-01-19 12:48:15.695558378 -0500
@@ -67,7 +67,7 @@
     "chalk": "^1.0.0",
     "lodash": "^3.2.0",
     "maxmin": "^1.0.0",
-    "uglify-js": "^2.4.24",
+    "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony-v2.8.22",
     "uri-path": "0.0.2"
   },
   "description": "Minify files with UglifyJS",

Fix uglify-js harmony patch version

Fix uglify-js harmony patch version

Latest UglifyJS harmony branch are released with version 3.x,
Use grunt-contrib-uglify compatible 2.x harmony patch instead.


diff --git a/clang.rs b/clang.rs
index 11bf5b7..1684166 100644
--- a/clang.rs
+++ b/clang.rs
@@ -171,17 +171,11 @@ impl Type {
     }

     pub fn size(&self) -> uint {
-        unsafe {
-            let val = clang_Type_getSizeOf(self.x);
-            if val < 0 { 0 } else { val as uint }
-        }
+        0
     }

     pub fn align(&self) -> uint {
-        unsafe {
-            let val = clang_Type_getAlignOf(self.x);
-            if val < 0 { 0 } else { val as uint }
-        }
+        0
     }

     // pointer

diff --git a/clang.rs b/clang.rs
index 990d9da..d32ace5 100644
--- a/clang.rs
+++ b/clang.rs
@@ -167,17 +167,11 @@ impl Type {
     }

     pub fn size(&self) -> uint {
-        unsafe {
-            let val = clang_Type_getSizeOf(**self);
-            if val < 0 { 0 } else { val as uint }
-        }
+        0
     }

     pub fn align(&self) -> uint {
-        unsafe {
-            let val = clang_Type_getAlignOf(**self);
-            if val < 0 { 0 } else { val as uint }
-        }
+        0
     }

     // pointer

Update patch for rust-servo branch.

Update patch for rust-servo branch.


--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -400,6 +402,8 @@
         }

         Collections.shuffle(var2);
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (this.field_70963_i == null)
         {

--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -393,6 +395,8 @@
                 func_70949_b(var2, Item.field_77782_ar.field_77779_bT, this.field_70146_Z, 0.3F);
                 func_70949_b(var2, Item.field_77734_bj.field_77779_bT, this.field_70146_Z, 0.3F);
         }
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (var2.isEmpty())
         {

Move villager trading hook up a bit. thanks sengir.


diff --git a/scripts/auto-copyright/data/vrj-copyright.c.txt b/scripts/auto-copyright/data/vrj-copyright.c.txt
index f209919..c5084f8 100644
--- a/scripts/auto-copyright/data/vrj-copyright.c.txt
+++ b/scripts/auto-copyright/data/vrj-copyright.c.txt
@@ -1,5 +1,5 @@
  *
- * VR Juggler is (C) Copyright 1998-2007 by Iowa State University
+ * VR Juggler is (C) Copyright 1998-2010 by Iowa State University
  *
  * Original Authors:
  *   Allen Bierbaum, Christopher Just,
@@ -18,6 +18,6 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
diff --git a/scripts/auto-copyright/data/vrj-copyright.hash.txt b/scripts/auto-copyright/data/vrj-copyright.hash.txt
index 608e647..a3e0c6a 100644
--- a/scripts/auto-copyright/data/vrj-copyright.hash.txt
+++ b/scripts/auto-copyright/data/vrj-copyright.hash.txt
@@ -1,5 +1,5 @@
 #
-# VR Juggler is (C) Copyright 1998-2007 by Iowa State University
+# VR Juggler is (C) Copyright 1998-2010 by Iowa State University
 #
 # Original Authors:
 #   Allen Bierbaum, Christopher Just,
@@ -18,6 +18,6 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #

Fix the autocopyright data patch

Fix the autocopyright data patch


230c230,235
<   GL: 				timetunnel -root			    \n\
---
>   GL: 				timetunnel -root -tardis		      \
> 				  $HOME/.local/share/icons/xscreensaver/timetunnel/tardis.xpm   \
> 				  -head					      \
> 				  $HOME/.local/share/icons/xscreensaver/timetunnel/whohead1.xpm   \
> 				  -marquee				      \
> 				  $HOME/.local/share/icons/xscreensaver/timetunnel/whologo.xpm \n\

@@ -227,7 +227,12 @@
 - GL: 				fliptext -root				    \n\
 - GL: 				glhanoi -root				    \n\
 - GL: 				tangram -root				    \n\
-  GL: 				timetunnel -root			    \n\
+  GL: 				timetunnel -root -tardis		      \
+				  $HOME/.local/share/icons/xscreensaver/timetunnel/tardis.xpm   \
+				  -head					      \
+				  $HOME/.local/share/icons/xscreensaver/timetunnel/whohead1.xpm   \
+				  -marquee				      \
+				  $HOME/.local/share/icons/xscreensaver/timetunnel/whologo.xpm \n\
 - GL: 				glschool -root				    \n\
   GL: 				topblock -root				    \n\
   GL: 				cubicgrid -root -speed 0.2 -zoom 30	    \n\

Change patch to one with unified context, which should make it more likely to work.


Index: test/Makefile
===================================================================
--- test/Makefile	(revision 154661)
+++ test/Makefile	(working copy)
@@ -61,14 +61,22 @@
 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
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-lit-site-cfgs:: clang-lit-site-cfg
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
 endif
+endif

 IGNORE_TESTS :=

Index: test/Makefile
===================================================================
--- test/Makefile	(revision 154169)
+++ test/Makefile	(working copy)
@@ -67,8 +67,17 @@
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-lit-site-cfgs:: clang-lit-site-cfg
 endif
+
+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
+endif

 IGNORE_TESTS :=

Allow NOCLING also for test-all. Needs repositioning of if-cling.

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


Index: configure
===================================================================
--- configure	(revision 5497)
+++ configure	(working copy)
@@ -47,6 +47,8 @@
   echo ""
   echo "Advanced options (experts only):"
   echo "  --source-path=PATH       path to source code [$source_path]"
+  echo "  --cross-compile          will be cross-compiling, so assume executables"
+  echo "                           will not run on this system [default=no]"
   echo "  --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]"
   echo "  --cc=CC                  use C compiler CC [$cc]"
   echo "  --make=MAKE              use specified make [$make]"
@@ -247,7 +249,7 @@
 }

 check_exec(){
-    check_ld "$@" && { test -n "$cross_prefix" || $TMPE; }
+    check_ld "$@" && { test -n "$cross_prefix" || test "cross_compile" = "yes" || $TMPE; }
 }

 require(){
@@ -286,6 +288,7 @@
 mandir=""
 bindir=""
 cross_prefix=""
+cross_compile="no"
 cc="gcc"
 ar="ar"
 ranlib="ranlib"
@@ -645,6 +648,8 @@
   ;;
   --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2`
   ;;
+  --cross-compile) cross_compile="yes"
+  ;;
   --cc=*) cc=`echo $opt | cut -d '=' -f 2-`
   ;;
   --make=*) make=`echo $opt | cut -d '=' -f 2`
@@ -1113,7 +1118,7 @@

 # ---
 # big/little-endian test
-if test -z "$cross_prefix" ; then
+if test -z "$cross_prefix" && test "$cross_compile" = "no" ; then
     check_ld <<EOF || die "endian test failed" && $TMPE && bigendian="yes"
 #include <inttypes.h>
 int main(int argc, char ** argv){

Index: configure
===================================================================
--- configure   (revision 5634)
+++ configure   (working copy)
@@ -226,8 +226,10 @@
     log check_ld "$@"
     cat >$TMPC
     log_file $TMPC
-    log $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs
-    $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >>$logfile 2>&1
+    log $cc $CFLAGS "$@" -c -o $TMPO $TMPC >>$logfile 2>&1
+    log $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs >>$logfile 2>&1
+    $cc $CFLAGS "$@" -c -o $TMPO $TMPC >>$logfile 2>&1
+    $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs >>$logfile 2>&1
 }

Configure should check with cc and ld in separate commands, because they are when the thing is actually built.

git-svn-id: d8f21eb7283bfb39ebab2f8f9b4a259b233f9348@11 621663c8-3916-0410-8f58-edc14a8543d5


--- setup.py
+++ setup.py
@@ -6,12 +6,10 @@ except ImportError:
     from distutils.core import setup

 setup(name='parcels',
-      version='0.0.1',
+      version='1.0',
       description="""Framework for Lagrangian tracking of virtual
       ocean particles in the petascale age.""",
       author="Imperial College London",
-      use_scm_version=True,
-      setup_requires=['setuptools_scm'],
       packages=['parcels'],
       package_data={'parcels': ['parcels/include/*',
                                 'parcels/examples/*']},

--- setup.py
+++ setup.py
@@ -6,12 +6,10 @@ except ImportError:
     from distutils.core import setup

 setup(name='parcels',
-      version='0.0.1',
+      version='1.0',
       description="""Framework for Lagrangian tracking of virtual
       ocean particles in the petascale age.""",
       author="Imperial College London",
-      use_scm_version=True,
       setup_requires=['setuptools_scm'],
       packages=['parcels'],
       package_data={'parcels': ['parcels/include/*',
                                 'parcels/examples/*']},

Use setuptools_scm except for the version


From a471cf4e4c73350e090eb2cd87ec959d138012e5 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Thu, 19 Mar 2020 11:54:26 -0700
Subject: [PATCH] Add enable/disable libudev

Upstream-Status: Pending
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index cac271c..bd116eb 100755
--- a/configure
+++ b/configure
@@ -1539,6 +1539,10 @@ for opt do
   ;;
   --disable-plugins) plugins="no"
   ;;
+  --enable-libudev) libudev="yes"
+  ;;
+  --disable-libudev) libudev="no"
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
--
1.8.3.1

From 96f204df74f7dde5f4c9ad6e6eefc2d46219ccd9 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Thu, 19 Mar 2020 11:54:26 -0700
Subject: [PATCH] Add enable/disable libudev

Upstream-Status: Pending
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>

%% original patch: 0001-Add-enable-disable-udev.patch
---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index c9a4e73..75f9773 100755
--- a/configure
+++ b/configure
@@ -1606,6 +1606,10 @@ for opt do
   ;;
   --gdb=*) gdb_bin="$optarg"
   ;;
+  --enable-libudev) libudev="yes"
+  ;;
+  --disable-libudev) libudev="no"
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
--
2.7.4

Fix patch puzz warning during do_patch

qemu-xilinx: Fix patch puzz warning during do_patch

Rework 0001-Add-enable-disable-udev.patch to fix patch fuzz warnings

Signed-off-by: Sai Hari Chandana Kalluri <dcd6f85a7bffd89d026445db0f5113d6d436d06a@xilinx.com>


diff -Nur virt-manager-0.10.0.orig/virtinst/osdict.py virt-manager-0.10.0/virtinst/osdict.py
--- virt-manager-0.10.0.orig/virtinst/osdict.py	2013-06-13 14:10:00.000000000 -0500
+++ virt-manager-0.10.0/virtinst/osdict.py	2013-11-11 17:47:51.907305561 -0600
@@ -619,7 +619,15 @@
             VIDEO : VMVGA_VIDEO,
         },
     },
-
+    "slackware": {
+        "label": "Slackware",
+        "distro": "slackware",
+        "supported": False,
+        "devices" : {
+            DISK : VIRTIO_DISK,
+            NET  : VIRTIO_NET,
+        },
+    },
     "generic24": {
         "label": "Generic 2.4.x kernel"
    },

diff -Nur virt-manager-0.10.0.orig/virtinst/osdict.py virt-manager-0.10.0/virtinst/osdict.py
--- virt-manager-0.10.0.orig/virtinst/osdict.py	2013-06-13 14:10:00.000000000 -0500
+++ virt-manager-0.10.0/virtinst/osdict.py	2013-11-11 17:47:51.907305561 -0600
@@ -619,7 +619,15 @@
             VIDEO : VMVGA_VIDEO,
         },
     },
-
+    "slackware": {
+        "label": "Slackware",
+        "distro": "slackware",
+        "supported": True,
+        "devices" : {
+            DISK : VIRTIO_DISK,
+            NET  : VIRTIO_NET,
+        },
+    },
     "generic24": {
         "label": "Generic 2.4.x kernel"
    },

Mark Slackware as supported in patch

system/virt-manager: Mark Slackware as supported in patch

This will make Slackware show up in the first list of
supported systems when choosing what OS to install.

Signed-off-by: Robby Workman <2f5326e16de92cfeea9ded47a50f5e7144bd5a01@slackbuilds.org>


From 56bdaae91ead1973beeab9c2606d879e2369ecf5 Mon Sep 17 00:00:00 2001
From: JD <jean.daniel.michaud@gmail.com>
Date: Fri, 5 May 2017 13:36:24 +0200
Subject: [PATCH] Add CMakeLists.txt

---
 CMakeLists.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..744c0db
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+project(rc-switch)
+
+add_definitions(-std=c++03)
+
+add_definitions(-DRPI)
+
+#-----------------------------------------------------------------------
+# Setup Library
+#-----------------------------------------------------------------------
+add_library(rc-switch STATIC
+  RCSwitch.cpp
+)
+
+set_target_properties(rc-switch PROPERTIES PUBLIC_HEADER "RCSwitch.h")
+
+install(
+	TARGETS rc-switch
+	ARCHIVE DESTINATION lib
+	PUBLIC_HEADER DESTINATION include
+)
+
--
2.7.4

From 56bdaae91ead1973beeab9c2606d879e2369ecf5 Mon Sep 17 00:00:00 2001
From: JD <jean.daniel.michaud@gmail.com>
Date: Fri, 5 May 2017 13:36:24 +0200
Subject: [PATCH] Add CMakeLists.txt

---
 CMakeLists.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..744c0db
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+project(rc-switch)
+
+add_definitions(-std=c++03)
+
+add_definitions(-DRPI)
+
+#-----------------------------------------------------------------------
+# Setup Library
+#-----------------------------------------------------------------------
+add_library(rc-switch STATIC
+  RCSwitch.cpp
+)
+
+set_target_properties(rc-switch PROPERTIES PUBLIC_HEADER "RCSwitch.h")
+
+install(
+	TARGETS rc-switch
+	ARCHIVE DESTINATION lib
+	PUBLIC_HEADER DESTINATION include
+)
+
--
2.7.4

Fix rcswitch patch line numbering.

Fix rcswitch patch line numbering.


--- plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionApiITest.java
+++ plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionApiITest.java
@@ -32,6 +32,7 @@ import org.eclipse.che.plugin.svn.shared.SubversionItem;
 import org.eclipse.che.plugin.svn.shared.SwitchRequest;
 import org.eclipse.che.plugin.svn.shared.UpdateRequest;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -339,6 +340,7 @@ public class SubversionApiITest {
         assertTrue(coRevision <= response.getRevision());
     }

+    @Ignore
     @Test
     public void testInfo() throws Exception {
         subversionApi.checkout(DtoFactory.getInstance()

--- plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionApiITest.java
+++ plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionApiITest.java
@@ -339,6 +340,7 @@ public class SubversionApiITest {
         assertTrue(coRevision <= response.getRevision());
     }

+    @org.junit.Ignore
     @Test
     public void testInfo() throws Exception {
         subversionApi.checkout(DtoFactory.getInstance()

Use FQN for import so we don't change the import order

Change-Id: I6530d7014bf8df9872879b8c44cafbed4bbe48fc
Signed-off-by: Florent BENOIT <aed23c9e57d07943853fa5abcd82c7d7f632be43@redhat.com>


diff --git a/data/scenarios/tutorial.sav b/data/scenarios/tutorial.sav
index 09e4614..c13385a 100644
--- a/data/scenarios/tutorial.sav
+++ b/data/scenarios/tutorial.sav
@@ -15,3 +15,3 @@ reason="Scenario"
 revision="2.5.99-alpha"
-rulesetdir="civ2civ3"
+rulesetdir="fcweb"
 improvement_size=68
@@ -313,3 +313,2 @@ set={"name","value","gamestart"
 "size",1,1
-"topology","WRAPX|ISO","WRAPX|ISO"
 "victories","",""

diff --git a/data/scenarios/tutorial.sav b/data/scenarios/tutorial.sav
index 09e4614..c13385a 100644
--- a/data/scenarios/tutorial.sav
+++ b/data/scenarios/tutorial.sav
@@ -15,3 +15,3 @@ reason="Scenario"
 revision="2.5.99-alpha"
-rulesetdir="civ2civ3"
+rulesetdir="classic"
 improvement_size=68
@@ -313,3 +313,2 @@ set={"name","value","gamestart"
 "size",1,1
-"topology","WRAPX|ISO","WRAPX|ISO"
 "victories","",""

Set classic instead of fcweb as ruleset in tutorial.


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

From b241077ba9afb80d72d93fb1437ba25bb011af99 Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Mon, 13 Jun 2011 14:06:21 -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 0x0501 /* IE 5 */
 #endif

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

Update patch to match Tk trunk and 8.5.10rc0.


diff --git a/base/process/launch.cc b/base/process/launch.cc
index c179b2f..9d40780 100644
--- a/base/process/launch.cc
+++ b/base/process/launch.cc
@@ -26,7 +26,7 @@ LaunchOptions::LaunchOptions()
       new_process_group(false)
 #if defined(OS_LINUX)
       , clone_flags(0)
-      , allow_new_privs(false)
+      , allow_new_privs(true)
       , kill_on_parent_death(false)
 #endif  // OS_LINUX
 #if defined(OS_POSIX)

Add patch to disable PR_SET_NO_NEW_PRIVS on child process


From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 8 May 2015 15:21:20 +0800
Subject: [PATCH] mon: remove unused variable

* as a side effect, this change silences
  http://tracker.ceph.com/issues/11576

Fixes: #11576
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/mon/OSDMonitor.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 73dcd5f..7caaa45 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
   } else if (prefix == "osd crush get-tunable") {
     string tunable;
     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
-    int value;
-    cmd_getval(g_ceph_context, cmdmap, "value", value);
     ostringstream rss;
     if (f)
       f->open_object_section("tunable");

Add missing boost 1.58 compat patch

ceph: Add missing boost 1.58 compat patch


--- ../src_base/common/net/minecraft/src/ChunkCache.java
+++ ../src_work/common/net/minecraft/src/ChunkCache.java
@@ -91,7 +91,15 @@
     {
         int var4 = (par1 >> 4) - this.chunkX;
         int var5 = (par3 >> 4) - this.chunkZ;
-        return this.chunkArray[var4][var5].getChunkBlockTileEntity(par1 & 15, par2, par3 & 15);
+        if (var4 >= 0 && var4 < this.chunkArray.length && var5 >= 0 && var5 < this.chunkArray[var4].length)
+        {
+            Chunk var6 = this.chunkArray[var4][var5];
+            return var6 == null ? null : var6.getChunkBlockTileEntity(par1 & 15, par2, par3 & 15);
+        }
+        else
+        {
+            return null;
+        }
     }

     @SideOnly(Side.CLIENT)
@@ -239,7 +247,12 @@
         {
             int var4 = (par1 >> 4) - this.chunkX;
             int var5 = (par3 >> 4) - this.chunkZ;
-            return this.chunkArray[var4][var5].getBlockMetadata(par1 & 15, par2, par3 & 15);
+            if (var4 >= 0 && var4 < this.chunkArray.length && var5 >= 0 && var5 < this.chunkArray[var4].length)
+            {
+                Chunk var6 = this.chunkArray[var4][var5];
+                return var6 == null ? 0 : var6.getBlockMetadata(par1 & 15, par2, par3 & 15);
+            }
+            return 0;
         }
     }

Fix bounds checking on chunkcache. Should fix a bunch of rp2 and maybe other extended tile entity code


--- libiwinfo/iwinfo_nl80211.c.orig	2012-11-13 09:13:34.691729653 -0500
+++ libiwinfo/iwinfo_nl80211.c	2012-11-13 09:15:56.697788249 -0500
@@ -1766,7 +1766,12 @@
 				goto out;

 			if (!iwinfo_ifmac(res))
+			{
+				/* 8192cu: If virtual interfaces are not supported
+				 * run the scan on the main interface */
+				nl80211_get_scanlist_nl(ifname, buf, len);
 				goto out;
+			}

 			/* if we can take the new interface up, the driver supports an
 			 * additional interface and there's no need to tear down the ap */

[wrt] Allow iwinfo nl80211 to scan without vinterface


Index: src/main/beos/SDL_BeApp.cc
===================================================================
--- src/main/beos/SDL_BeApp.cc	(revision 5545)
+++ src/main/beos/SDL_BeApp.cc	(working copy)
@@ -39,13 +39,15 @@

 static int StartBeApp(void *unused)
 {
+  if(!be_app) {
 	BApplication *App;

 	App = new BApplication("application/x-SDL-executable");

 	App->Run();
 	delete App;
-	return(0);
+  }
+ return(0);
 }

 /* Initialize the Be Application, if it's not already started */
@@ -86,7 +88,7 @@
 	++SDL_BeAppActive;

 	/* The app is running, and we're ready to go */
-	return(0);
+ return(0);
 }

 /* Quit the Be Application, if there's nothing left to do */

Patch from Gerasim Troeglazov to fix an issue with a false initialized BApplication when an attempt is make to create a second copy BApplication (first QtApp - the second in the SDL).


diff -urN libvorbis-1.2.3/configure.ac libvorbis-1.2.3-haiku/configure.ac
--- libvorbis-1.2.3/configure.ac	2009-07-09 10:02:25.000000000 +0000
+++ libvorbis-1.2.3-haiku/configure.ac	2009-09-13 21:56:38.000000000 +0000
@@ -185,6 +185,10 @@
 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+ 	*-*-haiku*)
+		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
+		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
  	*)
 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"

Patch to remove -Werror when building libvorbis on haiku


Binary files snap/SNAPCommand and snap-fixed/SNAPCommand differ
diff -rupN --exclude='*.o' --exclude='*.d' snap/SNAPLib/SortedDataWriter.cpp snap-fixed/SNAPLib/SortedDataWriter.cpp
--- snap/SNAPLib/SortedDataWriter.cpp	2015-05-06 18:39:48.000000000 -0400
+++ snap-fixed/SNAPLib/SortedDataWriter.cpp	2015-06-25 10:23:40.000000000 -0400
@@ -335,7 +335,7 @@ SortedDataFilterSupplier::mergeSort()
     }
     for (SortBlockVector::iterator i = blocks.begin(); i != blocks.end(); i++) {
         i->reader = readerSupplier->getDataReader(1, MAX_READ_LENGTH * 8, 0.0,
-            min(1UL << 23, max(1UL << 17, bufferSpace / blocks.size()))); // 128kB to 8MB buffer space per block
+            min(1ULL << 23, max(1ULL << 17, bufferSpace / blocks.size()))); // 128kB to 8MB buffer space per block
         i->reader->init(tempFileName);
         i->reader->reinit(i->start, i->bytes);
     }
Binary files snap/snap-aligner and snap-fixed/snap-aligner differ
Binary files snap/unit_tests and snap-fixed/unit_tests differ

Patch fixes compilation issue with SNAP

Patch fixes compilation issue with SNAP


Index: ui/events/win/events_win.cc
===================================================================
--- ui/events/win/events_win.cc	(revision 274914)
+++ ui/events/win/events_win.cc	(working copy)
@@ -236,7 +236,7 @@
     native_point.y = GET_Y_LPARAM(native_event.lParam);
   }
   ScreenToClient(native_event.hwnd, &native_point);
-  return gfx::win::ScreenToDIPPoint(gfx::Point(native_point));
+  return gfx::Point(native_point);
 }

 gfx::Point EventSystemLocationFromNative(

Fix hittest not working correctly on non client mouse messages on high DPI Windows.

Imported from:
http://src.chromium.org/viewvc/chrome?view=revision&revision=265722


diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index abfdaaf..290dcc3 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -42,6 +42,7 @@ proto_dhcp_setup() {
 	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
 	[ "$release" = 1 ] && release="-R" || release=
 	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
+	[ -z "$hostname" ] && hostname="$(uci_get system @system[0] hostname OpenWrt)"
 	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
 	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
 	[ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"

diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index abfdaaf..efebcdb 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -42,6 +42,7 @@ proto_dhcp_setup() {
 	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
 	[ "$release" = 1 ] && release="-R" || release=
 	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
+	[ -z "$hostname" ] && hostname="$(uci_get system @system[0] hostname OpenWrt)"
 	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
 	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
 	[ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
@@ -56,7 +57,7 @@ proto_dhcp_setup() {
 		-s /lib/netifd/dhcp.script \
 		-f -t 0 -i "$iface" \
 		${ipaddr:+-r $ipaddr} \
-		${hostname:+-H "$hostname"} \
+		${hostname:+-x hostname:"$hostname"} \
 		${vendorid:+-V "$vendorid"} \
 		$clientid $broadcast $release $dhcpopts
 }

[wrt] Update add hostname patch for compatibility with latest udhcpc


From fb17a037148873e548797941988f336243ecd8c0 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Wed, 11 Jul 2018 10:40:24 -0400
Subject: [PATCH] Move cape detection to save environment

The U-boot environment gets trampled on when restoring it from eMMC.
Since proper operation depends on the cape detection's environment
variable settings carrying forward to the boot scripts, this moves the
code to after the U-boot environment block is loaded.

It is unknown whether any code in between the first init and the late
init does anything based on cape detection. If it does, then this patch
breaks that code.
---
 board/ti/am335x/board.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index f4840d2..7dca157 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -1204,14 +1204,6 @@ int board_init(void)
 	}
 #endif

-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#ifdef CONFIG_TI_I2C_BOARD_DETECT
-	if (!board_is_pb() && !board_is_beaglelogic()) {
-		do_cape_detect();
-	}
-#endif
-#endif
-
 	return 0;
 }

@@ -1317,6 +1309,11 @@ int board_late_init(void)
 			env_set("serial#", board_serial);
 	}

+#ifdef CONFIG_TI_I2C_BOARD_DETECT
+	if (!board_is_pb() && !board_is_beaglelogic()) {
+		do_cape_detect();
+	}
+#endif
 	return 0;
 }
 #endif
--
2.7.4

Fix cape detection variables being lost

Fix cape detection variables being lost


diff --git a/DEPS b/DEPS
index c395874b2..a0c649c81 100644
--- a/DEPS
+++ b/DEPS
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -96,6 +96,7 @@ vars = {
   'dart_term_glyph_tag': '1.0.1',
   'dart_test_reflective_loader_tag': '0.1.8',
   'dart_test_tag': 'test-v1.6.4',
+  'dart_tflite_native_rev': '712b8a93fbb4caf83ffed37f154da88c2a517a91',
   'dart_typed_data_tag': '1.1.6',
   'dart_usage_tag': '3.4.0',
   'dart_watcher_rev': '0.9.7+12-pub',
@@ -343,6 +344,9 @@ deps = {
   'src/third_party/dart/third_party/pkg/test':
    Var('dart_git') + '/test.git' + '@' + Var('dart_test_tag'),

+  'src/third_party/dart/third_party/pkg/tflite_native':
+   Var('dart_git') + '/tflite_native.git' + '@' + Var('dart_tflite_native_rev'),
+
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git' + '@' + Var('dart_test_reflective_loader_tag'),

@@ -491,6 +495,16 @@ deps = {
      'dep_type': 'cipd',
    },

+   'src/third_party/dart/pkg/analysis_server/language_model': {
+     'packages': [
+       {
+        'package': 'dart/language_model',
+        'version': 'gABkW8D_-f45it57vQ_ZTKFwev16RcCjvrdTCytEnQgC',
+       }
+     ],
+     'dep_type': 'cipd',
+   },
+
   'src/flutter/third_party/gn': {
     'packages': [
       {

[gardening] Fix flutter hhh with patch for https://github.com/dart-lang/sdk/commit/5d5a0c0164fa013ebcfa7a14bdfce59d8e11f043

Change-Id: I332c00726ea58b045b2ded59a0c500b11e41c8f8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111304
Reviewed-by: Alexander Aprelev <dfb74c35a357c2059971a4bf7fe26b6a7c18085d@google.com>


diff -ur occt-V7_5_0.orig/src/Aspect/Aspect_OpenVRSession.cxx occt-V7_5_0/src/Aspect/Aspect_OpenVRSession.cxx
--- occt-V7_5_0.orig/src/Aspect/Aspect_OpenVRSession.cxx	2020-11-26 11:27:09.822443300 +0100
+++ occt-V7_5_0/src/Aspect/Aspect_OpenVRSession.cxx	2020-11-26 11:30:38.912514000 +0100
@@ -168,7 +168,7 @@
   vr::IVRSystem*          System; //!< OpenVR session object

   //! Empty constructor.
-  Aspect_OpenVRSession::VRContext() : System (NULL)
+  VRContext() : System (NULL)
   {
     memset (TrackedPoses, 0, sizeof(TrackedPoses));
   }

Add a patch to fix opencascade compilation when using openvr


Enable log2_test in uclibc testsuite

uclibc-svn: Enable log2_test in uclibc testsuite


--- ../src-base/minecraft/net/minecraft/item/ItemStack.java
+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
@@ -45,6 +45,7 @@
     private EntityItemFrame field_82843_f;
     private static final String __OBFID = "CL_00000043";

+    private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
     public ItemStack(Block p_i1876_1_)
     {
         this(p_i1876_1_, 1);
@@ -72,7 +73,7 @@

     public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_)
     {
-        this.field_151002_e = p_i1881_1_;
+        func_150996_a(p_i1881_1_);
         this.field_77994_a = p_i1881_2_;
         this.field_77991_e = p_i1881_3_;

@@ -106,7 +107,7 @@

     public Item func_77973_b()
     {
-        return this.field_151002_e;
+        return this.delegate.get();
     }

     @SideOnly(Side.CLIENT)
@@ -744,6 +745,7 @@

     public void func_150996_a(Item p_150996_1_)
     {
+        this.delegate = p_150996_1_ != null ? p_150996_1_.delegate : null;
         this.field_151002_e = p_150996_1_;
     }

Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync.


diff -Npru stock-framework/framework-res.out/res/values/bools.xml voice-framework/framework-res.out/res/values/bools.xml
--- stock-framework/framework-res.out/res/values/bools.xml	2012-08-27 16:49:41.829655624 -0500
+++ voice-framework/framework-res.out/res/values/bools.xml	2012-08-27 16:51:54.166311846 -0500
@@ -46,1 +46,1 @@
-    <bool name="config_voice_capable">false</bool>
+    <bool name="config_voice_capable">true</bool>

Add 'voice' support for 4.3

Add 'voice' support for 4.3


Index: tools/clang/include/clang/Parse/Parser.h
===================================================================
--- tools/clang/include/clang/Parse/Parser.h	(revision 160958)
+++ tools/clang/include/clang/Parse/Parser.h	(working copy)
@@ -277,7 +277,7 @@
   /// the EOF was encountered.
   bool ParseTopLevelDecl(DeclGroupPtrTy &Result);

-private:
+protected:
   //===--------------------------------------------------------------------===//
   // Low-Level token peeking and consumption methods.
   //
@@ -676,7 +676,7 @@
     return Diag(Tok, DiagID);
   }

-private:
+protected:
   void SuggestParentheses(SourceLocation Loc, unsigned DK,
                           SourceRange ParenRange);
   void CheckNestedObjCContexts(SourceLocation AtLoc);

Add a patch in clang for testing. It will allow us to use the lookup functions on platforms where the visibility modifiers are part of the linker symbols (Eg. windows).

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@45358 27541ba8-7e3a-0410-8455-c3a389f83636


diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -424,10 +424,16 @@ class MSVCCompiler(CCompiler) :
                                           '/Z7', '/D_DEBUG']

         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
+        if self.__version >= 10:
+            self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO', '/Manifest']
         if self.__version >= 7:
             self.ldflags_shared_debug = [
                 '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
                 ]
+        if self.__version >= 10:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None', '/Manifest'
+                ]
         self.ldflags_static = [ '/nologo']

         self.initialized = True

Add 'msvc9compiler' patch to support VS10

This patch should be applied to 'msvc9compiler.py' in order to allow
successful compilation of python module (for example numpy) using recent
version of visual studio (VS10 and above).

The issue has been discussed here:

   http://bugs.python.org/issue16296

It solves the following error occurring when building Numpy:

// -------------------------------------------------------
c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\cl.exe /c /nologo /Ox /MD /W3 /GS- /DNDEBUG -Inumpy\cor
e\src\private -Inumpy\core\src -Inumpy\core -Inumpy\core\src\npymath -Inumpy\core\src\multiarray -Inumpy\core\src\umath
-Inumpy\core\include -IC:\P\SarrpTPS-64-R\Slicer-build\python-install\include -IC:\P\SarrpTPS-64-R\Slicer-build\python-i
nstall\PC /Tc_configtest.c /Fo_configtest.obj
Found executable c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\cl.exe
c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\link.exe /nologo /INCREMENTAL:NO _configtest.obj /OUT:_
configtest.exe /MANIFESTFILE:_configtest.exe.manifest
Found executable c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\link.exe
mt.exe -nologo -manifest _configtest.exe.manifest -outputresource:_configtest.exe;1
Found executable C:\Program Files\Microsoft SDKs\Windows\v7.1\bin\x64\mt.exe

_configtest.exe.manifest : general error c1010070: Failed to load and parse the manifest. The system cannot find the fil
e specified.
failure.
removing: _configtest.c _configtest.obj
Traceback (most recent call last):
  File "setup.py", line 187, in <module>
    setup_package()
  File "setup.py", line 180, in setup_package
    configuration=configuration )
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\core.py", line 186, in setup
    return old_setup(**new_attr)
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\core.py", line 152, in setup
    dist.run_commands()
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\dist.py", line 953, in run_commands
    self.run_command(cmd)
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\dist.py", line 972, in run_command
    cmd_obj.run()
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\command\build.py", line 37, in run
    old_build.run(self)
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\command\build.py", line 127, in run
    self.run_command(cmd_name)
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\cmd.py", line 326, in run_command
    self.distribution.run_command(command)
  File "C:\P\SarrpTPS-64-R\Slicer-build\python-install\Lib\distutils\dist.py", line 972, in run_command
    cmd_obj.run()
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\command\build_src.py", line 152, in run
    self.build_sources()
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\command\build_src.py", line 163, in build_sources
    self.build_library_sources(*libname_info)
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\command\build_src.py", line 298, in build_library_sources
    sources = self.generate_sources(sources, (lib_name, build_info))
  File "C:\P\SarrpTPS-64-R\Slicer-build\NUMPY\numpy\distutils\command\build_src.py", line 385, in generate_sources
    source = func(extension, build_dir)
  File "numpy\core\setup.py", line 657, in get_mathlib_info
    raise RuntimeError("Broken toolchain: cannot link a simple C program")
RuntimeError: Broken toolchain: cannot link a simple C program
// -------------------------------------------------------

Note that an alternative approach consisting in changing

   mfinfo = self.manifest_get_embed_info(target_desc, ld_args)

into

   mfinfo = None

has also been discussed here:

  http://mail.scipy.org/pipermail/numpy-discussion/2012-November/064488.html


From d1697181aaefb53c6c1b3e45a0ef275dd5d4272e Mon Sep 17 00:00:00 2001
From: Cheng-mean Liu <soccerl@microsoft.com>
Date: Tue, 11 Jul 2017 16:58:26 -0700
Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page
 size)

Signed-off-by: Cheng-mean Liu <soccerl@microsoft.com>
Origin: https://github.com/Microsoft/opengcs/blob/master/kernelconfig/4.11/patch_lower-the-minimum-PMEM-size.patch
---
 include/uapi/linux/ndctl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 3f03567631cb..e63c201ed1ef 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -263,7 +263,7 @@ enum nd_driver_flags {
 };

 enum {
-	ND_MIN_NAMESPACE_SIZE = 0x00400000,
+	ND_MIN_NAMESPACE_SIZE = 0x00001000,
 };

 enum ars_masks {
--
2.15.0

Add NVDIMM size patch to 4.14.x

kernel: Add NVDIMM size patch to 4.14.x

This change hasn't made it upstream but seems to be required
for LCOW to work.

Signed-off-by: Rolf Neugebauer <6fdd1d8677ab4fbcb4df3eff6e190c3298f7f742@docker.com>


Add true support for unicode fonts

Add true support for unicode fonts


diff --git a/include/v8.h b/include/v8.h
index baf44170f0..88cf5c7a91 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -6786,6 +6786,9 @@ class V8_EXPORT Isolate {
   V8_DEPRECATE_SOON("CpuProfiler should be created with CpuProfiler::New call.",
                     CpuProfiler* GetCpuProfiler());

+  /** Returns the ArrayBuffer::Allocator used in this isolate. */
+  ArrayBuffer::Allocator* GetArrayBufferAllocator();
+
   /** Returns true if this isolate has a current context. */
   bool InContext();

diff --git a/src/api.cc b/src/api.cc
index beefd61bdb..09ed5e0af8 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -7998,6 +7998,12 @@ CpuProfiler* Isolate::GetCpuProfiler() {
 }

+ArrayBuffer::Allocator* Isolate::GetArrayBufferAllocator() {
+  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
+  return isolate->array_buffer_allocator();
+}
+
+
 bool Isolate::InContext() {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
   return isolate->context() != NULL;

Add patch to add Isolate::GetArrayBufferAllocator API


patch-package
new file mode 100644
--- /dev/null
+++ b/node_modules/relay-mock-network-layer/RelayMockNetworkLayerError.js
@@ -0,0 +1,31 @@
+function RelayMockNetworkLayerError(errors) {
+  const distinctMessages = errors
+    .map(e => e.message)
+    .filter((value, index, messages) => messages.indexOf(value) === index)
+  const instance = new Error(
+    "RelayMockNetworkLayerError: " + distinctMessages.join(" - ")
+  )
+  instance.originalErrors = errors
+  Object.setPrototypeOf(instance, Object.getPrototypeOf(this))
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(instance, RelayMockNetworkLayerError)
+  }
+  return instance
+}
+
+RelayMockNetworkLayerError.prototype = Object.create(Error.prototype, {
+  constructor: {
+    value: Error,
+    enumerable: false,
+    writable: true,
+    configurable: true,
+  },
+})
+
+if (Object.setPrototypeOf) {
+  Object.setPrototypeOf(RelayMockNetworkLayerError, Error)
+} else {
+  RelayMockNetworkLayerError.__proto__ = Error
+}
+
+module.exports = RelayMockNetworkLayerError
--- a/node_modules/relay-mock-network-layer/index.js
+++ b/node_modules/relay-mock-network-layer/index.js
@@ -2,6 +2,7 @@

 const { makeExecutableSchema, addMockFunctionsToSchema } = require('graphql-tools');
 const { graphql, printSchema, buildClientSchema } = require('graphql');
+const RelayMockNetworkLayerError = require("./RelayMockNetworkLayerError")

 module.exports = function getNetworkLayer({schema, mocks, resolvers}) {
     return function fetchQuery(
@@ -19,12 +20,11 @@ module.exports = function getNetworkLayer({schema, mocks, resolvers}) {

         return graphql(executableSchema, operation.text, null, null, variableValues).then(
             // Trigger Relay error in case of GraphQL errors (or errors in mutation response)
-            // NOTICE that data might contain values even when errors are present
             // See https://github.com/facebook/relay/issues/1816

             result => {
                 if (result.errors && result.errors.length > 0) {
-                    return Promise.reject(result);
+                    return Promise.reject(new RelayMockNetworkLayerError(result.errors));
                 }
                 return Promise.resolve(result);
             }
@@ -32,3 +32,4 @@ module.exports = function getNetworkLayer({schema, mocks, resolvers}) {
     }
 };

+

Patch to throw single error.

[relay-mock-network-layer] Patch to throw single error.


--- lib/stdio.in.h_org	2014-04-26 01:24:51.806205276 +0200
+++ lib/stdio.in.h	2014-04-26 01:24:37.058176287 +0200
@@ -180,8 +180,10 @@
 /* It is very rare that the developer ever has full control of stdin,
    so any use of gets warrants an unconditional warning.  Assume it is
    always declared, since it is required by C89.  */
+#if defined gets
 #undef gets
 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif

 #if @GNULIB_FOPEN@
 # if @REPLACE_FOPEN@

Fix Bison 2.5 compilation with DSM5 toolchain


Index: configure
===================================================================
--- configure	(revision 17469)
+++ configure	(working copy)
@@ -1461,16 +1461,21 @@
         esac
         SHFLAGS=-nostart
         # enable BeOS things
-        enable audio_beos
+        # enable audio_beos
         # no need for libm, but the inet stuff
         # Check for BONE
         # XXX: actually should check for NOT net_server
-        if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
-            network_extralibs="-lbind -lsocket"
+        if [ $target_os = "haiku" ]; then
+            network_extralibs="-lnetwork"
         else
-            enable beos_netserver
-            network_extralibs="-lnet"
+            if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
+                network_extralibs="-lbind -lsocket"
+            else
+                enable beos_netserver
+                network_extralibs="-lnet"
+            fi
         fi ;;
+
     sunos)
         FFSERVERLDFLAGS=""
         SHFLAGS='-shared -Wl,-h,$$(@F)'

Patch to allow building ffmeg on haiku, taken from a patch by kaliber for tiltos. Not that this disables beos code since it's currently broken.


Index: taglib/toolkit/tstring.h
===================================================================
--- taglib/toolkit/tstring.h	(revision 989741)
+++ taglib/toolkit/tstring.h	(working copy)
@@ -31,7 +31,11 @@
 #include "tbytevector.h"

 #include <string>
+#ifdef __HAIKU__
+#include <iostream>
+#else
 #include <ostream>
+#endif

 /*!
  * \relates TagLib::String
Index: taglib/toolkit/tbytevector.h
===================================================================
--- taglib/toolkit/tbytevector.h	(revision 989741)
+++ taglib/toolkit/tbytevector.h	(working copy)
@@ -30,7 +30,11 @@
 #include "taglib_export.h"

 #include <vector>
+#ifdef __HAIKU__
+#include <iostream>
+#else
 #include <ostream>
+#endif

 namespace TagLib {

Patch for svn version of taglib to allow it to build on Haiku


diff --git a/ui/accelerated_widget_mac/io_surface_layer.mm b/ui/accelerated_widget_mac/io_surface_layer.mm
index 1f4da95..8540e91 100644
--- a/ui/accelerated_widget_mac/io_surface_layer.mm
+++ b/ui/accelerated_widget_mac/io_surface_layer.mm
@@ -182,6 +182,7 @@ void IOSurfaceLayerHelper::EndPumpingFrames() {
       return nil;
     }

+    if (!ui::GpuSwitchingManager::UseTransparent())
     [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
     [self setAnchorPoint:CGPointMake(0, 0)];
     // Setting contents gravity is necessary to prevent the layer from being
diff --git a/ui/gl/gpu_switching_manager.cc b/ui/gl/gpu_switching_manager.cc
index 23fc2ff..ed36310 100644
--- a/ui/gl/gpu_switching_manager.cc
+++ b/ui/gl/gpu_switching_manager.cc
@@ -16,6 +16,12 @@

 namespace ui {

+namespace {
+
+bool g_use_transparent = false;
+
+} // namespace
+
 struct GpuSwitchingManager::PlatformSpecific {
 #if defined(OS_MACOSX)
   CGLPixelFormatObj discrete_pixel_format;
@@ -27,6 +33,16 @@ GpuSwitchingManager* GpuSwitchingManager::GetInstance() {
   return Singleton<GpuSwitchingManager>::get();
 }

+// static
+void GpuSwitchingManager::SetTransparent(bool transparent) {
+  g_use_transparent = transparent;
+}
+
+// static
+bool GpuSwitchingManager::UseTransparent() {
+  return g_use_transparent;
+}
+
 GpuSwitchingManager::GpuSwitchingManager()
     : gpu_switching_option_(gfx::PreferIntegratedGpu),
       gpu_switching_option_set_(false),
diff --git a/ui/gl/gpu_switching_manager.h b/ui/gl/gpu_switching_manager.h
index a6a810f..2a50bd8 100644
--- a/ui/gl/gpu_switching_manager.h
+++ b/ui/gl/gpu_switching_manager.h
@@ -20,6 +20,9 @@ class GL_EXPORT GpuSwitchingManager {
   // Getter for the singleton. This will return NULL on failure.
   static GpuSwitchingManager* GetInstance();

+  static void SetTransparent(bool transparent);
+  static bool UseTransparent();
+
   // Set the switching option to PreferIntegratedGpu.
   void ForceUseOfIntegratedGpu();
   // Set the switching option to PreferDiscreteGpu; switch to discrete GPU

Add patch to allow showing transparent window


diff -urN neon-0.28.3/macros/neon.m4 neon-0.28.3-haiku/macros/neon.m4
--- neon-0.28.3/macros/neon.m4	2008-12-08 08:30:42.000000000 -0800
+++ neon-0.28.3-haiku/macros/neon.m4	2008-12-08 08:12:43.000000000 -0800
@@ -626,7 +626,7 @@

 # Unixware 7 can only link gethostbyname with -lnsl -lsocket
 # Pick up -lsocket first, then the gethostbyname check will work.
-NE_SEARCH_LIBS(socket, socket inet ws2_32)
+NE_SEARCH_LIBS(socket, socket inet ws2_32 network)

 # Enable getaddrinfo support if it, gai_strerror and inet_ntop are
 # all available.
@@ -659,7 +659,7 @@
    # Checks for non-getaddrinfo() based resolver interfaces.
    # QNX has gethostbyname in -lsocket. BeOS only has it in -lbind.
    # CygWin/Winsock2 has it in -lws2_32, allegedly.
-   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32)
+   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32 network)
    NE_SEARCH_LIBS(hstrerror, resolv,,[:])
    NE_CHECK_FUNCS(hstrerror)
    # Older Unixes don't declare h_errno.

Patch to add -lnetwork to neon

Patch to add -lnetwork to neon


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

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

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

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

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

Fix vanilla texture bug causing rotated textures to be placed wrong.


diff --git a/builtin-run.c b/builtin-run.c
index 54e03be..fab97e0 100644
--- a/builtin-run.c
+++ b/builtin-run.c
@@ -633,16 +633,38 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)

 static int kvm_cmd_run_work(struct kvm *kvm)
 {
-	int i;
-	void *ret = NULL;
-
-	for (i = 0; i < kvm->nrcpus; i++) {
-		if (pthread_create(&kvm->cpus[i]->thread, NULL, kvm_cpu_thread, kvm->cpus[i]) != 0)
-			die("unable to create KVM VCPU thread");
-	}
-
-	/* Only VCPU #0 is going to exit by itself when shutting down */
-	return pthread_join(kvm->cpus[0]->thread, &ret);
+        int i;
+        int exit_status = 0;
+
+        for (i = 0; i < kvm->nrcpus; i++) {
+                if (pthread_create(&kvm->cpus[i]->thread, NULL, kvm_cpu_thread, kvm->cpus[i]) != 0)
+                        die("unable to create KVM VCPU thread");
+        }
+
+        /*
+         * Only VCPU #0 is going to exit by itself when shutting down
+         *
+         * BUT It's not actually true for reboot sequence
+         * Reboot is sending SIGKVMEXIT signal to all cpus
+         * and that is causing race condition on removing
+         * devices (which are pausing exiting cpus).
+         * This piece of code waits for death of all
+         * cpu threads
+         */
+         for (i = 0; i < kvm->nrcpus; i++) {
+
+                void* thrstatus = NULL;
+
+                int retval = pthread_join(kvm->cpus[i]->thread, &thrstatus);
+
+                if (retval != 0)
+                        die("unable to end KVM VCPU thread");
+
+                /* Set exit status if one of vcpus returns error code > 0 */
+                if ((intptr_t) thrstatus != 0)
+                        exit_status = (intptr_t) thrstatus;
+        }
+        return exit_status;
 }

 static void kvm_cmd_run_exit(struct kvm *kvm, int guest_ret)

Fix for dead lock while rebooting VM

kvm: Fix for dead lock while rebooting VM

This patch is fixing dead lock issue in lkvm. When VM is sending
reboot signal to lkvm then lkvm is sending SIGKVMEXIT to all cpu threads.
When first cpu became closed, pci-devices are checking which cpus are still
alive and send to them SIGKVMPAUSE signal(for detaching, pci-devices require
threads in pause or exited  state). After this signal, devices are waiting
for response from threads.

Main problem in this bug is situation when cpu thread becames exited and
SIGKVMPAUSE signal was sent. In this situation Pci-device is still waiting
for notification from closed thread.

To fix this bug I am waiting for exit status from all cpus before, turning
down devices


--- a/allocator_shim_default_dispatch_to_glibc.cc	2017-05-17 18:39:38.382158007 +0000
+++ b/allocator_shim_default_dispatch_to_glibc.cc	2017-05-17 18:40:04.402132228 +0000
@@ -9,11 +9,11 @@
 // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.

 extern "C" {
-void* __libc_malloc(size_t size);
-void* __libc_calloc(size_t n, size_t size);
-void* __libc_realloc(void* address, size_t size);
-void* __libc_memalign(size_t alignment, size_t size);
-void __libc_free(void* ptr);
+void* malloc(size_t size);
+void* calloc(size_t n, size_t size);
+void* realloc(void* address, size_t size);
+void* memalign(size_t alignment, size_t size);
+void free(void* ptr);
 }  // extern "C"

 namespace {
@@ -21,23 +21,23 @@
 using base::allocator::AllocatorDispatch;

 void* GlibcMalloc(const AllocatorDispatch*, size_t size) {
-  return __libc_malloc(size);
+  return malloc(size);
 }

 void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) {
-  return __libc_calloc(n, size);
+  return calloc(n, size);
 }

 void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) {
-  return __libc_realloc(address, size);
+  return realloc(address, size);
 }

 void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) {
-  return __libc_memalign(alignment, size);
+  return memalign(alignment, size);
 }

 void GlibcFree(const AllocatorDispatch*, void* address) {
-  __libc_free(address);
+  free(address);
 }

 }  // namespace

Fix weird use of __libc allocation function.


diff -ru orig/haskell-packages.cabal new/haskell-packages.cabal
--- orig/haskell-packages.cabal	2014-02-20 12:04:23.945608732 +0200
+++ new/haskell-packages.cabal	2014-02-20 12:04:23.000000000 +0200
@@ -48,6 +48,6 @@
     , containers
     , mtl >= 2.1
     , hse-cpp
-    , EitherT
+    , either
     , haskell-src-exts >= 1.14
     , tagged

Drop usage of EitherT in haskell-packages


--- configure.in.orig	2014-01-16 09:49:33.000000000 -0800
+++ configure.in	2015-09-23 09:21:26.000000000 -0700
@@ -249,8 +257,14 @@
               elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
                  mac_version_min="-mmacosx-version-min=10.4"
                  mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
+              elif xcodebuild -version -sdk macosx10.10 Path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.4"
+                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.10 Path`"
+              elif xcodebuild -version -sdk macosx10.11 Path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.4"
+                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.11 Path`"
               else
-                 AC_MSG_ERROR([Couldn't find 10.5, 10.6, 10.7, 10.8 or 10.9 SDK])
+                 AC_MSG_ERROR([Couldn't find 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, or 10.11 SDK])
               fi
            esac

Make build with MacOS SDK > 10.9

LIBPORTAUDIO: Make build with MacOS SDK > 10.9


diff -rupN celix2/dfi/private/src/json_rpc.c celix/dfi/private/src/json_rpc.c
--- celix2/dfi/private/src/json_rpc.c	2015-12-08 16:05:36.796271781 +0100
+++ celix/dfi/private/src/json_rpc.c	2015-12-08 15:22:03.697788535 +0100
@@ -172,7 +172,7 @@ int jsonRpc_call(dyn_interface_type *int
                     }
                     if (dynType_descriptorType(typedType) == 't') {
                         status = jsonSerializer_serializeJson(typedType, (void*) &ptr, &jsonResult);
-                        free(ptr);
+                        //free(ptr);
                     } else {
                         dyn_type *typedTypedType = NULL;
                         if (status == OK) {
Binary files celix2/.git/index and celix/.git/index differ

Add patch to outcomment problematic dfi free


--- a/src/asmjit/x86/x86assembler.cpp
+++ b/src/asmjit/x86/x86assembler.cpp
@@ -692,6 +692,10 @@ char* X86Assembler_dumpOperand(char* buf, const Operand* op, uint32_t memRegType
       *buf++ = ' ';
       *buf++ = (d < 0) ? '-' : '+';
       *buf++ = ' ';
+      if (d > 9 || d < -9) {
+        *buf++ = '0';
+        *buf++ = 'x';
+      }
       buf = StringUtil::utoa(buf, d < 0 ? -d : d);
     }

@@ -700,8 +704,12 @@ char* X86Assembler_dumpOperand(char* buf, const Operand* op, uint32_t memRegType
   }
   else if (op->isImm())
   {
-    const Imm& i = reinterpret_cast<const Imm&>(*op);
-    return StringUtil::itoa(buf, (sysint_t)i.getValue());
+    sysint_t i = reinterpret_cast<const Imm&>(*op).getValue();
+    if (i > 9 || i < 0) {
+      *buf++ = '0';
+      *buf++ = 'x';
+    }
+    return StringUtil::utoa(buf, i, 16U);
   }
   else if (op->isLabel())
   {
@@ -720,6 +728,9 @@ static char* X86Assembler_dumpInstruction(char* buf,
   const Operand* o2,
   uint32_t memRegType) ASMJIT_NOTHROW
 {
+  // Prefix with TAB for readability.
+  buf = StringUtil::copy(buf, "\t", 1);
+
   if (emitOptions & kX86EmitOptionRex)
     buf = StringUtil::copy(buf, "rex ", 4);

@@ -2707,7 +2718,7 @@ void X86Assembler::embedLabel(const Label& label) ASMJIT_NOTHROW
 void X86Assembler::align(uint32_t m) ASMJIT_NOTHROW
 {
   if (!canEmit()) return;
-  if (_logger) _logger->logFormat(".align %u", (uint)m);
+  if (_logger) _logger->logFormat(".align %u\n", (uint)m);

   if (!m) return;

Gather changes made to asmjit into a single patch file


diff --git a/wmcontroller.services.yml b/wmcontroller.services.yml
index 7963b33..562dd0d 100644
--- a/wmcontroller.services.yml
+++ b/wmcontroller.services.yml
@@ -180,7 +180,7 @@ services:
         class: Drupal\wmcontroller\Http\Middleware\Cache
         arguments: ['@event_dispatcher']
         tags:
-            - { name: http_middleware, priority: 250, responder: true }
+            - { name: http_middleware, priority: 49, responder: true }

     wmcontroller.cache.invalidator:
         class: Drupal\wmcontroller\Service\Cache\Invalidator

Add patch for caching _only_ anonymous users without a CDN.

Currently our implementation expects admins and editors to get
served from a separate CDN where anonymous users don't get cached.
We usually check if the hostname starts with 'admin', and if so
we block access for anonymous users.

We do this because it allows us to shave off a lot of bootstrapping.
Most notably, we don't have to wait for the SessionManager to
do it's thing and create a Session. Waiting for it is especially
stupid when you are 100% certain you'd be serving an anonymous user.

However, without a separate CDN that guarantees we only serve
anonymous users AND without session-info we can't determine
if the user performing the request is anonymous or logged in
nor what role the account has.

So right now you always get served a cached page, even when logged in.

We have a lot of high performance sites and we don't feel comfortable
losing the speed gains we have by not waiting for the session.
Yet we understand not everybody gets to add a separate CDN between
logged-in and non-logged in users. Therefore we added this patch.

Basically it makes sure our Cache middleware runs after the Session middleware.


--- lib/heroku/command/base.rb.orig	2014-05-30 02:26:32.109330483 -0400
+++ lib/heroku/command/base.rb	2014-05-30 02:26:59.774175182 -0400
@@ -221,7 +221,7 @@
       remotes[remote]
     else
       apps = remotes.values.uniq
-      if apps.size == 1
+      if apps.size >= 1
         apps.first
       else
         raise(Heroku::Command::CommandFailed, "Multiple apps in folder and no app specified.\nSpecify app with --app APP.") unless options[:ignore_no_app]

Patch heroku toolbelt to default to the first heroku app for commands


From 4cf8a0871a794a9bb483fb11047c4ce8d7750a82 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@silklabs.com>
Date: Fri, 14 Oct 2016 10:35:32 -0700
Subject: [PATCH] Remove use of non-standard get_device_compatible()

This edify function only exists in some CAF trees, and notably does not exist in
AOSP trees.

Change-Id: Iaff33726b2fef0c8df81a3776d2c1e61db23f43b
---
 tools/releasetools/edify_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 89840c6..e52c264 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -116,7 +116,7 @@ class EdifyGenerator(object):

   def AssertDevice(self, device):
     """Assert that the device identifier is the given string."""
-    cmd = ('get_device_compatible("%s") == "OK" || '
+    cmd = ('getprop("ro.product.device") == "%s" || '
            'abort("This package is for \\"%s\\" devices; '
            'this is a \\"" + getprop("ro.product.device") + "\\".");'
            ) % (device, device)
--
2.10.0