2008-04-30 Brian Cameron <[email protected]>
authoryippi
Wed, 30 Apr 2008 10:26:20 +0000
changeset 12231 f75b5b1ad02f
parent 12230 ffb283e5f3bb
child 12232 9fe0262dc4e6
2008-04-30 Brian Cameron <[email protected]> * base-specs/gdm.spec, patches/gdm-05-fixcrash.diff: Add patch fixing crashing issue when GDM exits (such as when the system is shutdown). * base-specs/libtheora.spec, patches/libtheora-01-fixtestlink.diff: Bump to 1.0beta3, add new needed patch. * patches/libtheora-01-fixlink.diff: Remove upstream patch. * base-specs/speex.spec: Bump to 1.2beta3.2. * patches/flac-01-forte.diff: Update so the patch applies properly.
ChangeLog
base-specs/gdm.spec
base-specs/libtheora.spec
base-specs/speex.spec
patches/flac-01-forte.diff
patches/gdm-05-fixcrash.diff
patches/libtheora-01-fixlink.diff
patches/libtheora-01-fixtestlink.diff
--- a/ChangeLog	Wed Apr 30 10:09:10 2008 +0000
+++ b/ChangeLog	Wed Apr 30 10:26:20 2008 +0000
@@ -1,7 +1,19 @@
+2008-04-30  Brian Cameron  <[email protected]>
+
+	* base-specs/gdm.spec, patches/gdm-05-fixcrash.diff:  Add patch
+	  fixing crashing issue when GDM exits (such as when the system
+	  is shutdown).
+	* base-specs/libtheora.spec, patches/libtheora-01-fixtestlink.diff:
+	  Bump to 1.0beta3, add new needed patch.
+	* patches/libtheora-01-fixlink.diff: Remove upstream patch.
+	* base-specs/speex.spec:  Bump to 1.2beta3.2.
+	* patches/flac-01-forte.diff:  Update so the patch applies
+	  properly.
+
 2008-04-30  Wang Xin  <[email protected]>
 
 	* base-specs/evolution.spec: Bump to 2.22.1 and remove
-	09-he-plural-msgs.
+	  09-he-plural-msgs.
 
 2008-04-30 Chris Wang  <[email protected]>
 
@@ -12,12 +24,12 @@
 2008-04-30 Rick Ju <[email protected]>
 
 	* patches/gmime-01-bitregion-crash.diff
-          added to fix the bug CR6689345
+	  added to fix the bug CR6689345
 
 2008-04-30 Brian Lu- <[email protected]>
 
 	* patches/firefox3-18-gen-devel-files.diff:
-          update the patch to fix the bug CR6692680
+	  update the patch to fix the bug CR6692680
 
 2008-04-30 Erwann Chenede - <[email protected]>
 
@@ -32,10 +44,10 @@
 
 2008-04-29  Matt Keenan <[email protected]>
 
-    * base-specs/gnome-desktop.spec : Fix bug bugster:6674496 
-      bugzilla:530382, gnome-about crashing in non utf-8 locales.
-    * patches/gnome-desktop-04-gnome-about-utf-8.diff : New Patch which
-      has been submitted for review upstream.
+	* base-specs/gnome-desktop.spec : Fix bug bugster:6674496 
+	  bugzilla:530382, gnome-about crashing in non utf-8 locales.
+	* patches/gnome-desktop-04-gnome-about-utf-8.diff : New Patch which
+	  has been submitted for review upstream.
 
 2008-04-29  Brian Cameron  <[email protected]>
 
@@ -52,7 +64,7 @@
 
 	* base-specs/metacity.spec: reenable patch 08
 	* patches/metacity-08-trusted-extensions.diff: refactor due to metacity
-	code reorg. Fixes a bunch of bugs, most importantly bugster 6653491.
+	  code reorg. Fixes a bunch of bugs, most importantly bugster 6653491.
 
 2008-04-28  Padraig O'Briain <[email protected]>
 
@@ -127,8 +139,8 @@
 
 2008-04-24  Jerry Tan <[email protected]>
 
-        * base-specs/gthumb.spec: Bump to 2.10.8
-        * patches/gthumb-02-threads.diff: remove upstream patch
+	* base-specs/gthumb.spec: Bump to 2.10.8
+	* patches/gthumb-02-threads.diff: remove upstream patch
 
 2008-04-24  Wang Xin  <[email protected]>
 
@@ -137,12 +149,12 @@
 
 2008-04-24  Jerry Tan <[email protected]>
 
-        * patches/rhythmbox-01-playcd.diff: update patch to fix bug 6689996
+	* patches/rhythmbox-01-playcd.diff: update patch to fix bug 6689996
 
 2008-04-24  Brian Lu <[email protected]>
 
-        * base-specs/thunderbird.spec, SUNWthunderbird.spec: Bump lightning
-          to 0.8
+	* base-specs/thunderbird.spec, SUNWthunderbird.spec: Bump lightning
+	  to 0.8
 
 2008-04-24  Dave Lin  <[email protected]>
 
--- a/base-specs/gdm.spec	Wed Apr 30 10:09:10 2008 +0000
+++ b/base-specs/gdm.spec	Wed Apr 30 10:26:20 2008 +0000
@@ -36,6 +36,8 @@
 Patch3:       gdm-03-locale-support.diff
 #owner:fujiwara date:2008-04-10  type:bug bugster:5052540
 Patch4:       gdm-04-disable-im.diff
+#owner:yippi date:2008-04-30 type:bug bugzilla:517526
+Patch5:       gdm-05-fixcrash.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -111,6 +113,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %build
 %ifos linux
@@ -237,6 +240,8 @@
 %config /etc/security/*
 
 %changelog
+* Wed Apr 30 2008 - [email protected]
+- Add patch gdm-05-fixcrash.diff fixing bugzilla crashing bug #517526.
 * Tue Apr 15 2008 - [email protected]
 - The gdmflexiserver.desktop file moved to a different directory, so 
   remove it from the correct location.  Fixes bug #6689633.
--- a/base-specs/libtheora.spec	Wed Apr 30 10:09:10 2008 +0000
+++ b/base-specs/libtheora.spec	Wed Apr 30 10:26:20 2008 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package libtheora
 #
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,15 +12,13 @@
 License:      Xiph
 Group:        System Environment/Libraries
 Version:      1.0
-%define tarball_version 1.0beta2
+%define tarball_version 1.0beta3
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      The Theora Video Compression Codec.
 Source:       http://downloads.xiph.org/releases/theora/%{name}-%{tarball_version}.tar.gz
-#owner:yippi date:2004-11-24 type:bug bugid:1256 state:upstream
-Patch1:       libtheora-01-fixlink.diff
-URL:          http://theora.org/
+Patch1:       libtheora-01-fixtestlink.diff
 URL:          http://www.theora.org/
 BuildRoot:    %{_tmppath}/%{name}-%{tarball_version}-build
 Docdir:       %{_docdir}/%{name}
@@ -105,6 +103,9 @@
 %{_libdir}/pkgconfig/theora.pc
 
 %changelog
+* Tue Apr 29 2008 - [email protected]
+- Bump to 1.0beta3.  Remove upstream patch libtheora-01-fixlink.diff.
+  Add new patch libtheora-01-fixtestlink.diff.
 * Mon Nov 05 2007 - [email protected]
 - Bump to 1.0beta2.
 * Fri Feb 09 2006 - [email protected]
--- a/base-specs/speex.spec	Wed Apr 30 10:09:10 2008 +0000
+++ b/base-specs/speex.spec	Wed Apr 30 10:26:20 2008 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package speex
 #
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,7 +11,7 @@
 Name:         speex
 License:      Xiph
 Group:        Application/Devel
-%define tarball_version 1.2beta3
+%define tarball_version 1.2beta3.2
 Version:      1.2.0
 Release:      1
 Distribution: Java Desktop System
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/speex.pc
 
 %changelog
+* Tue Apr 29 2008 - [email protected]
+- Bump to 1.2beta3.2
+
 * Tue Dec 11 2007 - [email protected]
 - Bump to 1.2beta3.
 
--- a/patches/flac-01-forte.diff	Wed Apr 30 10:09:10 2008 +0000
+++ b/patches/flac-01-forte.diff	Wed Apr 30 10:26:20 2008 +0000
@@ -27,65 +27,65 @@
 --- flac-1.2.0/include/share/replaygain_analysis.h-orig	2007-08-01 13:37:48.953601000 -0500
 +++ flac-1.2.0/include/share/replaygain_analysis.h	2007-08-01 13:13:34.288739000 -0500
 @@ -1,59 +1,59 @@
--/*
-- *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
-- *  Copyright (C) 2001 David Robinson and Glen Sawyer
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-- *
-- *  concept and filter values by David Robinson ([email protected])
-- *    -- blame him if you think the idea is flawed
-- *  coding by Glen Sawyer ([email protected]) 442 N 700 E, Provo, UT 84606 USA
-- *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
-- *  minor cosmetic tweaks to integrate with FLAC by Josh Coalson
-- *
-- *  For an explanation of the concepts and the basic algorithms involved, go to:
-- *    http://www.replaygain.org/
-- */
--
--#ifndef GAIN_ANALYSIS_H
--#define GAIN_ANALYSIS_H
--
--#include <stddef.h>
--
--#define GAIN_NOT_ENOUGH_SAMPLES  -24601
--#define GAIN_ANALYSIS_ERROR           0
--#define GAIN_ANALYSIS_OK              1
--
--#define INIT_GAIN_ANALYSIS_ERROR      0
--#define INIT_GAIN_ANALYSIS_OK         1
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--typedef float   Float_t;         /* Type used for filtering */
--
--extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
--
--int     InitGainAnalysis ( long samplefreq );
--int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
--int		ResetSampleFrequency ( long samplefreq );
--Float_t GetTitleGain     ( void );
--Float_t GetAlbumGain     ( void );
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* GAIN_ANALYSIS_H */
+-/*
+- *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+- *  Copyright (C) 2001 David Robinson and Glen Sawyer
+- *
+- *  This library is free software; you can redistribute it and/or
+- *  modify it under the terms of the GNU Lesser General Public
+- *  License as published by the Free Software Foundation; either
+- *  version 2.1 of the License, or (at your option) any later version.
+- *
+- *  This library is distributed in the hope that it will be useful,
+- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *  Lesser General Public License for more details.
+- *
+- *  You should have received a copy of the GNU Lesser General Public
+- *  License along with this library; if not, write to the Free Software
+- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+- *
+- *  concept and filter values by David Robinson ([email protected])
+- *    -- blame him if you think the idea is flawed
+- *  coding by Glen Sawyer ([email protected]) 442 N 700 E, Provo, UT 84606 USA
+- *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+- *  minor cosmetic tweaks to integrate with FLAC by Josh Coalson
+- *
+- *  For an explanation of the concepts and the basic algorithms involved, go to:
+- *    http://www.replaygain.org/
+- */
+-
+-#ifndef GAIN_ANALYSIS_H
+-#define GAIN_ANALYSIS_H
+-
+-#include <stddef.h>
+-
+-#define GAIN_NOT_ENOUGH_SAMPLES  -24601
+-#define GAIN_ANALYSIS_ERROR           0
+-#define GAIN_ANALYSIS_OK              1
+-
+-#define INIT_GAIN_ANALYSIS_ERROR      0
+-#define INIT_GAIN_ANALYSIS_OK         1
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-typedef float   Float_t;         /* Type used for filtering */
+-
+-extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
+-
+-int     InitGainAnalysis ( long samplefreq );
+-int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
+-int		ResetSampleFrequency ( long samplefreq );
+-Float_t GetTitleGain     ( void );
+-Float_t GetAlbumGain     ( void );
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* GAIN_ANALYSIS_H */
 +/*
 + *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
 + *  Copyright (C) 2001 David Robinson and Glen Sawyer
@@ -148,32 +148,32 @@
 --- flac-1.2.0/src/plugin_winamp2/infobox.c-orig	2007-08-01 13:34:46.716826000 -0500
 +++ flac-1.2.0/src/plugin_winamp2/infobox.c	2007-08-01 13:13:34.257582000 -0500
 @@ -48,7 +48,7 @@ static const char infoTitle[] = "FLAC Fi
- 
- /* TODO: write genres in utf-8 ? */
- 
--static __inline int GetGenresFileName(char *buffer, int size)
-+static FLAC_INLINE int GetGenresFileName(char *buffer, int size)
- {
- 	char *c;
- 
+ 
+ /* TODO: write genres in utf-8 ? */
+ 
+-static __inline int GetGenresFileName(char *buffer, int size)
++static FLAC_INLINE int GetGenresFileName(char *buffer, int size)
+ {
+ 	char *c;
+ 
 @@ -273,7 +273,7 @@ static BOOL InitInfoboxInfo(HWND hwnd, c
- 	return TRUE;
- }
- 
--static void __inline SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
-+static void FLAC_INLINE SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
- {
- 	strcpy(buffer, infoTitle);
- 
+ 	return TRUE;
+ }
+ 
+-static void __inline SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
++static void FLAC_INLINE SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
+ {
+ 	strcpy(buffer, infoTitle);
+ 
 @@ -399,7 +399,7 @@ ULONGLONG FileSize(const char *fileName)
- 	return res.QuadPart;
- }
- 
--static __inline char *GetFileName(const char *fullname)
-+static FLAC_INLINE char *GetFileName(const char *fullname)
- {
- 	const char *c = fullname + strlen(fullname) - 1;
- 
+ 	return res.QuadPart;
+ }
+ 
+-static __inline char *GetFileName(const char *fullname)
++static FLAC_INLINE char *GetFileName(const char *fullname)
+ {
+ 	const char *c = fullname + strlen(fullname) - 1;
+ 
 --- flac-1.2.0/src/share/replaygain_analysis/replaygain_analysis.c-orig	2007-08-01 13:36:01.582583000 -0500
 +++ flac-1.2.0/src/share/replaygain_analysis/replaygain_analysis.c	2007-08-01 13:22:19.440619000 -0500
 @@ -110,10 +110,10 @@ typedef signed int      Int32_t;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-05-fixcrash.diff	Wed Apr 30 10:26:20 2008 +0000
@@ -0,0 +1,13 @@
+Index: common/gdm-config.c
+===================================================================
+--- common/gdm-config.c	(revision 6175)
++++ common/gdm-config.c	(working copy)
+@@ -593,7 +593,7 @@
+ 	g_return_if_fail (config != NULL);
+ 
+ 	g_ptr_array_foreach (config->entries, (GFunc)gdm_config_entry_free, NULL);
+-	g_ptr_array_free (config->entries, TRUE);
++	g_ptr_array_free (config->entries, FALSE);
+ 
+ 	g_free (config->mandatory_filename);
+ 	g_free (config->default_filename);
--- a/patches/libtheora-01-fixlink.diff	Wed Apr 30 10:09:10 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- libtheora-1.0beta2/examples/Makefile.am-orig	2007-11-05 20:49:54.592680000 -0600
-+++ libtheora-1.0beta2/examples/Makefile.am	2007-11-05 20:50:10.633499000 -0600
-@@ -27,7 +27,7 @@ encoder_example_DEPENDENCIES = $(GETOPT_
- 
- png2theora_SOURCES = png2theora.c
- png2theora_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
--png2theora_LDADD = $(GETOPT_OBJS) $(LDADD) $(PNG_LIBS)
-+png2theora_LDADD = $(GETOPT_OBJS) $(LDADD) $(PNG_LIBS) -lm
- png2theora_DEPENDENCIES = $(GETOPT_OBJS)
- 
- debug:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libtheora-01-fixtestlink.diff	Wed Apr 30 10:26:20 2008 +0000
@@ -0,0 +1,19 @@
+--- libtheora-1.0beta3/tests/Makefile.am-orig	2008-04-30 05:12:09.560271000 -0500
++++ libtheora-1.0beta3/tests/Makefile.am	2008-04-30 05:14:01.824452000 -0500
+@@ -50,13 +50,13 @@ comment_theora_LDADD = $(THEORA_LIBS)
+ comment_theora_CFLAGS = $(OGG_CFLAGS)
+ 
+ granulepos_SOURCES = granulepos.c
+-granulepos_LDADD = $(THEORAENC_LIBS)
++granulepos_LDADD = $(THEORAENC_LIBS) -lm
+ granulepos_CFLAGS = $(OGG_CFLAGS)
+ 
+ granulepos_theoraenc_SOURCES = granulepos_theora.c
+-granulepos_theoraenc_LDADD = $(THEORAENC_LIBS)
++granulepos_theoraenc_LDADD = $(THEORAENC_LIBS) -lm
+ granulepos_theoraenc_CFLAGS = $(OGG_CFLAGS)
+ 
+ granulepos_theora_SOURCES = granulepos_theora.c
+-granulepos_theora_LDADD = $(THEORA_LIBS)
++granulepos_theora_LDADD = $(THEORA_LIBS) -lm
+ granulepos_theora_CFLAGS = $(OGG_CFLAGS)