Hello community,
here is the log from the commit of package file-roller for openSUSE:Factory
checked in at Tue Oct 18 14:02:41 CEST 2011.
--------
--- openSUSE:Factory/file-roller/file-roller.changes 2011-10-11 16:53:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/file-roller/file-roller.changes 2011-10-17 21:35:00.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Oct 17 19:33:30 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.2.1:
+ + Do not crash if nautilus schema is not present
+ + Use $(DISABLE_DEPRECATED) in copy-n-paste/Makefile.am
+- Drop file-roller-no-crash-without-nautilus.patch: fixed upstream.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
file-roller-3.2.0.tar.bz2
file-roller-no-crash-without-nautilus.patch
New:
----
file-roller-3.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file-roller.spec ++++++
--- /var/tmp/diff_new_pack.xRS35e/_old 2011-10-18 14:02:36.000000000 +0200
+++ /var/tmp/diff_new_pack.xRS35e/_new 2011-10-18 14:02:36.000000000 +0200
@@ -18,15 +18,13 @@
Name: file-roller
-Version: 3.2.0
+Version: 3.2.1
Release: 1
License: GPLv2+
Summary: An Archive Manager for GNOME
Url: http://fileroller.sourceforge.net
Group: Productivity/Archiving/Compression
Source: http://download.gnome.org/sources/file-roller/3.2/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM file-roller-no-crash-without-nautilus.patch bgo#649094 bnc#722863 vuntz@opensuse.org -- Do not crash if nautilus gsettings schemas are not installed
-Patch0: file-roller-no-crash-without-nautilus.patch
# Needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
@@ -92,7 +90,6 @@
%prep
%setup -q
translation-update-upstream
-%patch0 -p1
%build
%configure\
++++++ file-roller-3.2.0.tar.bz2 -> file-roller-3.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/ChangeLog new/file-roller-3.2.1/ChangeLog
--- old/file-roller-3.2.0/ChangeLog 2011-09-26 20:21:41.000000000 +0200
+++ new/file-roller-3.2.1/ChangeLog 2011-10-17 20:18:02.000000000 +0200
@@ -1,6 +1,52 @@
+commit 6a69a8ecaefa712460b8b7613a93ebcd33c1822a
+Author: Paolo Bacchilega
+Date: 2011-10-17
+
+ updated for version 3.2.1
+
+M NEWS
+M configure.ac
+
+commit 0d5608aaf3dd5e60d1baafa10f3c19f5a1239905
+Author: Paolo Bacchilega
+Date: 2011-10-11
+
+ Fixed Nautilus schema check
+
+M src/fr-window.c
+
+commit 83ab53d16213fa79baad17ee63290287c708b0cf
+Author: Andreas Henriksson
+Date: 2011-10-10
+
+ Use $(DISABLE_DEPRECATED) in copy-n-paste/Makefile.am
+
+ Take the --disable-deprecated configure flag into account instead
+ of just always disabling deprecated code in copy-n-paste/.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=661031
+
+M copy-n-paste/Makefile.am
+
+commit 8b0c2a1401c10b351a7065bf83b7908fc52dd2b5
+Author: Vincent Untz
+Date: 2011-10-10
+
+ Do not crash if nautilus schema is not present
+
+ A lot of users use file-roller in non-GNOME environments, where
+ nautilus
+ is not installed. We don't want to crash in that case as we only need
+ the nautilus schema to determine if we use single-click vs
+ double-click.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=649094
+
+M src/fr-window.c
+
commit 5605825a022cd03e5d5d6614fdd5545f2929a0e6
Author: Paolo Bacchilega
-Date: 2011-09-26
+Date: 2011-09-26
updated for version 3.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/NEWS new/file-roller-3.2.1/NEWS
--- old/file-roller-3.2.0/NEWS 2011-09-26 20:21:15.000000000 +0200
+++ new/file-roller-3.2.1/NEWS 2011-10-17 20:14:45.000000000 +0200
@@ -1,3 +1,11 @@
+version 3.2.1
+-------------
+
+ Bugs fixed:
+
+ * Do not crash if nautilus schema is not present (Vincent Untz)
+ * Use $(DISABLE_DEPRECATED) in copy-n-paste/Makefile.am (Andreas Henriksson)
+
version 3.2.0
-------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/aclocal.m4 new/file-roller-3.2.1/aclocal.m4
--- old/file-roller-3.2.0/aclocal.m4 2011-09-26 20:16:40.000000000 +0200
+++ new/file-roller-3.2.1/aclocal.m4 2011-10-17 20:15:01.000000000 +0200
@@ -84,7 +84,7 @@
[
m4_pattern_allow([AM_V_GEN])
AC_ARG_ENABLE(schemas-compile,
- AC_HELP_STRING([--disable-schemas-compile],
+ AS_HELP_STRING([--disable-schemas-compile],
[Disable regeneration of gschemas.compiled on install]),
[case ${enableval} in
yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/configure new/file-roller-3.2.1/configure
--- old/file-roller-3.2.0/configure 2011-09-26 20:16:41.000000000 +0200
+++ new/file-roller-3.2.1/configure 2011-10-17 20:15:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for file-roller 3.2.0.
+# Generated by GNU Autoconf 2.68 for file-roller 3.2.1.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller.
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='file-roller'
PACKAGE_TARNAME='file-roller'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='file-roller 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='file-roller 3.2.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller'
PACKAGE_URL=''
@@ -1382,7 +1382,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures file-roller 3.2.0 to adapt to many kinds of systems.
+\`configure' configures file-roller 3.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1452,7 +1452,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file-roller 3.2.0:";;
+ short | recursive ) echo "Configuration of file-roller 3.2.1:";;
esac
cat <<\_ACEOF
@@ -1583,7 +1583,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file-roller configure 3.2.0
+file-roller configure 3.2.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1861,7 +1861,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by file-roller $as_me 3.2.0, which was
+It was created by file-roller $as_me 3.2.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2676,7 +2676,7 @@
# Define the identity of the package.
PACKAGE='file-roller'
- VERSION='3.2.0'
+ VERSION='3.2.1'
cat >>confdefs.h <<_ACEOF
@@ -13571,7 +13571,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by file-roller $as_me 3.2.0, which was
+This file was extended by file-roller $as_me 3.2.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13637,7 +13637,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file-roller config.status 3.2.0
+file-roller config.status 3.2.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/configure.ac new/file-roller-3.2.1/configure.ac
--- old/file-roller-3.2.0/configure.ac 2011-09-26 20:16:25.000000000 +0200
+++ new/file-roller-3.2.1/configure.ac 2011-10-17 20:14:51.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.61)
-AC_INIT(file-roller, 3.2.0, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller])
+AC_INIT(file-roller, 3.2.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/copy-n-paste/Makefile.am new/file-roller-3.2.1/copy-n-paste/Makefile.am
--- old/file-roller-3.2.0/copy-n-paste/Makefile.am 2011-08-04 09:46:36.000000000 +0200
+++ new/file-roller-3.2.1/copy-n-paste/Makefile.am 2011-10-10 10:54:32.000000000 +0200
@@ -1,6 +1,4 @@
-INCLUDES = -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED \
+INCLUDES = $(DISABLE_DEPRECATED) \
-UGETTEXT_PACKAGE
noinst_LTLIBRARIES = libeggsmclient.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/copy-n-paste/Makefile.in new/file-roller-3.2.1/copy-n-paste/Makefile.in
--- old/file-roller-3.2.0/copy-n-paste/Makefile.in 2011-09-26 20:16:42.000000000 +0200
+++ new/file-roller-3.2.1/copy-n-paste/Makefile.in 2011-10-17 20:15:03.000000000 +0200
@@ -246,9 +246,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED \
+INCLUDES = $(DISABLE_DEPRECATED) \
-UGETTEXT_PACKAGE
noinst_LTLIBRARIES = libeggsmclient.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/data/file-roller.desktop new/file-roller-3.2.1/data/file-roller.desktop
--- old/file-roller-3.2.0/data/file-roller.desktop 2011-09-26 20:17:29.000000000 +0200
+++ new/file-roller-3.2.1/data/file-roller.desktop 2011-10-17 20:15:38.000000000 +0200
@@ -204,4 +204,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=file-roller
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.2.0
+X-GNOME-Bugzilla-Version=3.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/data/file-roller.desktop.in new/file-roller-3.2.1/data/file-roller.desktop.in
--- old/file-roller-3.2.0/data/file-roller.desktop.in 2011-09-26 20:17:21.000000000 +0200
+++ new/file-roller-3.2.1/data/file-roller.desktop.in 2011-10-17 20:15:31.000000000 +0200
@@ -13,4 +13,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=file-roller
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.2.0
+X-GNOME-Bugzilla-Version=3.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/file-roller.spec new/file-roller-3.2.1/file-roller.spec
--- old/file-roller-3.2.0/file-roller.spec 2011-09-26 20:17:21.000000000 +0200
+++ new/file-roller-3.2.1/file-roller.spec 2011-10-17 20:15:31.000000000 +0200
@@ -1,7 +1,7 @@
%define release 6
%define prefix /usr
%define name file-roller
-%define version 3.2.0
+%define version 3.2.1
Summary: An archive manager for GNOME.
Name: %{name}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.2.0/src/fr-window.c new/file-roller-3.2.1/src/fr-window.c
--- old/file-roller-3.2.0/src/fr-window.c 2011-09-23 18:03:00.000000000 +0200
+++ new/file-roller-3.2.1/src/fr-window.c 2011-10-11 11:07:51.000000000 +0200
@@ -4654,6 +4654,9 @@
char *value;
gboolean result;
+ if (window->priv->settings_nautilus == NULL)
+ return FALSE;
+
value = g_settings_get_string (window->priv->settings_nautilus, NAUTILUS_CLICK_POLICY);
result = (value != NULL) && (strncmp (value, "single", 6) == 0);
g_free (value);
@@ -5404,24 +5407,25 @@
static void
fr_window_construct (FrWindow *window)
{
- GtkWidget *menubar;
- GtkWidget *toolbar;
- GtkWidget *list_scrolled_window;
- GtkWidget *location_box;
- GtkStatusbar *statusbar;
- GtkWidget *statusbar_box;
- GtkWidget *filter_box;
- GtkWidget *tree_scrolled_window;
- GtkWidget *sidepane_title;
- GtkWidget *sidepane_title_box;
- GtkWidget *sidepane_title_label;
- GtkWidget *close_sidepane_button;
- GtkTreeSelection *selection;
- GtkActionGroup *actions;
- GtkUIManager *ui;
- GtkToolItem *open_recent_tool_item;
- GtkWidget *menu_item;
- GError *error = NULL;
+ GtkWidget *menubar;
+ GtkWidget *toolbar;
+ GtkWidget *list_scrolled_window;
+ GtkWidget *location_box;
+ GtkStatusbar *statusbar;
+ GtkWidget *statusbar_box;
+ GtkWidget *filter_box;
+ GtkWidget *tree_scrolled_window;
+ GtkWidget *sidepane_title;
+ GtkWidget *sidepane_title_box;
+ GtkWidget *sidepane_title_label;
+ GtkWidget *close_sidepane_button;
+ GtkTreeSelection *selection;
+ GtkActionGroup *actions;
+ GtkUIManager *ui;
+ GtkToolItem *open_recent_tool_item;
+ GtkWidget *menu_item;
+ GError *error = NULL;
+ const char * const *schemas;
/* data common to all windows. */
@@ -5438,7 +5442,17 @@
window->priv->settings_ui = g_settings_new (FILE_ROLLER_SCHEMA_UI);
window->priv->settings_general = g_settings_new (FILE_ROLLER_SCHEMA_GENERAL);
window->priv->settings_dialogs = g_settings_new (FILE_ROLLER_SCHEMA_DIALOGS);
- window->priv->settings_nautilus = g_settings_new (NAUTILUS_SCHEMA);
+
+ /* Only use the nautilus schema if it's installed */
+ for (schemas = g_settings_list_schemas ();
+ *schemas != NULL;
+ schemas++)
+ {
+ if (g_strcmp0 (*schemas, NAUTILUS_SCHEMA) == 0) {
+ window->priv->settings_nautilus = g_settings_new (NAUTILUS_SCHEMA);
+ break;
+ }
+ }
/* Create the application. */
@@ -6035,10 +6049,12 @@
"changed::" PREF_LISTING_USE_MIME_ICONS,
G_CALLBACK (pref_use_mime_icons_changed),
window);
- g_signal_connect (window->priv->settings_nautilus,
- "changed::" NAUTILUS_CLICK_POLICY,
- G_CALLBACK (pref_click_policy_changed),
- window);
+
+ if (window->priv->settings_nautilus)
+ g_signal_connect (window->priv->settings_nautilus,
+ "changed::" NAUTILUS_CLICK_POLICY,
+ G_CALLBACK (pref_click_policy_changed),
+ window);
/* Give focus to the list. */
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org