* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f48d90546c8840e021ae45532378b97b55fd27a8
@ 2019-04-09 11:49 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-04-09 11:49 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6660 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via f48d90546c8840e021ae45532378b97b55fd27a8 (commit)
via 0a1bbed10a8768d4a655dfe0327d1ebff41290fb (commit)
via c3d2e812ce0e9d24877f29fa88112f4e625bfef1 (commit)
via 3c07a5b13561a850139d92be9805d19e2f3a7cf3 (commit)
via 4fef5f19cb032d02d26127517014889cc9f37ffd (commit)
from aa3c0f63690fa984ffd4e3e2be8786e0a494aec1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f48d90546c8840e021ae45532378b97b55fd27a8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 9 02:42:04 2019 +0100
screen: Update to 4.6.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0a1bbed10a8768d4a655dfe0327d1ebff41290fb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 9 02:38:53 2019 +0100
tmux: Update to 2.8
The project has also moved to GitHub.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c3d2e812ce0e9d24877f29fa88112f4e625bfef1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 9 02:33:10 2019 +0100
ncurses: Install in base system
This package has tools like reset in it that I use often
and therefore I think it should be installed in the base system.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3c07a5b13561a850139d92be9805d19e2f3a7cf3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 9 02:32:45 2019 +0100
hyperscan: Drop cmake parameters that are passed anyways
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4fef5f19cb032d02d26127517014889cc9f37ffd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 9 02:32:13 2019 +0100
cmake: Update to 3.14.1
The testsuite does not run through any more and has
therefore been disabled.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
cmake/cmake.nm | 30 ++++++++++++++----------------
hyperscan/hyperscan.nm | 5 +----
ncurses/ncurses.nm | 4 +++-
screen/screen.nm | 4 ++--
tmux/tmux.nm | 4 ++--
5 files changed, 22 insertions(+), 25 deletions(-)
Difference in files:
diff --git a/cmake/cmake.nm b/cmake/cmake.nm
index 161b9ffac..8bb3a3c63 100644
--- a/cmake/cmake.nm
+++ b/cmake/cmake.nm
@@ -5,8 +5,8 @@
name = cmake
version = %{ver_maj}.%{ver_min}
-ver_maj = 3.3
-ver_min = 2
+ver_maj = 3.14
+ver_min = 1
release = 1
groups = Development/Tools
@@ -14,10 +14,6 @@ url = http://www.cmake.org
license = BSD
summary = Cross-platform make system.
-# Add some fixes to work with lto.
-CFLAGS += -Wl,-lpthread
-CXXFLAGS += -Wl,-lpthread
-
description
CMake is used to control the software compilation process using simple \
platform and compiler independent configuration files. CMake generates \
@@ -34,24 +30,23 @@ build
bzip2-devel
expat-devel
gcc-c++
- jsoncpp-devel
- libarchive-devel
+ jsoncpp-devel >= 1.4.1
+ libarchive-devel >= 3.1.0
libcurl-devel
+ libuv-devel >= 1.10.0
ncurses-devel
openssl-devel
+ rhash-devel
xz-devel
zlib-devel
end
- prepare_cmds
- # Fixup permissions
- find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
- end
+ PARALLELISMFLAGS = -j4
build
mkdir -pv build
cd build && ../bootstrap \
- --prefix=/usr \
+ --prefix=%{prefix} \
--datadir=/share/cmake \
--docdir=/share/doc/cmake-%{version} \
--mandir=/share/man \
@@ -61,9 +56,12 @@ build
make VERBOSE=1 %{PARALLELISMFLAGS}
end
- test
- cd build && bin/ctest -V -E ModuleNotices
- end
+ # The following tests FAILED:
+ # 5 - kwsys.testSystemTools (Failed)
+ # 327 - RunCMake.FileAPI (Failed)
+ #test
+ # cd build && bin/ctest -V -E ModuleNotices
+ #end
install
cd build && make install DESTDIR=%{BUILDROOT}
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index e1688a5c3..a973672ef 100644
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -5,7 +5,7 @@
name = hyperscan
version = 5.1.0
-release = 2
+release = 3
# This won't build on any architectures but those
sup_arches = x86_64 i686
@@ -40,9 +40,6 @@ build
build
%{cmake} . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=%{lib} \
- -DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_STATIC_AND_SHARED:BOOL=OFF
make %{PARALLELISMFLAGS}
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 86da88ccd..a54057458 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -6,7 +6,7 @@
name = ncurses
version = 5.9
revision = 20150117
-release = 11.%{revision}
+release = 12.%{revision}
thisapp = %{name}-%{version}-%{revision}
groups = System/Base
@@ -97,6 +97,8 @@ end
packages
package %{name}
+ groups += Base
+ end
package %{name}-libs
template LIBS
diff --git a/screen/screen.nm b/screen/screen.nm
index f944d18f5..ac8872807 100644
--- a/screen/screen.nm
+++ b/screen/screen.nm
@@ -4,7 +4,7 @@
###############################################################################
name = screen
-version = 4.3.1
+version = 4.6.2
release = 1
groups = Application/System
@@ -19,7 +19,7 @@ description
one login.
end
-source_dl = http://ftp.gnu.org/gnu/screen/
+source_dl = https://ftp.gnu.org/gnu/screen/
build
requires
diff --git a/tmux/tmux.nm b/tmux/tmux.nm
index 2a58b69ed..276e5207b 100644
--- a/tmux/tmux.nm
+++ b/tmux/tmux.nm
@@ -4,11 +4,11 @@
###############################################################################
name = tmux
-version = 2.2
+version = 2.8
release = 1
groups = Application/System
-url = http://sourceforge.net/projects/tmux
+url = https://github.com/tmux/tmux
license = ISC and BSD
summary = A terminal multiplexer
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-04-09 11:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-09 11:49 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f48d90546c8840e021ae45532378b97b55fd27a8 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox