Hello community,

here is the log from the commit of package tracker for 
openSUSE:12.1:Update:Test checked in at 2012-03-23 14:50:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/tracker (Old)
 and      /work/SRC/openSUSE:12.1:Update:Test/.tracker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "tracker", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/tracker/tracker-extras.changes  
2012-03-23 14:50:47.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.tracker.new/tracker-extras.changes     
2012-03-23 14:50:47.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Mar  9 14:47:23 UTC 2012 - vu...@opensuse.org
+
+- Add tracker-ff-tb-fixes.patch: fixes from git, to avoid
+  GC-related crashes in Firefox/Thunderbird, caused by tracker
+  extensions. Fix bnc#745977 and bnc#746647.
+
+-------------------------------------------------------------------
tracker.changes: same change

New:
----
  tracker-ff-tb-fixes.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tracker-extras.spec ++++++
--- /var/tmp/diff_new_pack.FZjfhv/_old  2012-03-23 14:50:48.000000000 +0100
+++ /var/tmp/diff_new_pack.FZjfhv/_new  2012-03-23 14:50:48.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package tracker-extras
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Luis Medinas, Portugal
 #
 # All modifications and additions to the file contributed by third parties
@@ -47,16 +47,15 @@
 %define thunderbird_appid  \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
 
 # Do not edit this auto generated file! Edit tracker.spec.
-
 Name:           tracker-extras
 %define _name   tracker
 Version:        0.12.5
-Release:        1
+Release:        0
 # FIXME: missing pkgconfig(libcue) BuildRequires: we don't have this 
packaged...
-License:        GPLv2+
 Summary:        Powerful object database, tag/metadata database, search tool 
and indexer
-Url:            http://projects.gnome.org/tracker/
+License:        GPL-2.0+
 Group:          Productivity/Other
+Url:            http://projects.gnome.org/tracker/
 Source0:        
http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.bz2
 Source1:        README.SUSE.flickr
 Source2:        README.SUSE.rss
@@ -64,6 +63,8 @@
 Patch1:         tracker-removeable-media-off.patch
 # PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch 
malcolmle...@opensuse.org -- Add linux/sched.h to includes for 11.4 only for 
the location of SCHED_IDLE. This is only needed for 11.4 and earlier.
 Patch2:         tracker-fix-include-sched-idle.patch
+# PATCH-FIX-UPSTREAM tracker-ff-tb-fixes.patch bgo#670251 bnc#745977 
bnc#746647 vu...@opensuse.org -- Add fixes to firefox and thunderbird 
extensions, to avoid GC-related crashes with new FF/TB
+Patch3:         tracker-ff-tb-fixes.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@@ -97,11 +98,11 @@
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libgupnp-dlna-devel >= 0.5
 %endif
+BuildRequires:  libexempi-devel
 BuildRequires:  libiptcdata-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpoppler-glib-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libexempi-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  taglib-devel
@@ -164,7 +165,6 @@
 %if !%{build_extras}
 
 %package -n %{_name}-miner-files
-License:        GPLv2+
 Summary:        Tracker miner to index files and applications
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -177,7 +177,6 @@
 This package contains a miner to index files and applications.
 
 %package -n libtracker-extract-0_12-0
-License:        GPLv2+
 Summary:        Extract library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -199,7 +198,6 @@
 and search all types of files and other first class objects.
 
 %package -n libtracker-miner-0_12-0
-License:        GPLv2+
 Summary:        Miner library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -220,7 +218,6 @@
 and search all types of files and other first class objects.
 
 %package -n libtracker-sparql-0_12-0
-License:        GPLv2+
 Summary:        Sparql library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -241,7 +238,6 @@
 and search all types of files and other first class objects.
 
 %package -n tracker-devel
-License:        GPLv2+
 Summary:        Tracker -- Development files
 Group:          Development/Libraries/GNOME
 Requires:       libtracker-extract-0_12-0 = %{version}
@@ -267,7 +263,6 @@
 %if %{build_evo}
 
 %package -n %{_name}-miner-evolution
-License:        GPLv2+
 Summary:        Tracker miner to index Evolution mails
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -290,7 +285,6 @@
 %if %{build_firefox}
 
 %package -n %{_name}-miner-firefox
-License:        GPLv2+
 Summary:        Tracker miner to index Firefox bookmarks
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -310,7 +304,6 @@
 %if %{build_miner_flickr}
 
 %package -n %{_name}-miner-flickr
-License:        GPLv2+
 Summary:        Tracker miner to index Flickr images
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -325,7 +318,6 @@
 %if %{build_miner_rss}
 
 %package -n %{_name}-miner-rss
-License:        GPLv2+
 Summary:        Tracker miner to index ATOM and RSS feeds
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -340,7 +332,6 @@
 %if %{build_thunderbird}
 
 %package -n %{_name}-miner-thunderbird
-License:        GPLv2+
 Summary:        Tracker miner to index Thunderbird mails
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -360,7 +351,6 @@
 %if %{build_gui}
 
 %package -n %{_name}-gui
-License:        GPLv2+
 Summary:        Graphical User Interface for Tracker
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -385,7 +375,6 @@
 %if %{build_applet}
 
 %package -n gnome-panel-applet-tracker
-License:        GPLv2+
 Summary:        A GNOME panel applet for Tracker
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -405,7 +394,6 @@
 %if %{build_nautilus}
 
 %package -n nautilus-extension-tracker-tags
-License:        GPLv2+
 Summary:        Tracker Plugin for Nautilus
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -434,6 +422,7 @@
 %patch1 -p1
 %patch2
 %endif
+%patch3 -p1
 cp %{S:1} src/miners/flickr/README.SUSE
 cp %{S:2} src/miners/rss/README.SUSE
 

++++++ tracker.spec ++++++
--- /var/tmp/diff_new_pack.FZjfhv/_old  2012-03-23 14:50:48.000000000 +0100
+++ /var/tmp/diff_new_pack.FZjfhv/_new  2012-03-23 14:50:48.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package tracker
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Luis Medinas, Portugal
 #
 # All modifications and additions to the file contributed by third parties
@@ -49,12 +49,12 @@
 Name:           tracker
 %define _name   tracker
 Version:        0.12.5
-Release:        1
+Release:        0
 # FIXME: missing pkgconfig(libcue) BuildRequires: we don't have this 
packaged...
-License:        GPLv2+
 Summary:        Powerful object database, tag/metadata database, search tool 
and indexer
-Url:            http://projects.gnome.org/tracker/
+License:        GPL-2.0+
 Group:          Productivity/Other
+Url:            http://projects.gnome.org/tracker/
 Source0:        
http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.bz2
 Source1:        README.SUSE.flickr
 Source2:        README.SUSE.rss
@@ -62,6 +62,8 @@
 Patch1:         tracker-removeable-media-off.patch
 # PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch 
malcolmle...@opensuse.org -- Add linux/sched.h to includes for 11.4 only for 
the location of SCHED_IDLE. This is only needed for 11.4 and earlier.
 Patch2:         tracker-fix-include-sched-idle.patch
+# PATCH-FIX-UPSTREAM tracker-ff-tb-fixes.patch bgo#670251 bnc#745977 
bnc#746647 vu...@opensuse.org -- Add fixes to firefox and thunderbird 
extensions, to avoid GC-related crashes with new FF/TB
+Patch3:         tracker-ff-tb-fixes.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@@ -95,11 +97,11 @@
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libgupnp-dlna-devel >= 0.5
 %endif
+BuildRequires:  libexempi-devel
 BuildRequires:  libiptcdata-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpoppler-glib-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libexempi-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  taglib-devel
@@ -162,7 +164,6 @@
 %if !%{build_extras}
 
 %package -n %{_name}-miner-files
-License:        GPLv2+
 Summary:        Tracker miner to index files and applications
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -175,7 +176,6 @@
 This package contains a miner to index files and applications.
 
 %package -n libtracker-extract-0_12-0
-License:        GPLv2+
 Summary:        Extract library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -197,7 +197,6 @@
 and search all types of files and other first class objects.
 
 %package -n libtracker-miner-0_12-0
-License:        GPLv2+
 Summary:        Miner library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -218,7 +217,6 @@
 and search all types of files and other first class objects.
 
 %package -n libtracker-sparql-0_12-0
-License:        GPLv2+
 Summary:        Sparql library for Tracker
 Group:          System/Libraries
 Recommends:     %{_name}
@@ -239,7 +237,6 @@
 and search all types of files and other first class objects.
 
 %package -n tracker-devel
-License:        GPLv2+
 Summary:        Tracker -- Development files
 Group:          Development/Libraries/GNOME
 Requires:       libtracker-extract-0_12-0 = %{version}
@@ -265,7 +262,6 @@
 %if %{build_evo}
 
 %package -n %{_name}-miner-evolution
-License:        GPLv2+
 Summary:        Tracker miner to index Evolution mails
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -288,7 +284,6 @@
 %if %{build_firefox}
 
 %package -n %{_name}-miner-firefox
-License:        GPLv2+
 Summary:        Tracker miner to index Firefox bookmarks
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -308,7 +303,6 @@
 %if %{build_miner_flickr}
 
 %package -n %{_name}-miner-flickr
-License:        GPLv2+
 Summary:        Tracker miner to index Flickr images
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -323,7 +317,6 @@
 %if %{build_miner_rss}
 
 %package -n %{_name}-miner-rss
-License:        GPLv2+
 Summary:        Tracker miner to index ATOM and RSS feeds
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -338,7 +331,6 @@
 %if %{build_thunderbird}
 
 %package -n %{_name}-miner-thunderbird
-License:        GPLv2+
 Summary:        Tracker miner to index Thunderbird mails
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -358,7 +350,6 @@
 %if %{build_gui}
 
 %package -n %{_name}-gui
-License:        GPLv2+
 Summary:        Graphical User Interface for Tracker
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -383,7 +374,6 @@
 %if %{build_applet}
 
 %package -n gnome-panel-applet-tracker
-License:        GPLv2+
 Summary:        A GNOME panel applet for Tracker
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -403,7 +393,6 @@
 %if %{build_nautilus}
 
 %package -n nautilus-extension-tracker-tags
-License:        GPLv2+
 Summary:        Tracker Plugin for Nautilus
 Group:          System/GUI/GNOME
 Requires:       %{_name} = %{version}
@@ -432,6 +421,7 @@
 %patch1 -p1
 %patch2
 %endif
+%patch3 -p1
 cp %{S:1} src/miners/flickr/README.SUSE
 cp %{S:2} src/miners/rss/README.SUSE
 

++++++ tracker-ff-tb-fixes.patch ++++++
>From da96e3e4345a41ffb0a68bfaa1b4684ff8da8857 Mon Sep 17 00:00:00 2001
From: Martyn Russell <mar...@lanedo.com>
Date: Wed, 22 Feb 2012 17:56:36 +0000
Subject: thunderbird: Make sure we still work with newer versions

Arbitrary version of 20.0.* used as MAX version for now
---
diff --git a/src/plugins/thunderbird/install.rdf.in 
b/src/plugins/thunderbird/install.rdf.in
index 5a86ea1..fd09996 100644
--- a/src/plugins/thunderbird/install.rdf.in
+++ b/src/plugins/thunderbird/install.rdf.in
@@ -14,7 +14,7 @@
          <Description>
                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- 
Thunderbird -->
                <em:minVersion>5.0b1</em:minVersion>
-               <em:maxVersion>7.0.*</em:maxVersion>
+               <em:maxVersion>20.0.*</em:maxVersion>
          </Description>
        </em:targetApplication>
   </Description>
--
cgit v0.9.0.2
>From bffcf0a8b15d09416b1627fbc69bcd4a66292001 Mon Sep 17 00:00:00 2001
From: Martyn Russell <mar...@lanedo.com>
Date: Wed, 22 Feb 2012 18:33:54 +0000
Subject: firefox: Make sure we still work with newer versions

Arbitrary version of 20.0.* used as MAX version for now
---
diff --git a/src/plugins/firefox/install.rdf.in 
b/src/plugins/firefox/install.rdf.in
index 55f550c..5cef113 100644
--- a/src/plugins/firefox/install.rdf.in
+++ b/src/plugins/firefox/install.rdf.in
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>6.0.*</em:maxVersion>
+        <em:maxVersion>20.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
--
cgit v0.9.0.2
>From 0c2c0d6803e6747b22b46d0f54fed7abcba0cd78 Mon Sep 17 00:00:00 2001
From: Martyn Russell <mar...@lanedo.com>
Date: Wed, 22 Feb 2012 18:40:36 +0000
Subject: firefox,thunderbird: Save AsyncReadyCallback to avoid GC crashes

Fixes GB#670251.
---
diff --git a/src/plugins/firefox/chrome/content/plugin.js 
b/src/plugins/firefox/chrome/content/plugin.js
index 9601bf3..62161f6 100644
--- a/src/plugins/firefox/chrome/content/plugin.js
+++ b/src/plugins/firefox/chrome/content/plugin.js
@@ -45,9 +45,8 @@ org.bustany.TrackerFox.Plugin={
                        plugin.onTrackerReady(source_object, result, user_data);
                }
 
-               tracker.connection_open_async(null,
-                                             
tracker.AsyncReadyCallback.ptr(callback_closure),
-                                             null);
+               tracker.readyCallback = 
tracker.AsyncReadyCallback.ptr(callback_closure)
+               tracker.connection_open_async(null, tracker.readyCallback, 
null);
 
                return true;
        },
diff --git a/src/plugins/thunderbird/chrome/content/plugin.js 
b/src/plugins/thunderbird/chrome/content/plugin.js
index d582ed4..64f51f9 100644
--- a/src/plugins/thunderbird/chrome/content/plugin.js
+++ b/src/plugins/thunderbird/chrome/content/plugin.js
@@ -50,9 +50,8 @@ org.bustany.TrackerBird.Plugin = {
                        plugin.onTrackerReady(source_object, result, user_data);
                }
 
-               tracker.connection_open_async(null,
-                                             
tracker.AsyncReadyCallback.ptr(callback_closure),
-                                             null);
+               tracker.readyCallback = 
tracker.AsyncReadyCallback.ptr(callback_closure)
+               tracker.connection_open_async(null, tracker.readyCallback, 
null);
 
                return true;
        },
--
cgit v0.9.0.2
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to