2012-03-14 Nicolas Setton (gladeui/Makefile.in): Fix greps that help compute gladeui.def. Remove undefined export. (gladeui/glade_previewer.rc): Adapt to new name of glade icon. (gladeui/glade-clipboard.h): Fix style, so function makes it in gladeui.def. (gladeui/glade-catalog.h): Remove declaration of functions that are not implemented, so as not to pollute gladeui.def. (gladeui/glade-app.h): Likewise. --- gladeui/glade-app.h.orig 2012-03-14 19:37:28.874620600 +0100 +++ gladeui/glade-app.h 2012-03-14 19:59:50.333159400 +0100 @@ -97,7 +97,6 @@ /* package paths */ const gchar *glade_app_get_catalogs_dir (void) G_GNUC_CONST; const gchar *glade_app_get_modules_dir (void) G_GNUC_CONST; -const gchar *glade_app_get_plugins_dir (void) G_GNUC_CONST; const gchar *glade_app_get_pixmaps_dir (void) G_GNUC_CONST; const gchar *glade_app_get_locale_dir (void) G_GNUC_CONST; const gchar *glade_app_get_bin_dir (void) G_GNUC_CONST; --- gladeui/glade-catalog.h.orig 2012-03-14 19:37:59.137921200 +0100 +++ gladeui/glade-catalog.h 2012-03-14 19:38:39.353582400 +0100 @@ -82,9 +82,6 @@ const GList *glade_widget_group_get_adaptors (GladeWidgetGroup *group); -gboolean glade_catalog_supports_libglade (GladeCatalog *catalog); -gboolean glade_catalog_supports_gtkbuilder (GladeCatalog *catalog); - G_END_DECLS #endif /* __GLADE_CATALOG_H__ */ --- gladeui/glade-clipboard.h.orig 2012-03-14 20:04:15.741444800 +0100 +++ gladeui/glade-clipboard.h 2012-03-14 20:04:31.459390000 +0100 @@ -38,7 +38,7 @@ GList *widgets); void glade_clipboard_clear (GladeClipboard *clipboard); -gboolean glade_clipboard_get_has_selection(GladeClipboard *clipboard); +gboolean glade_clipboard_get_has_selection (GladeClipboard *clipboard); GList *glade_clipboard_widgets (GladeClipboard *clipboard); G_END_DECLS --- gladeui/glade-previewer.rc.in.orig 2012-03-14 19:46:27.446254200 +0100 +++ gladeui/glade-previewer.rc.in 2012-03-14 19:46:37.133134200 +0100 @@ -1,6 +1,6 @@ #include -GLADE_ICON ICON "../data/icons/glade-3.ico" +GLADE_ICON ICON "../data/icons/glade.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0 --- gladeui/glade-signal-editor.h.orig 2012-03-14 19:39:26.740567800 +0100 +++ gladeui/glade-signal-editor.h 2012-03-14 19:39:32.349512000 +0100 @@ -42,7 +42,6 @@ GType glade_signal_editor_get_type (void) G_GNUC_CONST; GladeSignalEditor *glade_signal_editor_new (void); -void glade_signal_editor_construct_signals_list (GladeSignalEditor *editor); void glade_signal_editor_load_widget (GladeSignalEditor *editor, GladeWidget *widget); --- gladeui/Makefile.in.orig 2012-03-14 19:39:45.332889800 +0100 +++ gladeui/Makefile.in 2012-03-14 19:58:13.041718200 +0100 @@ -610,7 +610,7 @@ rm -f "$${dir}/so_locations"; \ done libgladeui-2.la: $(libgladeui_2_la_OBJECTS) $(libgladeui_2_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgladeui_2_la_LINK) -rpath $(libdir) $(libgladeui_2_la_OBJECTS) $(libgladeui_2_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libgladeui_2_la_LINK) -rpath $(libdir) $(libgladeui_2_la_OBJECTS) $(libgladeui_2_la_LIBADD) $(LIBS) -lgmodule-2.0 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -1342,15 +1342,14 @@ # gladeui.def: $(libgladeuiinclude_HEADERS) @echo Generating $@ - @(echo EXPORTS; \ - echo 'custom_get_type'; \ + (echo EXPORTS; \ (cd $(srcdir); cat $(libgladeuiinclude_HEADERS) || echo 'glade_ERROR ()' ) | \ grep -v -E '^# *include' | \ grep -v -E '^# *define' | \ grep -E '[^\(]glade_.*[[:space:]]+\(.*' | \ sed -e 's/[ ]*(.*//' | \ sed -e 's/.*glade_/glade_/' | \ - sort; \ + sort | grep -v -E ' void'; \ ) >$@ @ ! grep -q glade_ERROR $@ || ($(RM) $@; false) *** gladeui/Makefile.in.orig Fri Nov 15 18:14:29 2013 --- gladeui/Makefile.in Fri Nov 15 18:15:07 2013 *************** *** 1356,1366 **** # # Marshaller generation # ! glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \ && mv glade-marshallers-h.tmp glade-marshallers.h \ || ( rm -f glade-marshallers-h.tmp && exit 1) ! glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --body --header > glade-marshallers-c.tmp \ && mv glade-marshallers-c.tmp glade-marshallers.c \ || ( rm -f glade-marshallers-c.tmp && exit 1 ) --- 1356,1366 ---- # # Marshaller generation # ! glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \ && mv glade-marshallers-h.tmp glade-marshallers.h \ || ( rm -f glade-marshallers-h.tmp && exit 1) ! glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --body --header > glade-marshallers-c.tmp \ && mv glade-marshallers-c.tmp glade-marshallers.c \ || ( rm -f glade-marshallers-c.tmp && exit 1 ) *** plugins/gtk+/Makefile.in.orig Fri Nov 15 18:15:32 2013 --- plugins/gtk+/Makefile.in Fri Nov 15 18:15:55 2013 *************** *** 1159,1169 **** # # Marshaller generation # ! glade-gtk-marshallers.h: glade-gtk-marshallers.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --header > glade-gtk-marshallers-h.tmp \ && mv glade-gtk-marshallers-h.tmp glade-gtk-marshallers.h \ || ( rm -f glade-gtk-marshallers-h.tmp && exit 1) ! glade-gtk-marshallers.c: glade-gtk-marshallers.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --body --header > glade-gtk-marshallers-c.tmp \ && mv glade-gtk-marshallers-c.tmp glade-gtk-marshallers.c \ || ( rm -f glade-gtk-marshallers-c.tmp && exit 1 ) --- 1159,1169 ---- # # Marshaller generation # ! glade-gtk-marshallers.h: glade-gtk-marshallers.list $(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --header > glade-gtk-marshallers-h.tmp \ && mv glade-gtk-marshallers-h.tmp glade-gtk-marshallers.h \ || ( rm -f glade-gtk-marshallers-h.tmp && exit 1) ! glade-gtk-marshallers.c: glade-gtk-marshallers.list $(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --body --header > glade-gtk-marshallers-c.tmp \ && mv glade-gtk-marshallers-c.tmp glade-gtk-marshallers.c \ || ( rm -f glade-gtk-marshallers-c.tmp && exit 1 )