Mercurial > mxe-octave

changeset 3780:d638b6502197

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-sockets: update to 1.2.0 * build_packages.m: update sockets version to 1.2.0 * dist-files.mk: remove of-sockets-1-fixes.patch * src/of-sockets-1-fixes.patch: removed file * src/of-sockets.mk: update version, checksum
author John Donoghue <john.donoghue@ieee.org>
date Sun, 01 Feb 2015 20:03:55 -0500
parents 1c0d13ac788e
children d47462a144ad
files build_packages.m dist-files.mk src/of-sockets-1-fixes.patch src/of-sockets.mk
diffstat 4 files changed, 3 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Sun Feb 01 13:32:20 2015 -0500
+++ b/build_packages.m	Sun Feb 01 20:03:55 2015 -0500
@@ -35,7 +35,7 @@
 try_install windows-1.2.1.tar.gz
 try_install odepkg-0.8.4.tar.gz
 try_install linear-algebra-2.2.0.tar.gz
-try_install sockets-1.0.8.tar.gz
+try_install sockets-1.2.0.tar.gz
 try_install zenity-0.5.7.tar.gz
 try_install actuarial-1.1.0.tar.gz
 try_install data-smoothing-1.3.0.tar.gz
--- a/dist-files.mk	Sun Feb 01 13:32:20 2015 -0500
+++ b/dist-files.mk	Sun Feb 01 20:03:55 2015 -0500
@@ -464,7 +464,6 @@
   of-optim.mk \
   of-quaternion.mk \
   of-signal.mk \
-  of-sockets-1-fixes.patch \
   of-sockets.mk \
   of-specfun.mk \
   of-statistics.mk \
--- a/src/of-sockets-1-fixes.patch	Sun Feb 01 13:32:20 2015 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -ur sockets.orig/src/Makefile sockets/src/Makefile
---- sockets.orig/src/Makefile	2014-01-03 08:34:47.000000000 -0500
-+++ sockets/src/Makefile	2014-01-03 09:18:19.000000000 -0500
-@@ -1,6 +1,11 @@
- OCT = sockets.oct
- SRC := $(OCT:.oct=.cc)
- 
-+EXTRALIBS = 
-+ifeq ($(OS),Windows_NT)
-+  EXTRALIBS = -lws2_32
-+endif
-+
- #See which octave version we run by querying mkoctfile for its version
- #string. (Is there a better way to do this? This looks horrible.) 
- majorversion := $(shell  mkoctfile --version 2>&1  | sed  -e 's/[ .+]/\n/g' |sed  -n '3p')
-@@ -14,7 +19,7 @@
- all: $(OCT)
- 
- %.oct: %.cc
--	mkoctfile $(VFLAGS) -s $<
-+	mkoctfile $(VFLAGS) -s $< $(EXTRALIBS)
- 
- test: $(OCT)
- 	test_octave_sockets
--- a/src/of-sockets.mk	Sun Feb 01 13:32:20 2015 -0500
+++ b/src/of-sockets.mk	Sun Feb 01 20:03:55 2015 -0500
@@ -3,12 +3,11 @@
 
 PKG             := of-sockets
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.8
-$(PKG)_CHECKSUM := c4d4f6bea306dd4d722b3f7d8cf475a9fdd0dbba
+$(PKG)_VERSION  := 1.2.0
+$(PKG)_CHECKSUM := 8143ad6e18ce6b64911eedd7c318a34a039ddbd1
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := sockets
 $(PKG)_FILE     := sockets-$($(PKG)_VERSION).tar.gz
-$(PKG)_FIXED_FILE := sockets-$($(PKG)_VERSION)a.tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     :=