- updated for 4.4.0

Changed files:
    dasher-ac.patch -> 1.3
    dasher-as-needed.patch -> 1.2

diff --git a/dasher-ac.patch b/dasher-ac.patch
index b1a86e93d350180ff1c9bfe406e2b86bf65790da..ef69d731cebc932dc0de6eeb469197a694c33d90 100644 (file)
--- a/dasher-ac.patch
+++ b/dasher-ac.patch
@@ -1,12 +1,12 @@
-diff -urN aaa/dasher-4.1.10/configure.in dasher-4.1.10/configure.in
---- aaa/dasher-4.1.10/configure.in     2006-08-21 23:25:29.000000000 +0200
-+++ dasher-4.1.10/configure.in 2006-08-26 15:57:54.032268144 +0200
-@@ -319,7 +319,7 @@
- if [[ x"$WITHDARWIN" = xtrue ]]; then
-       GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+diff -urN dasher-4.4.0/configure.in dasher-4.4.0.new/configure.in
+--- dasher-4.4.0/configure.in  2007-03-12 18:27:10.000000000 +0100
++++ dasher-4.4.0.new/configure.in      2007-03-23 19:41:12.000000000 +0100
+@@ -387,7 +387,7 @@
+ esac])
+ 
+ if [[ x"$have_prog_gnu_ld" = xyes ]]; then
+-   ed_flags="-Wl,--export-dynamic,"
++   ed_flags="-Wl,--export-dynamic"
  else
--      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
-+      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
+    ed_flags=""
  fi
- AC_SUBST(GTK2BUILD_CFLAGS)
- AC_SUBST(GTK2BUILD_LIBS)

diff --git a/dasher-as-needed.patch b/dasher-as-needed.patch
index 741618d086871dbb19db3f00a960f6ec3db3a280..175a8897058fa0389d0b97a1a2b3864864ec6a6a 100644 (file)
--- a/dasher-as-needed.patch
+++ b/dasher-as-needed.patch
@@ -1,7 +1,7 @@
-diff -urN aaa/dasher-4.1.10/Src/Makefile.am dasher-4.1.10/Src/Makefile.am
---- aaa/dasher-4.1.10/Src/Makefile.am  2006-08-21 23:25:30.000000000 +0200
-+++ dasher-4.1.10/Src/Makefile.am      2006-08-26 16:14:52.331463136 +0200
-@@ -24,16 +24,16 @@
+diff -urN dasher-4.4.0/Src/Makefile.am dasher-4.4.0.new/Src/Makefile.am
+--- dasher-4.4.0/Src/Makefile.am       2007-03-12 15:13:14.000000000 +0100
++++ dasher-4.4.0.new/Src/Makefile.am   2007-03-23 19:30:32.000000000 +0100
+@@ -24,17 +24,17 @@
        -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
  
  dasher_LDADD = \
@@ -14,8 +14,9 @@ diff -urN aaa/dasher-4.1.10/Src/Makefile.am dasher-4.1.10/Src/Makefile.am
        Gtk2/libdashercontrol.a \
        DasherCore/libdashercore.a \
        DasherCore/LanguageModelling/libdasherlm.a \
--      DasherCore/Alphabet/libdasheralphabet.a
-+      DasherCore/Alphabet/libdasheralphabet.a \
+       DasherCore/Alphabet/libdasheralphabet.a \
+-      Common/libdashermisc.a
++      Common/libdashermisc.a \
 +      $(GTK2BUILD_LIBS) \
 +      -lexpat \
 +      $(POPT_LIBS) \