Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Dale E. Edmons (40956c5dc4b29498e92d725ded4da57403ea481d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Dale E. Edmons" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Dale E. Edmons (40956c5dc4b29498e92d725ded4da57403ea481d)
  • Date: Wed, 13 Feb 2008 05:58:02 -0600

GIT changes to master grimoire by Dale E. Edmons <linuxfan AT sourcemage.org>:

utils/fbgetty/DETAILS | 3 +
utils/fbgetty/HISTORY | 5 ++
utils/fbgetty/PRE_BUILD | 2
utils/fbgetty/fbgetty-0.1.698-gcc41.patch | 64
------------------------------
4 files changed, 9 insertions(+), 65 deletions(-)

New commits:
commit 08468bcfa0882ad7342aa830ef1d5b37be9b53cf
Author: Dale E. Edmons <linuxfan AT sourcemage.org>
Commit: Dale E. Edmons <linuxfan AT sourcemage.org>

Revamped spell to use offsite patch rather than including it as part of
grimoire.

diff --git a/utils/fbgetty/DETAILS b/utils/fbgetty/DETAILS
index 547a072..b3566ae 100755
--- a/utils/fbgetty/DETAILS
+++ b/utils/fbgetty/DETAILS
@@ -1,8 +1,11 @@
SPELL=fbgetty
VERSION=0.1.698
SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SPELL}-${VERSION}-gcc41.patch
SOURCE_URL[0]=http://projects.meuh.org/${SPELL}/downloads/${SOURCE}
+
SOURCE2_URL[0]=http://nest.homeunix.net/repos/portage/net-dialup/$SPELL/files/$SOURCE2

SOURCE_HASH=sha512:942304ac00ecfaad59419a0994331e59d91269ee015e3bd38faa85db0b205e6e88e1958b65e503f59b81f050a1e110aeea6534eecb3ba010096a6b5173fd1ac5
+
SOURCE2_HASH=sha512:a53e5f9e2880362d023d6fc017bd49d519c25ea3395f606f5dafccc52a72d80e18bf6cd345a732733e4f252c9e5fddbbf02dd63a2d4c6ee808073fc895be5a9f
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://projects.meuh.org/fbgetty/
ENTERED=20051216
diff --git a/utils/fbgetty/HISTORY b/utils/fbgetty/HISTORY
index d166c2a..25eeda4 100644
--- a/utils/fbgetty/HISTORY
+++ b/utils/fbgetty/HISTORY
@@ -1,4 +1,9 @@
2008-02-12 Dale E. Edmons <linuxfan AT sourcemage.org>
+ * DETAILS: Changed to download patch from author's site.
+ * PRE_BUILD: Changed to use SOURCE_CACHE.
+ * fbgetty-0.1.698-gcc41.patch: Removed from repo to use off-site copy.
+
+2008-02-12 Dale E. Edmons <linuxfan AT sourcemage.org>
* PRE_BUILD: Created for patching fbgetty (thanks arachnist).
* fbgetty-0.1.698-gcc41.patch: New. Corrections for compile errors.
* http://nest.homeunix.net/repos/portage/net-dialup/fbgetty/files
diff --git a/utils/fbgetty/PRE_BUILD b/utils/fbgetty/PRE_BUILD
index 87303fa..5ed5da8 100755
--- a/utils/fbgetty/PRE_BUILD
+++ b/utils/fbgetty/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/fbgetty-0.1.698-gcc41.patch
+patch -p1 < $SOURCE_CACHE/fbgetty-0.1.698-gcc41.patch
diff --git a/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
b/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
deleted file mode 100644
index a9722f1..0000000
--- a/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nru fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk
fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk
---- fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk
2001-07-11 23:01:15.000000000 +0300
-+++ fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk 2007-10-27
11:29:50.000000000 +0300
-@@ -45,8 +45,7 @@
- name = $3;
- type = $2;
-
-- printf("#define OFFSET_%s (offsetof(struct fbgetty_options_t, %s))\n",
name, name);
-- printf(" %s %s;\n\n", type, name);
-+ printf(" %s %s;\n", type, name);
- }
-
- END {
-diff -Nru fbgetty-0.1.698.orig/src/options.c fbgetty-0.1.698/src/options.c
---- fbgetty-0.1.698.orig/src/options.c 2001-12-17 22:55:42.000000000 +0200
-+++ fbgetty-0.1.698/src/options.c 2007-10-27 11:32:53.000000000 +0300
-@@ -27,7 +27,7 @@
- */
-
- #include <fbgetty/global.h>
--
-+#include <stddef.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -141,7 +141,7 @@
- #define ENV_BINARY 0x04
- #define ENV_LEDS 0x08
-
--#define ENV_ENTRY(name, type, ptr) { name, type, OFFSET_ ## ptr }
-+#define ENV_ENTRY(name, type, ptr) { name, type, offsetof(struct
fbgetty_options_t, ptr) }
-
- static struct env_entry
- {
-@@ -899,20 +899,20 @@
- }
- merge_option_list[] =
- {
-- { OFFSET_tty_device , MERGE_STR, NULL, -1 },
-+ { offsetof(struct fbgetty_options_t, tty_device) , MERGE_STR, NULL, -1
},
- #ifdef USE_FRAME_BUFFER
-- { OFFSET_fb_device, MERGE_STR, NULL, -1 },
-+ { offsetof(struct fbgetty_options_t, fb_device), MERGE_STR, NULL, -1
},
- #endif
-
-- { OFFSET_login_program, MERGE_STR, LOGIN_PROGRAM, -1 },
-- { OFFSET_login_prompt, MERGE_STR, LOGIN_PROMPT, -1 },
-- { OFFSET_issue_filename, MERGE_STR, ISSUE_FILE, -1 },
-+ { offsetof(struct fbgetty_options_t, login_program), MERGE_STR,
LOGIN_PROGRAM, -1 },
-+ { offsetof(struct fbgetty_options_t, login_prompt), MERGE_STR,
LOGIN_PROMPT, -1 },
-+ { offsetof(struct fbgetty_options_t, issue_filename), MERGE_STR,
ISSUE_FILE, -1 },
-
-- { OFFSET_login_timeout, MERGE_INT, NULL, LOGIN_TIMEOUT },
-- { OFFSET_issue_refresh, MERGE_INT, NULL, ISSUE_REFRESH },
-- { OFFSET_screen_clear, MERGE_INT, NULL, TRUE },
-+ { offsetof(struct fbgetty_options_t, login_timeout), MERGE_INT, NULL,
LOGIN_TIMEOUT },
-+ { offsetof(struct fbgetty_options_t, issue_refresh), MERGE_INT, NULL,
ISSUE_REFRESH },
-+ { offsetof(struct fbgetty_options_t, screen_clear), MERGE_INT, NULL,
TRUE },
-
-- { OFFSET_leds, MERGE_INT, NULL, 0 },
-+ { offsetof(struct fbgetty_options_t, leds), MERGE_INT, NULL, 0
},
- { 0, 0, NULL, -1 }
- };
-




Archive powered by MHonArc 2.6.24.

Top of Page