Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3939d9fe3e60e1ca1009259949ca8fad90fb539d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3939d9fe3e60e1ca1009259949ca8fad90fb539d)
  • Date: Wed, 26 Apr 2017 20:28:06 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

disk/grub2/DETAILS | 2 +-
disk/grub2/HISTORY | 5 +++++
disk/grub2/PRE_BUILD | 7 +------
disk/grub2/glibc-2.16.patch | 16 ----------------
disk/grub2/grub-2.00-freetype-2.5.1.patch | 24 ------------------------
5 files changed, 7 insertions(+), 47 deletions(-)

New commits:
commit 3939d9fe3e60e1ca1009259949ca8fad90fb539d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/grub2: version 2.02

diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 36cc09f..137500e 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -7,7 +7,7 @@ case "$GRUB2_RELEASE" in

SOURCE_HASH=sha512:1521b5c35e43b38bb7a1257b090ed73e47fbdf2de83e2088eaecc81d944a8bb94d5feca8e429d86948b7369ddc2b0521a3d2991a985dcdeb11a0c79150714ee9
;;
stable|*)
- VERSION=2.00
+ VERSION=2.02
SOURCE=grub-$VERSION.tar.xz
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
SOURCE2=grub-$VERSION.tar.xz.sig
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index a727dd1..4b28ace 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2017-04-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.02
+ * PRE_BUILD, glibc-2.16.patch, grub-2.00-freetype-2.5.1.patch: removed
+ obsolete patches
+
2016-11-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Match {target-cpu}-{target-platform} ./configure syntax.
Disable efiemu on EFI platforms.
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 8ff2f81..fcfd0db 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,11 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-if [[ "$GRUB2_RELEASE" == "stable" ]]; then
- message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}"
&&
- patch grub-core/gnulib/stdio.in.h "${SPELL_DIRECTORY}"/glibc-2.16.patch &&
-
- patch -p1 < ${SPELL_DIRECTORY}/grub-2.00-freetype-2.5.1.patch
-else
+if [[ "$GRUB2_RELEASE" != "stable" ]]; then
./autogen.sh
fi
diff --git a/disk/grub2/glibc-2.16.patch b/disk/grub2/glibc-2.16.patch
deleted file mode 100644
index 92db840..0000000
--- a/disk/grub2/glibc-2.16.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur grub-2.00.orig/grub-core/gnulib/stdio.in.h
grub-2.00/grub-core/gnulib/stdio.in.h
---- grub-2.00.orig/grub-core/gnulib/stdio.in.h 2012-10-09 13:25:40.346175444
-0700
-+++ grub-2.00/grub-core/gnulib/stdio.in.h 2012-10-09 13:26:23.112172937
-0700
-@@ -137,12 +137,6 @@
- "use gnulib module fflush for portable POSIX compliance");
- #endif
-
--/* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/disk/grub2/grub-2.00-freetype-2.5.1.patch
b/disk/grub2/grub-2.00-freetype-2.5.1.patch
deleted file mode 100644
index 286830c..0000000
--- a/disk/grub2/grub-2.00-freetype-2.5.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb
-Author: Colin Watson <cjwatson AT ubuntu.com>
-Date: Fri Nov 29 12:19:36 2013 +0000
-
- Fix build with FreeType 2.5.1
-
- * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
- <freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
- * util/grub-gen-widthspec.c: Likewise.
- * util/grub-mkfont.c: Likewise.
-
-diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 0d8eb78..242dd01 100644
---- a/util/grub-mkfont.c
-+++ b/util/grub-mkfont.c
-@@ -43,7 +43,7 @@
- #include FT_FREETYPE_H
- #include FT_TRUETYPE_TAGS_H
- #include FT_TRUETYPE_TABLES_H
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
-
- #undef __FTERRORS_H__
- #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3939d9fe3e60e1ca1009259949ca8fad90fb539d), Pavel Vinogradov, 04/26/2017

Archive powered by MHonArc 2.6.24.

Top of Page