Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (1999e24733749f4cedbb744c66af036bc15d80e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (1999e24733749f4cedbb744c66af036bc15d80e4)
  • Date: Tue, 28 Aug 2007 10:04:14 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

libs/libidn/BUILD | 2 +-
libs/libidn/HISTORY | 5 +++++
libs/libidn/idn-int.h.patch | 11 -----------
3 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 1999e24733749f4cedbb744c66af036bc15d80e4
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

libidn: Use sedit vice patch file. Appears file can be created
correctly on some systems. Suspect with newer glibc it is
created correctly.

diff --git a/libs/libidn/BUILD b/libs/libidn/BUILD
index 5b9da2c..dfe953d 100755
--- a/libs/libidn/BUILD
+++ b/libs/libidn/BUILD
@@ -1,3 +1,3 @@
default_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/idn-int.h.patch
+sedit "s/include_next/include/g" lib/idn-int.h
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index 07806eb..67e2f58 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,8 @@
+2007-08-28 George Sherwood <george AT beernabeer.com>
+ * BUILD: Changed to an sedit. It is possible for idn-int.h
+ to be created correctly. Possibly due to glibc version.
+ * idn-int.h.patch: Removed. Using sedit
+
2007-08-27 George Sherwood <george AT beernabeer.com>
* DETAILS: PATCHLEVEL++
* BUILD: Added to patch idn-int.h. Bug #13857
diff --git a/libs/libidn/idn-int.h.patch b/libs/libidn/idn-int.h.patch
deleted file mode 100644
index 7c62ad3..0000000
--- a/libs/libidn/idn-int.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/idn-int.h.org 2007-08-27 19:15:46.000000000 +0500
-+++ lib/idn-int.h 2007-08-27 19:16:09.000000000 +0500
-@@ -44,7 +44,7 @@
- in <inttypes.h> would reinclude us, skipping our contents because
- _GL_STDINT_H is defined.
- The include_next requires a split double-inclusion guard. */
--# include_next <stdint.h>
-+# include <stdint.h>
- #endif
-
- #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (1999e24733749f4cedbb744c66af036bc15d80e4), George Sherwood, 08/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page