Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (35b0cdf902b45f35106aa38fc640455160f5de78)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (35b0cdf902b45f35106aa38fc640455160f5de78)
  • Date: Thu, 10 Jan 2019 10:55:57 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

net/iptables/HISTORY | 3 +++
net/iptables/PRE_BUILD | 19 +++++++++++++++++++
python-pypi/meson/DEPENDS | 1 +
python-pypi/meson/HISTORY | 3 +++
science/octave/DEPENDS | 6 ++++--
science/octave/DETAILS | 6 +++---
science/octave/HISTORY | 4 ++++
utils/lsscsi/DETAILS | 7 ++++---
utils/lsscsi/HISTORY | 3 +++
x11-toolkits/fltk/DETAILS | 9 +++++----
x11-toolkits/fltk/HISTORY | 4 ++++
xorg-lib/libxp/DEPENDS | 5 +++--
xorg-lib/libxp/HISTORY | 3 +++
xorg/xorgproto/CONFLICTS | 1 -
xorg/xorgproto/HISTORY | 3 +++
15 files changed, 62 insertions(+), 15 deletions(-)

New commits:
commit 35b0cdf902b45f35106aa38fc640455160f5de78
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libxp: needs printproto

commit 9b18906a47b6a76c490bb091326d26f9d987a8e7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xorgproto: does not conflict with printproto

Printproto is nothing anyone uses, but it's needed to build some things.
It is neglected by upstream, but still existing, independently.

commit 4021d65f9344730dc43cf4fda907a44faacff347
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

octave: update to 4.4.1, drop --without-blas to fix build

This spell still needs cleanup for correct dependencies and configuration,
but at least it builds at all now. Also, we will revisit this after
adding proper BLAS/LAPACK (openblas) choice.

commit b166883976381b6fbeff275da1b33316ceb748be
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

meson: depends on python3 with setuptools

commit 736815f76790e2a7f1dd90faa91224f86d43a7d7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lsscsi: update to 0.30, fixing build (for me)

commit 3b6967be536c15fde14cca1374619417205aabeb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fltk: update to 1.3.4-2, fixing symbol exports (for octave)

commit 0eed75132cb7850d7f4f8de94f48ba71edc2a57e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

iptables: build with <4.2 kernels

diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 0de7461..31062dc 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2019-01-01 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: added, fix build with older kernel headers (<4.2)
+
2018-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.2
* DEPENDS: added
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
new file mode 100755
index 0000000..cf75715
--- /dev/null
+++ b/net/iptables/PRE_BUILD
@@ -0,0 +1,19 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Avoid conflict with kernel headers before 4.2 .
+# See http://patchwork.ozlabs.org/patch/998781/ .
+patch -p1 << EOT
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index c3f087ac680c..bacf8cd92116 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,9 @@
+
+ #include <linux/types.h>
+
++#ifndef _NETINET_IN_H
+ #include <linux/in.h>
++#endif
+ #include <linux/in6.h>
+ #include <limits.h>
+EOT
diff --git a/python-pypi/meson/DEPENDS b/python-pypi/meson/DEPENDS
index 84f3c48..b0b697b 100755
--- a/python-pypi/meson/DEPENDS
+++ b/python-pypi/meson/DEPENDS
@@ -1,2 +1,3 @@
depends python3 &&
+depends -sub PYTHON3 setuptools &&
depends ninja-build-system
diff --git a/python-pypi/meson/HISTORY b/python-pypi/meson/HISTORY
index e0b53a8..111a570 100644
--- a/python-pypi/meson/HISTORY
+++ b/python-pypi/meson/HISTORY
@@ -1,3 +1,6 @@
+2019-01-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: setuptools
+
2018-12-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.49.0

diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS
index 518f8f0..9bfca7f 100755
--- a/science/octave/DEPENDS
+++ b/science/octave/DEPENDS
@@ -28,9 +28,11 @@ optional_depends readline \
#
# Untested
#
+# some BLAS is needed ... the switch for Atlas needs to be investigated.
+# We want OpenBLAS anyway.
optional_depends atlas \
- '--with-blas' \
- '--without-blas' \
+ '' \
+ '' \
'for automatically tuned linear algebra support' &&

optional_depends fftw \
diff --git a/science/octave/DETAILS b/science/octave/DETAILS
index 21de347..a43cf55 100755
--- a/science/octave/DETAILS
+++ b/science/octave/DETAILS
@@ -1,7 +1,7 @@
SPELL=octave
- VERSION=3.6.4
-
SOURCE_HASH=sha512:a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=4.4.1
+
SOURCE_HASH=sha512:e165f0638a18552d0b455b974eaffc774ffa03a2ea47c48998d12f52707cab249b8f9c5eb32dd20c9858babc31d23edb4b93be29abb0656c109e309f3d2585ca
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
LICENSE[0]=GPL
diff --git a/science/octave/HISTORY b/science/octave/HISTORY
index 1c25418..8e5c3c9 100644
--- a/science/octave/HISTORY
+++ b/science/octave/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: hot-update to 4.4.1, fixup needed for deps
+ * DEPENDS: --without-blas is no option (use LAPACK, at least)
+
2015-01-20 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Add dependency on LAPACK

diff --git a/utils/lsscsi/DETAILS b/utils/lsscsi/DETAILS
index 0b27f5e..cecf526 100755
--- a/utils/lsscsi/DETAILS
+++ b/utils/lsscsi/DETAILS
@@ -1,8 +1,9 @@
SPELL=lsscsi
- VERSION=0.28
-
SOURCE_HASH=sha512:6d5cf8ebc42af0d8dbe8f2a1e90f4c429d058f184027318686fd22bc117e66c0b1847e4c97964d3d0e1b7bf4a5f1e296e1e3575ed2f5ff999eef70bdfb9ea4d4
+ VERSION=0.30
+ FULLVERSION=030r154
+
SOURCE_HASH=sha512:ea1ba2bd2892b7e7feff0bf08ea09ffcdc38d21e4dba2cdce598d8ffde926a5908f2d02116d692bf4747b76c76c1c35974569583cb2da75eb49553959368dc76
SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$FULLVERSION
SOURCE_URL[0]=http://sg.danny.cz/scsi/$SOURCE
WEB_SITE=http://sg.danny.cz/scsi/lsscsi.html
ENTERED=20060309
diff --git a/utils/lsscsi/HISTORY b/utils/lsscsi/HISTORY
index 18f2028..30f51ac 100644
--- a/utils/lsscsi/HISTORY
+++ b/utils/lsscsi/HISTORY
@@ -1,3 +1,6 @@
+2019-01-01 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: 0.30
+
2014-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.28

diff --git a/x11-toolkits/fltk/DETAILS b/x11-toolkits/fltk/DETAILS
index 127ff74..91e7a4b 100755
--- a/x11-toolkits/fltk/DETAILS
+++ b/x11-toolkits/fltk/DETAILS
@@ -1,9 +1,10 @@
SPELL=fltk
- VERSION=1.3.3
-
SOURCE_HASH=sha512:277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
+ VERSION=1.3.4-2
+ XVERSION=$(echo $VERSION | cut -f 1 -d -)
+
SOURCE_HASH=sha512:cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d
SOURCE=$SPELL-$VERSION-source.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://fltk.org/pub/${SPELL}/${VERSION}/${SOURCE}
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://fltk.org/pub/${SPELL}/${XVERSION}/${SOURCE}
LICENSE[0]=GPL
WEB_SITE=http://www.fltk.org/
ENTERED=20011129
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index ff0e8a0..cc7a6ed 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Thomas Orgis <sobukus AT sourcemage.org<
+ * DETAILS: updated spell to 1.3.4-2
+ This shall fix octave build with exported symbols.
+
2015-04-27 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 1.3.3

diff --git a/xorg-lib/libxp/DEPENDS b/xorg-lib/libxp/DEPENDS
index d0ece49..ce4b3f8 100755
--- a/xorg-lib/libxp/DEPENDS
+++ b/xorg-lib/libxp/DEPENDS
@@ -1,5 +1,6 @@
-depends xorgproto &&
-depends AWK &&
+depends xorgproto &&
+depends printproto &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxp/HISTORY b/xorg-lib/libxp/HISTORY
index 547a3d9..d770343 100644
--- a/xorg-lib/libxp/HISTORY
+++ b/xorg-lib/libxp/HISTORY
@@ -1,3 +1,6 @@
+2019-01-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: And printproto! This was not tested!
+
2018-02-06 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use xorgproto

diff --git a/xorg/xorgproto/CONFLICTS b/xorg/xorgproto/CONFLICTS
index 3ccbb94..d69b038 100755
--- a/xorg/xorgproto/CONFLICTS
+++ b/xorg/xorgproto/CONFLICTS
@@ -14,7 +14,6 @@ conflicts inputproto y
conflicts kbproto y
conflicts lg3dproto y
conflicts presentproto y
-conflicts printproto y
conflicts randrproto y
conflicts recordproto y
conflicts renderproto y
diff --git a/xorg/xorgproto/HISTORY b/xorg/xorgproto/HISTORY
index ffa05cc..7984db5 100644
--- a/xorg/xorgproto/HISTORY
+++ b/xorg/xorgproto/HISTORY
@@ -1,3 +1,6 @@
+2019-01-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: remove printproto, not installed from here
+
2018-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: xproxymngproto => xproxymanagementprotocol




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (35b0cdf902b45f35106aa38fc640455160f5de78), Thomas Orgis, 01/10/2019

Archive powered by MHonArc 2.6.24.

Top of Page