[gtk-osx] Fix malformed patch
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Fix malformed patch
- Date: Mon, 13 May 2013 22:26:51 +0000 (UTC)
commit 30fa242384753ef6f363f697775ccdbea77bc5b9
Author: John Ralls <jralls ceridwen us>
Date: Mon May 13 15:26:42 2013 -0700
Fix malformed patch
patches/gtkspell-bug-18-Makefile.am.patch | 77 +++++++++++++++++++---------
1 files changed, 52 insertions(+), 25 deletions(-)
---
diff --git a/patches/gtkspell-bug-18-Makefile.am.patch b/patches/gtkspell-bug-18-Makefile.am.patch
index 04dfaad..9a11b41 100644
--- a/patches/gtkspell-bug-18-Makefile.am.patch
+++ b/patches/gtkspell-bug-18-Makefile.am.patch
@@ -1,25 +1,52 @@
-*** a/gtkspell/Makefile.am Wed Oct 31 15:23:44 2012
---- b/gtkspell/Makefile.am Mon May 13 14:51:15 2013
-***************
-*** 6,29 ****
-
- if ENABLE_GTK3
- lib_LTLIBRARIES += libgtkspell3-3.la
-! libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL3_CFLAGS@
- libgtkspell3_3_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
- libgtkspell3_3_la_include_HEADERS = gtkspell.h
-
- libgtkspell3_3_la_SOURCES = gtkspell.c gtkspell.h
-! libgtkspell3_3_la_LIBADD = @GTK_SPELL3_LIBS@
-
- pkgconfig_DATA += gtkspell3-3.0.pc
- endif
-
- if ENABLE_GTK2
- lib_LTLIBRARIES += libgtkspell3-2.la
-! libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL2_CFLAGS@
- libgtkspell3_2_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
- libgtkspell3_2_la_include_HEADERS = gtkspell.h
-
- libgtkspell3_2_la_SOURCES = gtkspell.c gtkspell.h
-! libgtkspell3_2_la_LIBADD = @GTK_SPELL2_LIBS@
+diff -c /Users/john/Development/gtk-sources/gtkspell3-3.0.0/gtkspell/Makefile.am\~
/Users/john/Development/gtk-sources/gtkspell3-3.0.0/gtkspell/Makefile.am
+--- a/gtkspell/Makefile.am Wed Oct 31 15:23:44 2012
++++ b/gtkspell/Makefile.am Mon May 13 15:23:27 2013
+@@ -6,24 +6,24 @@
+
+ if ENABLE_GTK3
+ lib_LTLIBRARIES += libgtkspell3-3.la
+-libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL3_CFLAGS@
++libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" $(GTK_SPELL3_CFLAGS)
+ libgtkspell3_3_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+ libgtkspell3_3_la_include_HEADERS = gtkspell.h
+
+ libgtkspell3_3_la_SOURCES = gtkspell.c gtkspell.h
+-libgtkspell3_3_la_LIBADD = @GTK_SPELL3_LIBS@
++libgtkspell3_3_la_LIBADD = $(GTK_SPELL3_LIBS)
+
+ pkgconfig_DATA += gtkspell3-3.0.pc
+ endif
+
+ if ENABLE_GTK2
+ lib_LTLIBRARIES += libgtkspell3-2.la
+-libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL2_CFLAGS@
++libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" $(GTK_SPELL2_CFLAGS)
+ libgtkspell3_2_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+ libgtkspell3_2_la_include_HEADERS = gtkspell.h
+
+ libgtkspell3_2_la_SOURCES = gtkspell.c gtkspell.h
+-libgtkspell3_2_la_LIBADD = @GTK_SPELL2_LIBS@
++libgtkspell3_2_la_LIBADD = $(GTK_SPELL2_LIBS)
+
+ pkgconfig_DATA += gtkspell3-2.0.pc
+ endif
+@@ -38,7 +38,7 @@
+ if ENABLE_GTK3
+ GtkSpell-3.0.gir: libgtkspell3-3.la
+ GtkSpell_3_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0
+-GtkSpell_3_0_gir_CFLAGS = --warn-all @GTK_SPELL_CFLAGS@
++GtkSpell_3_0_gir_CFLAGS = --warn-all $(GTK_SPELL3_CFLAGS)
+ GtkSpell_3_0_gir_LIBS = libgtkspell3-3.la
+ GtkSpell_3_0_gir_FILES = $(libgtkspell3_3_la_SOURCES)
+ INTROSPECTION_GIRS += GtkSpell-3.0.gir
+@@ -47,7 +47,7 @@
+ if ENABLE_GTK2
+ GtkSpell-2.0.gir: libgtkspell3-2.la
+ GtkSpell_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-2.0
+-GtkSpell_2_0_gir_CFLAGS = --warn-all @GTK_SPELL2_CFLAGS@
++GtkSpell_2_0_gir_CFLAGS = --warn-all $(GTK_SPELL2_CFLAGS)
+ GtkSpell_2_0_gir_LIBS = libgtkspell3-2.la
+ GtkSpell_2_0_gir_FILES = $(libgtkspell3_2_la_SOURCES)
+ INTROSPECTION_GIRS += GtkSpell-2.0.gir
+
+Diff finished. Mon May 13 15:23:33 2013
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]