Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (d047d96abfb77eb7a7d9635fdebbaea4ca3739d6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d047d96abfb77eb7a7d9635fdebbaea4ca3739d6)
  • Date: Wed, 17 Feb 2010 23:52:42 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/sdl_pango/HISTORY | 4 ++++
libs/sdl_pango/PRE_BUILD | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d047d96abfb77eb7a7d9635fdebbaea4ca3739d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sdl_pango: patch 2.6.1 breaks direct patching by listing original filename

Might even be patch 2.6.0, haven't done regression testing.

This patch applies cleanly to the source outside of cast if we just use
`patch -p0 < patchfile`. Even recreating the patch does not allow using
the original filename to be patched.

diff --git a/libs/sdl_pango/HISTORY b/libs/sdl_pango/HISTORY
index 895822b..f77f58c 100644
--- a/libs/sdl_pango/HISTORY
+++ b/libs/sdl_pango/HISTORY
@@ -1,3 +1,7 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: patch 2.6.1 breaks direct patching by listing original
+ filename
+
2007-04-19 Eric Sandall <sandalle AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: frozen-bubble requires the
Pango patch to be applied
diff --git a/libs/sdl_pango/PRE_BUILD b/libs/sdl_pango/PRE_BUILD
index 8a0a433..ad7ed4d 100755
--- a/libs/sdl_pango/PRE_BUILD
+++ b/libs/sdl_pango/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
if [[ "$FB_PATCH" == "y" ]]; then
cd $SOURCE_DIRECTORY
- patch -p0 src/SDL_Pango.c $SPELL_DIRECTORY/SDL_Pango-0.1.2-API-adds.patch
+ patch -p0 < $SPELL_DIRECTORY/SDL_Pango-0.1.2-API-adds.patch
fi





  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d047d96abfb77eb7a7d9635fdebbaea4ca3739d6), Eric Sandall, 02/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page