Hello community, here is the log from the commit of package planner for openSUSE:Factory checked in at 2012-08-10 19:02:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/planner (Old) and /work/SRC/openSUSE:Factory/.planner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "planner", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/planner/planner.changes 2012-01-05 19:15:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.planner.new/planner.changes 2012-08-10 19:02:41.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Aug 9 08:09:04 UTC 2012 - dims...@opensuse.org + +- Add planner-libgnome.patch: link libsql-plugin to libgnome + (bnc#775189). +- Add gnome-common BuildRequires and call gnome-autogen.sh, as + above patch touches the build system. + +------------------------------------------------------------------- +Wed Aug 8 08:28:07 UTC 2012 - dims...@opensuse.org + +- Add planner-cmdline.patch: Fix for broken "open file on startup" + behaviour (bnc#774972, bgo#656373). + +------------------------------------------------------------------- New: ---- planner-cmdline.patch planner-libgnome.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ planner.spec ++++++ --- /var/tmp/diff_new_pack.raxtHY/_old 2012-08-10 19:02:44.000000000 +0200 +++ /var/tmp/diff_new_pack.raxtHY/_new 2012-08-10 19:02:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package planner # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_eds_backend 0%{?suse_version} <= 1130 Name: planner @@ -26,13 +27,17 @@ Group: Productivity/Office/Management Url: http://live.gnome.org/Planner Source: http://download.gnome.org/sources/planner/0.14/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM planner-cmdline.patch bnc#774972 bgo#656372 dims...@opensuse.org -- Fix for broken "open file on startup" behaviour +Patch0: planner-cmdline.patch +# PATCH-FIX-UPSTREAM planner-libgnome.patch bgo#681497 bnc#775189 dims...@opensuse.org -- Link libsql-plugin to libgnome. +Patch1: planner-libgnome.patch BuildRequires: evolution-data-server-devel %if %build_eds_backend BuildRequires: evolution-devel %endif # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: fdupes +BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgda-3_0-devel @@ -42,6 +47,7 @@ BuildRequires: python-devel BuildRequires: python-gtk-devel BuildRequires: scrollkeeper +BuildRequires: xz # We need the %%mime_database_* macros BuildRequires: shared-mime-info BuildRequires: translation-update-upstream @@ -72,8 +78,12 @@ %package devel Summary: Project Management Application for GNOME Group: Productivity/Office/Management -Requires: %{name} = %{version} glib2-devel libxml2-devel libgsf-devel -Requires: gnome-vfs2-devel gconf2-devel +Requires: %{name} = %{version} +Requires: gconf2-devel +Requires: glib2-devel +Requires: gnome-vfs2-devel +Requires: libgsf-devel +Requires: libxml2-devel Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} @@ -84,9 +94,12 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 translation-update-upstream %build +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static --with-pic \ --disable-schemas-install \ --disable-scrollkeeper \ @@ -109,8 +122,6 @@ rm -r %{buildroot}%{_localstatedir}/scrollkeeper find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print cp AUTHORS COPYING ChangeLog NEWS README COPYING $RPM_BUILD_ROOT%{_docdir}/%{name} -# Change sr@Latn to sr@latin -mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin %find_lang %{name} %{?no_lang_C} %find_gconf_schemas %suse_update_desktop_file -N "Planner" -G "Project Management" -C "" planner ++++++ planner-cmdline.patch ++++++ >From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001 From: Alexandre Franke <alexandre.fra...@gmail.com> Date: Mon, 05 Mar 2012 17:22:56 +0000 Subject: Fix for broken "open file on startup" behaviour Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser. Based on patches 193670 and 193835 by Maxim Zakharov. https://bugzilla.gnome.org/show_bug.cgi?id=656373 --- diff --git a/src/planner-main.c b/src/planner-main.c index cdeb8ea..c0aabd2 100644 --- a/src/planner-main.c +++ b/src/planner-main.c @@ -37,7 +37,7 @@ static gchar **args_remaining = NULL; static GOptionEntry options[] = { { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")}, - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") }, { NULL } }; @@ -92,26 +92,27 @@ main (int argc, char **argv) gtk_widget_show_all (main_window); - if (argc > 1) { - i = 1; - while (argv[i]) { - if (g_str_has_prefix (argv[i], "file:")) { + if (args_remaining != NULL) { + for (i = 0; args_remaining[i]; i++) { + gchar *scheme = g_uri_parse_scheme(args_remaining[i]); + if (scheme != NULL) { planner_window_open_in_existing_or_new ( - PLANNER_WINDOW (main_window), argv[i], FALSE); + PLANNER_WINDOW (main_window), args_remaining[i], FALSE); + g_free(scheme); } else { gchar *uri; - if (!g_path_is_absolute (argv[i])) { + if (!g_path_is_absolute (args_remaining[i])) { /* Relative path. */ gchar *cwd, *tmp; cwd = g_get_current_dir (); - tmp = g_build_filename (cwd, argv[i], NULL); + tmp = g_build_filename (cwd, args_remaining[i], NULL); uri = g_filename_to_uri (tmp, NULL, NULL); g_free (tmp); g_free (cwd); } else { - uri = g_filename_to_uri (argv[i], NULL, NULL); + uri = g_filename_to_uri (args_remaining[i], NULL, NULL); } if (uri) { @@ -120,8 +121,6 @@ main (int argc, char **argv) g_free (uri); } } - - i++; } } diff --git a/src/planner-window.c b/src/planner-window.c index 73f1766..b0536c3 100644 --- a/src/planner-window.c +++ b/src/planner-window.c @@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window, { PlannerWindowPriv *priv; GtkWidget *new_window; - gchar *filename; gboolean ret; priv = window->priv; - - filename = g_filename_from_uri (uri, NULL, NULL); - if (!filename) { - return FALSE; - } - if (mrp_project_is_empty (priv->project)) { - ret = planner_window_open (window, filename, internal); - g_free (filename); + ret = planner_window_open (window, uri, internal); return ret; } else { new_window = planner_application_new_window (priv->application); - if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) { - g_free (filename); + if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) { gtk_widget_show_all (new_window); return TRUE; } else { - g_free (filename); g_signal_emit (new_window, signals[CLOSED], 0, NULL); gtk_widget_destroy (new_window); return FALSE; } } - g_free (filename); - return FALSE; } -- cgit v0.9.0.2 ++++++ planner-libgnome.patch ++++++ Index: planner-0.14.6/src/Makefile.am =================================================================== --- planner-0.14.6.orig/src/Makefile.am +++ planner-0.14.6/src/Makefile.am @@ -175,8 +175,8 @@ plugindir = $(libdir)/planner/plugins if HAVE_GDA sql_plugin = libsql-plugin.la libsql_plugin_la_SOURCES = planner-sql-plugin.c -libsql_plugin_la_LIBADD = $(GDA_LIBS) -libsql_plugin_la_CFLAGS = $(GDA_CFLAGS) -DGDA_VERSION=@GDA_VER@ +libsql_plugin_la_LIBADD = $(GDA_LIBS) $(PLANNER_LIBS) +libsql_plugin_la_CFLAGS = $(GDA_CFLAGS) -DGDA_VERSION=@GDA_VER@ $(PLANNER_CFLAGS) libsql_plugin_la_LDFLAGS = -avoid-version -module endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
