[Pkg-erlang-commits] r1993 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-12-14 08:45:31 +0000 (Thu, 14 Dec 2017)
New Revision: 1993

Removed:
   erlang/trunk/debian/patches/wxgl.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/clean.patch
   erlang/trunk/debian/patches/docs.patch
   erlang/trunk/debian/patches/gnu.patch
   erlang/trunk/debian/patches/man.patch
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream release.
  * Refreshed patches.
  * Removed a patch which fixed crash in OpenGL applications since it's
    already applied upstream.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/changelog	2017-12-14 08:45:31 UTC (rev 1993)
@@ -1,8 +1,11 @@
-erlang (1:20.1.7+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:20.2+dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Refreshed patches.
+  * Removed a patch which fixed crash in OpenGL applications since it's
+    already applied upstream.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 27 Nov 2017 09:03:10 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 14 Dec 2017 11:45:07 +0300
 
 erlang (1:20.1.7+dfsg-1) unstable; urgency=medium
 

Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/clean.patch	2017-12-14 08:45:31 UTC (rev 1993)
@@ -5,7 +5,7 @@
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1075,6 +1075,7 @@
+@@ -1087,6 +1087,7 @@
  	rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
  
  distclean: clean
  	find . -type f -name SKIP              -print | xargs $(RM)
-@@ -1116,3 +1117,205 @@
+@@ -1128,3 +1129,205 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------

Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/docs.patch	2017-12-14 08:45:31 UTC (rev 1993)
@@ -25,7 +25,7 @@
  
 --- a/lib/megaco/doc/src/Makefile
 +++ b/lib/megaco/doc/src/Makefile
-@@ -170,8 +170,6 @@
+@@ -158,8 +158,6 @@
  	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
  	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
  	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"

Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/gnu.patch	2017-12-14 08:45:31 UTC (rev 1993)
@@ -47,7 +47,7 @@
  #include <sys/sysctl.h>
 --- a/erts/emulator/drivers/common/inet_drv.c
 +++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -4602,6 +4602,11 @@
+@@ -4605,6 +4605,11 @@
      *x = addr;
      return 0;
  }

Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/man.patch	2017-12-14 08:45:31 UTC (rev 1993)
@@ -6,7 +6,7 @@
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -709,8 +709,10 @@
+@@ -710,8 +710,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/series	2017-12-14 08:45:31 UTC (rev 1993)
@@ -10,4 +10,3 @@
 wx3.0-constants.patch
 beamload.patch
 x32.patch
-wxgl.patch

Deleted: erlang/trunk/debian/patches/wxgl.patch
===================================================================
--- erlang/trunk/debian/patches/wxgl.patch	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/patches/wxgl.patch	2017-12-14 08:45:31 UTC (rev 1993)
@@ -1,47 +0,0 @@
-From 823cab1ec24af0235195b14ee66a8642e4913699 Mon Sep 17 00:00:00 2001
-From: Dan Gudmundsson <dgud at erlang.org>
-Date: Tue, 17 Oct 2017 10:28:51 +0200
-Subject: [PATCH] Correct io_vec handling
-Description: Can not depend on internal knowledge of binaries any more
- it changed and caused at least opengl to crash in OTP-20.1
-Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881156
-
---- a/lib/wx/c_src/wxe_driver.c
-+++ b/lib/wx/c_src/wxe_driver.c
-@@ -33,6 +33,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- 
-+#include <assert.h>
- #include "wxe_driver.h"
- 
- #define TEMP_BINARY_SIZE 512
-@@ -234,13 +235,21 @@ standard_outputv(ErlDrvData drv_data, ErlIOVec* ev)
-        sd->max_bins = max;
-    }
- 
--   if(ev->vsize == 2) {
--      binref->base = ev->iov[1].iov_base;
--      binref->size = ev->iov[1].iov_len;
--      binref->from = driver_caller(sd->port_handle);
--      bin = ev->binv[1];
--      driver_binary_inc_refc(bin); /* Otherwise it could get deallocated */
--      binref->bin = bin;
-+   if(ev->size > 0) {
-+       assert(ev->vsize == 2 && ev->iov[0].iov_len == 0
-+              && "erts changed how the ErlIOVec is structured for outputv");
-+       binref->from = driver_caller(sd->port_handle);
-+       binref->size = ev->iov[1].iov_len;
-+       if(ev->binv[1]) {
-+           binref->base = ev->iov[1].iov_base;
-+           bin = ev->binv[1];
-+           driver_binary_inc_refc(bin); /* Otherwise it could get deallocated */
-+       } else {
-+           bin = driver_alloc_binary(ev->iov[1].iov_len);
-+           memcpy(bin->orig_bytes, ev->iov[1].iov_base, ev->iov[1].iov_len);
-+           binref->base = bin->orig_bytes;
-+       }
-+       binref->bin = bin;
-    } else { /* Empty binary (becomes NULL) */
-       binref->base = NULL;
-       binref->size = 0;

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2017-12-08 12:08:39 UTC (rev 1992)
+++ erlang/trunk/debian/rules	2017-12-14 08:45:31 UTC (rev 1993)
@@ -501,7 +501,7 @@
 
 binary: binary-indep binary-arch
 
-REL=20.1.7
+REL=20.2
 DEB_REL=$(REL)+dfsg
 
 get-orig-source: