Mailinglist Archive: opensuse-commit (1206 mails)

< Previous Next >
commit beagle
  • From: root@xxxxxxx (h_root)
  • Date: Sun, 7 May 2006 15:45:55 +0200 (CEST)
  • Message-id: <20060507134555.7D8808C5F9@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package beagle
checked in at Sun May 7 15:45:55 CEST 2006.

--------
--- GNOME/beagle/beagle.changes 2006-04-27 17:44:32.000000000 +0200
+++ STABLE/beagle/beagle.changes 2006-05-03 01:08:39.000000000 +0200
@@ -1,0 +2,15 @@
+Wed May 3 01:07:46 CEST 2006 - joeshaw@xxxxxxx
+
+- Add a patch to detect audio/x-vorbis+ogg as a valid music mime
+ type. (Beagle equivalent of bnc #169616)
+
+-------------------------------------------------------------------
+Tue May 2 23:52:38 CEST 2006 - joeshaw@xxxxxxx
+
+- Add a patch to fix up how the ImLogViewer deals with Kopete
+ logs. Make sure to select the right log to extract the "speaking
+ to" name, and wrap the log parsing in a try-catch so we can
+ ignore logs that aren't valid XML. (bnc #169792)
+- Fix a broken shell substitution in the beagle-imlogviewer script.
+
+-------------------------------------------------------------------

New:
----
beagle-imlogviewer-kopete-fixes.patch
beagle-vorbis-mime-type.patch

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

Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.sn7qhJ/_old 2006-05-07 15:45:30.000000000 +0200
+++ /var/tmp/diff_new_pack.sn7qhJ/_new 2006-05-07 15:45:30.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/Other
Autoreqprov: on
Version: 0.2.3
-Release: 35
+Release: 38
Summary: Desktop Search Application
URL: http://www.gnome.org/projects/beagle/
Source: %{name}-%{version}.tar.gz
@@ -48,6 +48,8 @@
Patch21: beagle-settings-no-hardcoded-size.patch
Patch22: beagle-gaim-note-markup.patch
Patch23: beagle-cs.patch
+Patch24: beagle-imlogviewer-kopete-fixes.patch
+Patch25: beagle-vorbis-mime-type.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prereq: /usr/sbin/groupadd /usr/sbin/useradd
Requires: mono-core >= 1.1.13.5
@@ -309,6 +311,8 @@
%patch21
%patch22
%patch23
+%patch24
+%patch25

%build
rm po/no.*
@@ -465,6 +469,15 @@
%{prefix}/%_lib/pkgconfig/*.pc

%changelog -n beagle
+* Wed May 03 2006 - joeshaw@xxxxxxx
+- Add a patch to detect audio/x-vorbis+ogg as a valid music mime
+ type. (Beagle equivalent of bnc #169616)
+* Tue May 02 2006 - joeshaw@xxxxxxx
+- Add a patch to fix up how the ImLogViewer deals with Kopete
+ logs. Make sure to select the right log to extract the "speaking
+ to" name, and wrap the log parsing in a try-catch so we can
+ ignore logs that aren't valid XML. (bnc #169792)
+- Fix a broken shell substitution in the beagle-imlogviewer script.
* Thu Apr 27 2006 - sbrabec@xxxxxxx
- Fixed typo in cs.po.
* Thu Apr 27 2006 - joeshaw@xxxxxxx



++++++ beagle-cwd-fixes.patch ++++++
--- /var/tmp/diff_new_pack.sn7qhJ/_old 2006-05-07 15:45:31.000000000 +0200
+++ /var/tmp/diff_new_pack.sn7qhJ/_new 2006-05-07 15:45:31.000000000 +0200
@@ -57,7 +57,7 @@
THIS_PATH="@pkglibdir@"
THIS_EXE="@pkglibdir@/@target@"
- export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-+ export LD_LIBRARY_PATH="@pkglibdir@${$LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
++ export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
fi

-MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"

++++++ beagle-imlogviewer-kopete-fixes.patch ++++++
Index: ImLogWindow.cs
===================================================================
RCS file: /cvs/gnome/beagle/ImLogViewer/ImLogWindow.cs,v
retrieving revision 1.11
diff -u -p -r1.11 ImLogViewer/ImLogWindow.cs
--- ImLogViewer/ImLogWindow.cs 28 Feb 2006 20:42:37 -0000 1.11
+++ ImLogViewer/ImLogWindow.cs 2 May 2006 21:26:45 -0000
@@ -168,22 +168,32 @@ namespace ImLogViewer {
foreach (string file in Directory.GetFiles (log_path)) {
ImLog log = null;
StreamReader reader = new StreamReader (file);
-
- if (client == ImClient.Gaim)
- log = new GaimLog (new FileInfo (file), reader);
- else if (client == ImClient.Kopete)
- log = new KopeteLog (new FileInfo (file), reader);
+
+ try {
+ if (client == ImClient.Gaim)
+ log = new GaimLog (new FileInfo (file), reader);
+ else if (client == ImClient.Kopete)
+ log = new KopeteLog (new FileInfo (file), reader);
+ } catch (System.Xml.XmlException e) {
+ Console.WriteLine ("Caught exception parsing {0}: {1}", file, e.Message);
+ }

reader.Close ();

+ if (log == null)
+ continue;
+
if (initial_select_file != null && log.File.FullName == initial_select_file.FullName) {
initial_select = log;
initial_select_file = null;
+
+ SetWindowTitle (log.SpeakingTo);
}

if (speaking_to == null)
SetWindowTitle (log.SpeakingTo);
- timeline.Add (log, log.StartTime);
+
+ timeline.Add (log, log.StartTime);
}

index_thread_notify.WakeupMain ();
++++++ beagle-vorbis-mime-type.patch ++++++
Index: Filters/FilterMusic.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/FilterMusic.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- Filters/FilterMusic.cs 2 Apr 2006 19:55:54 -0000 1.14
+++ Filters/FilterMusic.cs 10 Apr 2006 22:40:49 -0000 1.15
@@ -53,8 +53,9 @@ namespace Beagle.Filters {
AddSupportedFlavor (FilterFlavor.NewFromMimeType ("audio/x-m4a"));
AddSupportedFlavor (FilterFlavor.NewFromExtension (".m4p"));

- // OGG
+ // OGG Vorbis
AddSupportedFlavor (FilterFlavor.NewFromMimeType ("application/ogg"));
+ AddSupportedFlavor (FilterFlavor.NewFromMimeType ("audio/x-vorbis+ogg"));

// Tracker / Amiga Audio
AddSupportedFlavor (FilterFlavor.NewFromMimeType ("audio/x-s3m"));
Index: Filters/entagged-sharp/EncodingInfo.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/EncodingInfo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Filters/entagged-sharp/EncodingInfo.cs 11 Dec 2005 23:52:09 -0000 1.2
+++ Filters/entagged-sharp/EncodingInfo.cs 24 Apr 2006 14:49:27 -0000 1.3
@@ -78,7 +78,15 @@ namespace Entagged.Audioformats
//Sets the length of the song in seconds
public TimeSpan Duration {
set { content["DURATION"] = value; }
- get { return (TimeSpan) content["DURATION"]; }
+ get {
+ object o = content["DURATION"];
+ if(o is TimeSpan) {
+ return (TimeSpan)o;
+ }
+
+ int duration = (int)o;
+ return duration < 0 ? new TimeSpan(0) : new TimeSpan(duration * TimeSpan.TicksPerSecond);
+ }
}

public bool Vbr {
Index: Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs 15 Mar 2006 20:17:33 -0000 1.3
+++ Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs 24 Apr 2006 14:49:28 -0000 1.4
@@ -147,16 +147,16 @@ namespace Entagged.Audioformats.Mp3.Util
zerochars = 2;
}
if (b[offset] == (byte) 0xFE && b[offset + 1] == (byte) 0xFF) {
- result = Encoding.GetEncoding("UTF-16BE").GetString(b, offset + 2, length - 2 - zerochars);
+ result = Encoding.Unicode.GetString(b, offset + 2, length - 2 - zerochars);
} else if (b[offset] == (byte) 0xFF && b[offset + 1] == (byte) 0xFE) {
- result = Encoding.GetEncoding("UTF-16LE").GetString(b, offset + 2, length - 2 - zerochars);
+ result = Encoding.Unicode.GetString(b, offset + 2, length - 2 - zerochars);
} else {
/*
* Now we have a little problem. The tag is not id3-spec
* conform. And since I don't have a way to see if its little or
* big endian, i decide for the windows default little endian.
*/
- result = Encoding.GetEncoding("UTF-16LE").GetString(b, offset, length - zerochars);
+ result = Encoding.Unicode.GetString(b, offset, length - zerochars);
}
} else {
int zerochars = 0;
@@ -179,7 +179,7 @@ namespace Entagged.Audioformats.Mp3.Util
protected byte[] GetBytes(string s, string encoding) {
byte[] result = null;
if (encoding == "UTF-16") {
- result = System.Text.Encoding.GetEncoding("UTF-16LE").GetBytes(s);
+ result = System.Text.Encoding.Unicode.GetBytes(s);
// 2 for BOM and 2 for terminal character
byte[] tmp = new byte[result.Length + 4];
Copy(result, tmp, 2);
Index: Filters/entagged-sharp/Ogg/OggFileReader.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Ogg/OggFileReader.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- Filters/entagged-sharp/Ogg/OggFileReader.cs 15 Mar 2006 20:17:34 -0000 1.3
+++ Filters/entagged-sharp/Ogg/OggFileReader.cs 24 Apr 2006 14:49:28 -0000 1.4
@@ -33,6 +33,7 @@ namespace Entagged.Audioformats.Ogg
[SupportedMimeType ("application/x-ogg")]
[SupportedMimeType ("audio/vorbis")]
[SupportedMimeType ("audio/x-vorbis")]
+ [SupportedMimeType ("audio/x-vorbis+ogg")]
[SupportedMimeType ("audio/ogg")]
[SupportedMimeType ("audio/x-ogg")]
[SupportedMimeType ("entagged/ogg")]
Index: Filters/entagged-sharp/Util/Utils.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Util/Utils.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Filters/entagged-sharp/Util/Utils.cs 11 Dec 2005 23:52:16 -0000 1.2
+++ Filters/entagged-sharp/Util/Utils.cs 24 Apr 2006 14:49:28 -0000 1.3
@@ -100,13 +100,9 @@ namespace Entagged.Audioformats.Util
string[] ret = new string[taglist.Count];
int i = 0;

- foreach (string field in taglist) {
- if(field != null && field.Trim().Length == 0) {
- ret[i++] = field;
- } else {
- ret[i++] = field;
- }
- }
+ foreach (string field in taglist)
+ ret[i++] = (field != null && field.Trim().Length > 0) ?
+ field : null;

return ret;
}


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



Remember to have fun...


< Previous Next >