sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (ce54bc04db0b6159bc7c62586feaae9b5c8a1adc)
- 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 (ce54bc04db0b6159bc7c62586feaae9b5c8a1adc)
- Date: Sun, 7 Feb 2016 22:07:09 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
devel/valgrind/DEPENDS | 1
devel/valgrind/DETAILS | 6 ++-
devel/valgrind/HISTORY | 7 ++++
devel/valgrind/PRE_BUILD | 3 -
devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch | 29
------------------
devel/valgrind/valgrind-3.11.0-boost.patch | 21 +++++++++++++
editors/nedit/BUILD | 3 +
editors/nedit/HISTORY | 6 +++
editors/nedit/PRE_BUILD | 4 +-
editors/nedit/nedit-accept-lesstif.patch | 12 -------
editors/nedit/nedit-justbuilditalready.patch | 24 ++++++++++++++
11 files changed, 68 insertions(+), 48 deletions(-)
New commits:
commit ce54bc04db0b6159bc7c62586feaae9b5c8a1adc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
valgrind: version 3.11 (needed for glibc-2.22)
commit 2cbad82cd4eabf1c8573e004c655b58aea4e8d98
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nedit: enable build with any Motif
diff --git a/devel/valgrind/DEPENDS b/devel/valgrind/DEPENDS
index 9c30f00..dfdc04a 100755
--- a/devel/valgrind/DEPENDS
+++ b/devel/valgrind/DEPENDS
@@ -1,3 +1,4 @@
+optional_depends boost "" "" "boost support" &&
if [[ $VALGRIND_BRANCH == scm ]]
then
depends automake &&
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index 9708436..5f81779 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -9,8 +9,10 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=3.10.1
-
SOURCE_HASH=sha512:8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642
+ VERSION=3.11.0
+# Upstream offers an MD5 hash. Could use that for UPSTREAM_HASH.
+# But MD5 is so broken that I'd rather not use it.
+
SOURCE_HASH=sha512:a25f97fa80aef4ad1e86b303886cd7a97aac248820a4c24e3d3dc26567dd7d2d86db237866468fd43885a9fb8534cb0a8e301a3c752fffbc231a2842272999da
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 87a432f..876eccc 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,10 @@
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 3.11.0
+ * PRE_BUILD, valgrind-3.11.0-boost.patch: only one patch now,
+ the one for boost (LFS does not have it anymore, but still needed!?)
+ * valgrind-3.10.1-linuxfromscratch.patch, glibc.patch: gone
+ * DEPENDS: actually note the boost dependency (no configure switch)
+
2015-08-17 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, valgrind-3.10.1-linuxfromscratch.patch:
patch from LFS to fix build with recent kernels and boost
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 4b6ef0f..ee83bc3 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,8 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SCRIPT_DIRECTORY/glibc.patch" &&
-patch -p0 < "$SCRIPT_DIRECTORY/valgrind-3.10.1-linuxfromscratch.patch" &&
+patch -p1 < "$SCRIPT_DIRECTORY/valgrind-3.11.0-boost.patch" &&
if [[ $VALGRIND_BRANCH == "scm" ]]; then
NOCONFIGURE=Y ./autogen.sh
diff --git a/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
b/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
deleted file mode 100644
index f35b1b2..0000000
--- a/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.ac.orig 2015-08-17 08:08:32.864173998 +0200
-+++ configure.ac 2015-08-17 08:11:43.449189351 +0200
-@@ -303,7 +303,7 @@
- kernel=`uname -r`
-
- case "${kernel}" in
-- 2.6.*|3.*)
-+ 2.6.*|3.*|4.*)
- AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using
Linux 2.6.x or Linux 3.x])
- ;;
-@@ -2706,7 +2706,7 @@
- safe_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$mflag_primary"
- safe_LIBS="$LIBS"
--LIBS="-lboost_thread-mt -lboost_system-mt $LIBS"
-+LIBS="-lboost_thread -lboost_system $LIBS"
-
- AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <boost/thread.hpp>
-@@ -2721,7 +2721,7 @@
- [
- ac_have_boost_1_35=yes
- AC_SUBST([BOOST_CFLAGS], [])
--AC_SUBST([BOOST_LIBS], ["-lboost_thread-mt -lboost_system-mt"])
-+AC_SUBST([BOOST_LIBS], ["-lboost_thread -lboost_system"])
- AC_MSG_RESULT([yes])
- ], [
- ac_have_boost_1_35=no
diff --git a/devel/valgrind/valgrind-3.11.0-boost.patch
b/devel/valgrind/valgrind-3.11.0-boost.patch
new file mode 100644
index 0000000..ca9bc47
--- /dev/null
+++ b/devel/valgrind/valgrind-3.11.0-boost.patch
@@ -0,0 +1,21 @@
+diff -ru valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac
+--- valgrind-3.11.0.orig/configure.ac 2015-09-22 22:26:31.000000000 +0200
++++ valgrind-3.11.0/configure.ac 2016-02-07 09:44:39.568960224 +0100
+@@ -3715,7 +3715,7 @@
+ safe_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$mflag_primary"
+ safe_LIBS="$LIBS"
+-LIBS="-lboost_thread-mt -lboost_system-mt $LIBS"
++LIBS="-lboost_thread -lboost_system $LIBS"
+
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include <boost/thread.hpp>
+@@ -3730,7 +3730,7 @@
+ [
+ ac_have_boost_1_35=yes
+ AC_SUBST([BOOST_CFLAGS], [])
+-AC_SUBST([BOOST_LIBS], ["-lboost_thread-mt -lboost_system-mt"])
++AC_SUBST([BOOST_LIBS], ["-lboost_thread -lboost_system"])
+ AC_MSG_RESULT([yes])
+ ], [
+ ac_have_boost_1_35=no
diff --git a/editors/nedit/BUILD b/editors/nedit/BUILD
index aa55ab0..c489dd2 100755
--- a/editors/nedit/BUILD
+++ b/editors/nedit/BUILD
@@ -1,2 +1,3 @@
cd ${SOURCE_DIRECTORY} &&
-make linux
+# We just have to use the Motif we got and hope for the best.
+CFLAGS="$CFLAGS -DBUILD_UNTESTED_NEDIT" make linux
diff --git a/editors/nedit/HISTORY b/editors/nedit/HISTORY
index 89508d1..007769e 100644
--- a/editors/nedit/HISTORY
+++ b/editors/nedit/HISTORY
@@ -1,3 +1,9 @@
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * nedit-accept-lesstif.patch, PRE_BUILD,
+ nedit-justbuilditalready.patch: change Motif patching for
non-interactive
+ build with any version
+ * BUILD: just use the flag for untested Motif
+
2009-08-06 Thomas Orgis <sobukus AT sourcemage.org>
* nedit-accept-lesstif.patch: hack it for lesstif 0.95.2
diff --git a/editors/nedit/PRE_BUILD b/editors/nedit/PRE_BUILD
index 3c04fee..42cf889 100755
--- a/editors/nedit/PRE_BUILD
+++ b/editors/nedit/PRE_BUILD
@@ -4,8 +4,8 @@ if [[ "$NEDIT_WMCLASS" == "y" ]]
then
patch -Np1 < ${SCRIPT_DIRECTORY}/nedit-svrname-in-wmclass.patch
fi &&
-# accept our lesstif version (needs update in case of lesstif update)
-patch -Np1 < "${SCRIPT_DIRECTORY}/nedit-accept-lesstif.patch" &&
+# Do not insist on user interacting to build with untested Motif.
+patch -p0 < "$SCRIPT_DIRECTORY/nedit-justbuilditalready.patch" &&
cd ${SOURCE_DIRECTORY}/makefiles &&
mv Makefile.linux Makefile.linux.tmp &&
sed -e "s/CFLAGS\=/CFLAGS:= -DREPLACE_SCOPE /" \
diff --git a/editors/nedit/nedit-accept-lesstif.patch
b/editors/nedit/nedit-accept-lesstif.patch
deleted file mode 100644
index 4aa702f..0000000
--- a/editors/nedit/nedit-accept-lesstif.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN nedit/util/motif.c nedit.950/util/motif.c
---- nedit/util/motif.c 2007-08-02 16:13:03.000000000 +0200
-+++ nedit.95.2/util/motif.c 2009-03-25 03:16:54.000000000 +0100
-@@ -74,6 +74,8 @@
- #ifndef __x86_64
- "0.93.94", /* 64-bit build .93.94 is broken */
- #endif
-+ "0.950.0",
-+ "0.95.2",
- NULL
- };
-
diff --git a/editors/nedit/nedit-justbuilditalready.patch
b/editors/nedit/nedit-justbuilditalready.patch
new file mode 100644
index 0000000..06b24ad
--- /dev/null
+++ b/editors/nedit/nedit-justbuilditalready.patch
@@ -0,0 +1,24 @@
+--- util/check_lin_tif.c.orig 2016-02-07 00:38:43.473467770 +0100
++++ util/check_lin_tif.c 2016-02-07 00:40:11.723364495 +0100
+@@ -84,9 +84,7 @@
+ "risking instability and probable data loss. You are very
brave!\n"
+ "Please do not report bugs to the NEdit developers unless
you can\n"
+ "reproduce them with a known-good NEdit binary downloaded
from:\n"
+- "\thttp://www.nedit.org\n";
+- "\nHIT ENTER TO CONTINUE\n");
+- fgets(buf, 2, stdin);
++ "\thttp://www.nedit.org\n";);
+ return EXIT_SUCCESS;
+ }
+ #else
+@@ -122,9 +120,7 @@
+ "\n========================== WARNING
===========================\n"
+ "You have chosen to build NEdit with an untested version of
Motif.\n"
+ "Please report your success or failure with this version
to:\n"
+- "\tdevelop AT nedit.org\n"
+- "\nHIT ENTER TO CONTINUE\n");
+- fgets(buf, 2, stdin);
++ "\tdevelop AT nedit.org\n");
+ return EXIT_SUCCESS;
+ }
+ #else
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ce54bc04db0b6159bc7c62586feaae9b5c8a1adc), Thomas Orgis, 02/07/2016
Archive powered by MHonArc 2.6.24.