Hello community, here is the log from the commit of package initial checked in at Thu Nov 23 16:17:35 CET 2006. -------- --- GNOME/initial/initial.changes 2006-07-14 08:06:27.000000000 +0200 +++ initial/initial.changes 2006-11-22 12:48:07.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 22 12:40:10 CET 2006 - thoenig@suse.de + +- fix crash on exit (do not garbage collect manager object), don't + create multiple instances of InputManager to avoid crashes (b.n.c + #220310) +- fix various build issues, BuildRequires and Requires, clean up + spec file (patches by Andreas Hanke, b.n.c #220321) + +------------------------------------------------------------------- Old: ---- initial-0.1-config.patch initial-mkinstalldirs.diff New: ---- initial-dbus-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ initial.spec ++++++ --- /var/tmp/diff_new_pack.H5cchD/_old 2006-11-23 16:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.H5cchD/_new 2006-11-23 16:16:54.000000000 +0100 @@ -11,24 +11,23 @@ # norootforbuild Name: initial -BuildRequires: dbus-1-mono glade-sharp gnome-sharp gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files +BuildRequires: dbus-1-mono glade-sharp2 glib-sharp2 gnome-common gnome-sharp2 gnutls-devel gtk-sharp2 intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files %define _prefix /opt/gnome URL: http://ial.berlios.de -License: GPL +License: GNU General Public License (GPL) Version: 0.1 -Release: 30 +Release: 59 Autoreqprov: on Group: System/GUI/GNOME -Summary: Initial Provides an Easy to Use Configuration of Hotkeys +Summary: Initial for Easy Configuration of Hotkeys Source0: %{name}-%{version}.tar.bz2 -Patch: %{name}-mkinstalldirs.diff -Patch2: %{name}-%{version}-config.patch -Requires: ial, dbus-1-mono, mono-core, gnome-desktop, glade, gtk-sharp, gtk2 +Patch0: %{name}-dbus-fixes.patch +Requires: ial, dbus-1-mono, mono-core, gnome-sharp2, glade-sharp2, gtk-sharp2, gtk2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Initial provides an easy to use configuration of hotkeys, such as -multimedia keys, function keys found on laptop, and special input +Initial is an easy-to-use configuration tool for hotkeys, such as +multimedia keys, function keys found on laptops, and special input devices like IR receivers. @@ -39,10 +38,11 @@ %prep %setup -n %{name}-%{version} -q -%patch -p1 -%patch2 -p1 +%patch -p0 %build +intltoolize -c -f +autoreconf -f -i export CFLAGS="${RPM_OPT_FLAGS}" ./configure \ --prefix=%_prefix \ @@ -54,21 +54,11 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/%_prefix -mkdir -p $RPM_BUILD_ROOT/%_prefix/%_lib/initial %find_lang %{name} %clean %{__rm} -rf "%{buildroot}" -%pre - -%post -%{run_ldconfig} - -%postun -%{run_ldconfig} - %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README @@ -77,6 +67,12 @@ %{_prefix}/%_lib/initial/* %changelog -n initial +* Wed Nov 22 2006 - thoenig@suse.de +- fix crash on exit (do not garbage collect manager object), don't + create multiple instances of InputManager to avoid crashes (b.n.c + [#220310]) +- fix various build issues, BuildRequires and Requires, clean up + spec file (patches by Andreas Hanke, b.n.c #220321) * Fri Jul 14 2006 - olh@suse.de - rename bzip2 archive from .gz to .bz2 * Wed Jan 25 2006 - mls@suse.de ++++++ initial-0.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/initial-0.1/acinclude.m4 new/initial-0.1/acinclude.m4 --- old/initial-0.1/acinclude.m4 2005-09-05 14:07:18.000000000 +0200 +++ new/initial-0.1/acinclude.m4 2006-11-22 09:56:38.000000000 +0100 @@ -1,15 +1,19 @@ - -dnl as-ac-expand.m4 0.1.0 +dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix -dnl thomas@apestaart.org + +dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org> + +dnl Copying and distribution of this file, with or without modification, +dnl are permitted in any medium without royalty provided the copyright +dnl notice and this notice are preserved. dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl -dnl example + +dnl example: dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local -AC_DEFUN(AS_AC_EXPAND, +AC_DEFUN([AS_AC_EXPAND], [ EXP_VAR=[$1] FROM_VAR=[$2] @@ -20,7 +24,7 @@ dnl if no prefix given, then use /usr/local, the default prefix if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix + prefix="$ac_default_prefix" fi dnl if no exec_prefix given, then use prefix if test "x$exec_prefix" = "xNONE"; then @@ -31,7 +35,7 @@ dnl loop until it doesn't change anymore while true; do new_full_var="`eval echo $full_var`" - if test "x$new_full_var"="x$full_var"; then break; fi + if test "x$new_full_var" = "x$full_var"; then break; fi full_var=$new_full_var done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/initial-0.1/configure.in new/initial-0.1/configure.in --- old/initial-0.1/configure.in 2005-09-05 14:07:18.000000000 +0200 +++ new/initial-0.1/configure.in 2006-11-22 09:56:24.000000000 +0100 @@ -42,10 +42,10 @@ LIBGNOME_REQUIRED=2.2 LIBGNOMEUI_REQUIRED=2.2 -GTKSHARP_REQUIRED=1.0 +GTKSHARP_REQUIRED=2.0 LIBGNOMEUI_REQUIRED=2.2 -PKG_CHECK_MODULES(INITIAL, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED glade-sharp >= $GTKSHARP_REQUIRED gtk+-2.0 >= 2.4) +PKG_CHECK_MODULES(INITIAL, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= 2.4) AC_SUBST(INITIAL_CFLAGS) AC_SUBST(INITIAL_LIBS) @@ -79,6 +79,7 @@ po/Makefile.in src/Makefile src/Initial_def.cs +src/initial.exe.config ]) echo " diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/initial-0.1/src/Makefile.am new/initial-0.1/src/Makefile.am --- old/initial-0.1/src/Makefile.am 2005-09-05 14:07:18.000000000 +0200 +++ new/initial-0.1/src/Makefile.am 2006-11-22 09:56:24.000000000 +0100 @@ -11,9 +11,9 @@ ASSEMBLIES = \ -pkg:dbus-sharp \ - -pkg:gtk-sharp \ - -pkg:glade-sharp \ - -pkg:gnome-sharp \ + -pkg:gtk-sharp-2.0 \ + -pkg:glade-sharp-2.0 \ + -pkg:gnome-sharp-2.0 \ -r:Mono.Posix RESOURCES = \ @@ -21,9 +21,9 @@ -resource:$(srcdir)/ui/ial.png,ial.png initiallibdir = $(libdir)/initial -initiallib_DATA = initial.exe +initiallib_DATA = initial.exe initial.exe.config -bin_SCRIPTS = initial +bin_SCRIPTS = initial initial.exe: $(INITIAL_CSFILES) ui/initial.glade $(CSC) -out:$@ $(CSFLAGS) $(INITIAL_CSFILES) $(ASSEMBLIES) $(RESOURCES) @@ -31,6 +31,7 @@ all: initial.exe EXTRA_DIST = \ + initial.exe.config.in \ $(INITIAL_CSFILES) \ ui/initial.glade \ ui/ial.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/initial-0.1/src/initial.exe.config.in new/initial-0.1/src/initial.exe.config.in --- old/initial-0.1/src/initial.exe.config.in 1970-01-01 01:00:00.000000000 +0100 +++ new/initial-0.1/src/initial.exe.config.in 2006-11-22 09:56:17.000000000 +0100 @@ -0,0 +1,4 @@ +<configuration> + <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0" /> + <dllmap dll="libX11" target="libX11.so.6" /> +</configuration> ++++++ initial-dbus-fixes.patch ++++++ diff -urN src/Initial.cs MOD/initial-0.1/src/Initial.cs --- src/Initial.cs 2005-09-05 14:07:18.000000000 +0200 +++ src/Initial.cs 2006-11-22 12:23:37.000000000 +0100 @@ -345,6 +345,7 @@ { public static InitialConfiguration Config; public static UserInterface ui; + static InputManager inputmanager; static void OnInputEvent (string sender, string source, string name, int raw) { @@ -355,6 +356,11 @@ ea.initial_action.Trigger (); } } + + static public InputManager getInputManager () + { + return inputmanager; + } public Initial () { @@ -362,8 +368,6 @@ Gtk.Application.Init (); - InputManager inputmanager; - inputmanager = InputManager.New (); if (inputmanager == null) { return; diff -urN src/Initial_dbus.cs MOD/initial-0.1/src/Initial_dbus.cs --- src/Initial_dbus.cs 2005-09-05 14:07:18.000000000 +0200 +++ src/Initial_dbus.cs 2006-11-22 12:23:26.000000000 +0100 @@ -87,6 +87,7 @@ if (manager == null) return null; + System.GC.SuppressFinalize(manager); return manager; } } diff -urN src/Initial_ui.cs MOD/initial-0.1/src/Initial_ui.cs --- src/Initial_ui.cs 2005-09-05 14:07:18.000000000 +0200 +++ src/Initial_ui.cs 2006-11-22 12:26:58.000000000 +0100 @@ -181,7 +181,7 @@ } } - void on_dlg_add_event_delete_event (object o, EventArgs args) + void on_dlg_add_event_delete_event (object o, Gtk.DeleteEventArgs args) { inputmanager.InputEvent -= EventReceived;; dlg_add_event.Destroy (); @@ -310,7 +310,7 @@ axkey = new ActionXKeysym (); asys = new ActionSystem (); - inputmanager = InputManager.New (); + inputmanager = Initial.getInputManager (); inputmanager.InputEvent += new InputEventHandler (EventReceived); } } diff -urN src/ui/initial.glade MOD/initial-0.1/src/ui/initial.glade --- src/ui/initial.glade 2005-09-05 14:07:18.000000000 +0200 +++ src/ui/initial.glade 2006-11-22 12:28:13.000000000 +0100 @@ -2409,7 +2409,7 @@ <property name="resizable">False</property> <property name="destroy_with_parent">False</property> <property name="has_separator">True</property> - <signal name="delete_event" handler="on_dlg_press_button_close" last_modification_time="Tue, 07 Jun 2005 11:27:28 GMT"/> +<!-- <signal name="delete_event" handler="on_dlg_press_button_close" last_modification_time="Tue, 07 Jun 2005 11:27:28 GMT"/>--> <child internal-child="vbox"> <widget class="GtkVBox" id="vbox_main"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org