diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 6 | ||||
| -rw-r--r-- | gtk/gtkexpander.h | 4 | ||||
| -rw-r--r-- | modules/input/Makefile.am | 6 |
8 files changed, 59 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf/Makefile.am + * modules/input/Makefile.am: Use install-data-hook for + gdk-pixbuf.loaders and gtk.immodules install generation targets. + Fixes #112806. + + * gtk/gtkexpander.h: Apply missing declarations from #124449. + Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de> Fix for #119555, Peter Zelesny: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d9222cdad..3ee6f7f55 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf/Makefile.am + * modules/input/Makefile.am: Use install-data-hook for + gdk-pixbuf.loaders and gtk.immodules install generation targets. + Fixes #112806. + + * gtk/gtkexpander.h: Apply missing declarations from #124449. + Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de> Fix for #119555, Peter Zelesny: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d9222cdad..3ee6f7f55 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf/Makefile.am + * modules/input/Makefile.am: Use install-data-hook for + gdk-pixbuf.loaders and gtk.immodules install generation targets. + Fixes #112806. + + * gtk/gtkexpander.h: Apply missing declarations from #124449. + Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de> Fix for #119555, Peter Zelesny: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d9222cdad..3ee6f7f55 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf/Makefile.am + * modules/input/Makefile.am: Use install-data-hook for + gdk-pixbuf.loaders and gtk.immodules install generation targets. + Fixes #112806. + + * gtk/gtkexpander.h: Apply missing declarations from #124449. + Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de> Fix for #119555, Peter Zelesny: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d9222cdad..3ee6f7f55 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf/Makefile.am + * modules/input/Makefile.am: Use install-data-hook for + gdk-pixbuf.loaders and gtk.immodules install generation targets. + Fixes #112806. + + * gtk/gtkexpander.h: Apply missing declarations from #124449. + Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de> Fix for #119555, Peter Zelesny: diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 6b6c8e6cb..1666a2610 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -426,7 +426,11 @@ endif # Running this if cross compiling or if DESTDIR is set is going to # not work at all, so skip it -install-data-local: install-ms-lib install-libtool-import-lib +# We use install-data-hook here to workaround a bug in automake and/or libtool +# that makes the install target for the loader libraries a dependency on +# install-data-am, and not install-exec-am. We need to ensure this gets run +# after the libraries are installed in their final locations. +install-data-hook: install-ms-lib install-libtool-import-lib @if $(RUN_QUERY_LOADER_TEST) ; then \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index e838a80aa..7c568848b 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -78,6 +78,10 @@ void gtk_expander_set_use_underline (GtkExpander *expander, gboolean use_underline); gboolean gtk_expander_get_use_underline (GtkExpander *expander); +void gtk_expander_set_use_markup (GtkExpander *expander, + gboolean use_markup); +gboolean gtk_expander_get_use_markup (GtkExpander *expander); + void gtk_expander_set_label_widget (GtkExpander *expander, GtkWidget *label_widget); GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander); diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index dc552b588..5f8400fd5 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -87,7 +87,11 @@ endif # Running this if cross compiling or if DESTDIR is set is going to # not work at all, so skip it. -install-data-local: +# We use install-data-hook here to workaround a bug in automake and/or libtool +# that makes the install target for the loader libraries a dependency on +# install-data-am, and not install-exec-am. We need to ensure this gets run +# after the libraries are installed in their final locations. +install-data-hook: @if $(RUN_QUERY_IMMODULES_TEST) ; then \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ |