From 6eace48cb5609a1edb7fbc27bbcc259e709d7451 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sat, 17 Nov 2001 02:13:25 +0000
Subject: [PATCH] Build separate runtime and developer packages.

2001-11-17  Tor Lillqvist  <tml@iki.fi>

	* gtk-zip.sh.in: Build separate runtime and developer
	packages.

	* gtk/gtk.def: Reflect recent accelerator-related changes.
---
 ChangeLog          |  7 +++++++
 ChangeLog.pre-2-0  |  7 +++++++
 ChangeLog.pre-2-10 |  7 +++++++
 ChangeLog.pre-2-2  |  7 +++++++
 ChangeLog.pre-2-4  |  7 +++++++
 ChangeLog.pre-2-6  |  7 +++++++
 ChangeLog.pre-2-8  |  7 +++++++
 gtk-zip.sh.in      | 26 +++++++++++++++----------
 gtk/gtk.def        | 48 +++++++++++++++++-----------------------------
 9 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4281ef849..447832df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4281ef849..447832df6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-11-17  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk-zip.sh.in: Build separate runtime and developer
+	packages.
+
+	* gtk/gtk.def: Reflect recent accelerator-related changes.
+
 Fri Nov 16 19:44:35 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwindow.c (gtk_window_set_default): Move 
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index ac5c485f3..677be6d3a 100755
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -1,27 +1,34 @@
 #!/bin/sh
 
-# Build zipfile for GTK on Win32: both runtime and developer stuff
+# Build zipfiles for GTK on Win32
 
-# These two directory paths are obviously system-dependent.
-# These are what tml@iki.fi uses, change as appropriate.
-ZIP=/g/tmp/gtk+-@GTK_VERSION@-`date +%Y%m%d`.zip
-cd /target
+ZIP=/tmp/gtk+-@GTK_VERSION@-`date +%Y%m%d`.zip
+DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@-`date +%Y%m%d`.zip
+cd @prefix@
 
 rm $ZIP
 zip -r $ZIP -@ <<EOF
 COPYING.LIB-2
 etc/gtk-2.0
-include/gtk-2.0
 lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+EOF
+
+zip $ZIP lib/gtk-2.0/@GTK_VERSION@/loaders/*.dll lib/gtk-2.0/immodules/@GTK_VERSION@/*.dll
+
+zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
+
+rm $DEVZIP
+zip -r $DEVZIP -@ <<EOF
+include/gtk-2.0
 lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
 lib/gdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
 lib/gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
 lib/gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/gtk-2.0
+lib/gtk-2.0/include
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-win32-2.0.pc
@@ -30,4 +37,3 @@ lib/pkgconfig/gtk+-win32-2.0.pc
 share/aclocal/gtk-2.0.m4
 EOF
 
-zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 34230aa5f..36a729a2b 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -87,34 +87,31 @@ EXPORTS
 	GTK_TYPE_WINDOW_TYPE
 	GTK_TYPE_WRAP_MODE
 
-	gtk_accel_group_activate
-	gtk_accel_group_add
-	gtk_accel_group_attach
-	gtk_accel_group_create_add
-	gtk_accel_group_create_remove
-	gtk_accel_group_detach
-	gtk_accel_group_entries_from_object
-	gtk_accel_group_get_default
-	gtk_accel_group_get_entry
+	gtk_accel_group_connect
+	gtk_accel_group_disconnect
 	gtk_accel_group_get_type
-	gtk_accel_group_handle_add
-	gtk_accel_group_handle_remove
 	gtk_accel_group_lock
-	gtk_accel_group_lock_entry
 	gtk_accel_group_new
-	gtk_accel_group_ref
-	gtk_accel_group_remove
 	gtk_accel_group_unlock
-	gtk_accel_group_unlock_entry
-	gtk_accel_group_unref
 	gtk_accel_groups_activate
-	gtk_accel_groups_from_object
-	gtk_accel_label_get_accel_object
 	gtk_accel_label_get_accel_width
 	gtk_accel_label_get_type
 	gtk_accel_label_new
 	gtk_accel_label_refetch
-	gtk_accel_label_set_accel_object
+	gtk_accel_label_set_accel_closure
+	gtk_accel_label_set_accel_widget
+	gtk_accel_map_add_entry
+	gtk_accel_map_add_filter
+	gtk_accel_map_add_notifer
+	gtk_accel_map_change_entry
+	gtk_accel_map_foreach
+	gtk_accel_map_load
+	gtk_accel_map_load_fd
+	gtk_accel_map_load_scanner
+	gtk_accel_map_save
+	gtk_accel_map_save_fd
+	gtk_accel_map_lookup_entry
+	gtk_accel_map_remove_notifer
 	gtk_accelerator_get_default_mod_mask
 	gtk_accelerator_name
 	gtk_accelerator_parse
@@ -778,8 +775,6 @@ EXPORTS
 	gtk_item_factory_delete_entries
 	gtk_item_factory_delete_entry
 	gtk_item_factory_delete_item
-	gtk_item_factory_dump_items
-	gtk_item_factory_dump_rc
 	gtk_item_factory_from_path
 	gtk_item_factory_from_widget
 	gtk_item_factory_get_item
@@ -788,15 +783,11 @@ EXPORTS
 	gtk_item_factory_get_widget
 	gtk_item_factory_get_widget_by_action
 	gtk_item_factory_new
-	gtk_item_factory_parse_rc
-	gtk_item_factory_parse_rc_scanner
-	gtk_item_factory_parse_rc_string
 	gtk_item_factory_path_from_widget
 	gtk_item_factory_popup
 	gtk_item_factory_popup_data
 	gtk_item_factory_popup_data_from_widget
 	gtk_item_factory_popup_with_data
-	gtk_item_factory_print_func
 	gtk_item_factory_set_translate_func
 	gtk_item_get_type
 	gtk_item_select
@@ -964,6 +955,7 @@ EXPORTS
 	gtk_menu_item_new_with_mnemonic
 	gtk_menu_item_remove_submenu
 	gtk_menu_item_select
+	gtk_menu_item_set_accel_path
 	gtk_menu_item_set_right_justified
 	gtk_menu_item_set_submenu
 	gtk_menu_item_toggle_size_allocate
@@ -974,6 +966,7 @@ EXPORTS
 	gtk_menu_reorder_child
 	gtk_menu_reposition
 	gtk_menu_set_accel_group
+	gtk_menu_set_accel_path
 	gtk_menu_set_active
 	gtk_menu_set_tearoff_state
 	gtk_menu_set_title
@@ -1987,8 +1980,6 @@ EXPORTS
 	gtk_vscrollbar_new
 	gtk_vseparator_get_type
 	gtk_vseparator_new
-	gtk_widget_accelerator_signal
-	gtk_widget_accelerators_locked
 	gtk_widget_activate
 	gtk_widget_add_accelerator
 	gtk_widget_add_events
@@ -2038,7 +2029,6 @@ EXPORTS
 	gtk_widget_intersect
 	gtk_widget_is_ancestor
 	gtk_widget_is_focus
-	gtk_widget_lock_accelerators
 	gtk_widget_map
 	gtk_widget_mnemonic_activate
 	gtk_widget_modify_base
@@ -2062,7 +2052,6 @@ EXPORTS
 	gtk_widget_ref
 	gtk_widget_region_intersect
 	gtk_widget_remove_accelerator
-	gtk_widget_remove_accelerators
 	gtk_widget_render_icon
 	gtk_widget_reparent
 	gtk_widget_reset_rc_styles
@@ -2100,7 +2089,6 @@ EXPORTS
 	gtk_widget_style_get_valist
 	gtk_widget_thaw_child_notify
 	gtk_widget_translate_coordinates
-	gtk_widget_unlock_accelerators
 	gtk_widget_unmap
 	gtk_widget_unparent
 	gtk_widget_unrealize
-- 
2.43.2