Mercurial > mxe-octave

changeset 5581:7af58cc647bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-sockets: update to v1.2.1 * src/of-sockets.mk: update version, checksum * src/of-sockets-1-cross-fixes.patch, src/of-sockets-2-deprecated.patch: deleted * dist-files.mk: update for deleted files
author John Donoghue <john.donoghue@ieee.org>
date Wed, 11 Nov 2020 07:52:21 -0500
parents 398a70d29c6e
children 65471ba1fc2a
files dist-files.mk src/of-sockets-1-cross-fixes.patch src/of-sockets-2-deprecated.patch src/of-sockets.mk
diffstat 4 files changed, 3 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Nov 03 13:31:41 2020 -0500
+++ b/dist-files.mk	Wed Nov 11 07:52:21 2020 -0500
@@ -517,8 +517,6 @@
   of-quaternion.mk \
   of-queueing.mk \
   of-signal.mk \
-  of-sockets-1-cross-fixes.patch \
-  of-sockets-2-deprecated.patch \
   of-sockets.mk \
   of-sparsersb.mk \
   of-specfun-1-deprecated.patch \
--- a/src/of-sockets-1-cross-fixes.patch	Tue Nov 03 13:31:41 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile
---- octave-sockets-1.2.0.orig/src/Makefile	2015-03-20 10:24:40.824141293 -0400
-+++ octave-sockets-1.2.0/src/Makefile	2015-03-20 11:31:54.325799984 -0400
-@@ -8,12 +8,15 @@
- SRC := $(OCT:.oct=.cc)
- 
- MKOCTFILE ?= mkoctfile -Wall
-+OCTAVE_CONFIG ?= octave-config
- OCTAVE ?= octave
- 
-+CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
-+
- #The following is necessary to get the sockets package working in Windows.
- #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw)
- EXTRALIBS := 
--ifeq ($(OS),Windows_NT)
-+ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
-   EXTRALIBS := -lws2_32
- endif
- 
--- a/src/of-sockets-2-deprecated.patch	Tue Nov 03 13:31:41 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -r a0f23a7c3bd0 src/socket.cc
---- a/src/socket.cc	Fri Jan 30 15:27:56 2015 +0100
-+++ b/src/socket.cc	Sun Dec 15 13:11:55 2019 +0100
-@@ -19,7 +19,7 @@
- // Octave Includes
- #include <octave/oct.h>
- #include <octave/parse.h>
--#include <octave/toplev.h>
-+#include <octave/interpreter.h>
- #include <octave/cmd-hist.h>
- #include <octave/symtab.h>
- #include <octave/variables.h>
-
--- a/src/of-sockets.mk	Tue Nov 03 13:31:41 2020 -0500
+++ b/src/of-sockets.mk	Wed Nov 11 07:52:21 2020 -0500
@@ -3,10 +3,10 @@
 
 PKG             := of-sockets
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.0
-$(PKG)_CHECKSUM := 8143ad6e18ce6b64911eedd7c318a34a039ddbd1
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := c3b62b8bca66c992d8f383b69e3094f02ea45dd8
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := octave-sockets-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := sockets-$($(PKG)_VERSION)
 $(PKG)_FILE     := sockets-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     :=