[packages/gnusound] - up to 0.7.5 (last released version), added patches to build with current gtk+2 and gcc

qboosh qboosh at pld-linux.org
Sat Sep 23 21:24:21 CEST 2023 

commit be40f7216ab7ff92bdc2db7b80eb7119e217b7d5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 23 21:13:29 2023 +0200

    - up to 0.7.5 (last released version), added patches to build with current gtk+2 and gcc

 gnusound-Makefiles.patch  | 106 +++++++++++++++++-----------------------------
 gnusound-deprecated.patch |  34 +++++++++++++++
 gnusound-desktop.patch    |  10 +++++
 gnusound-format.patch     |  18 ++++++++
 gnusound.spec             |  41 ++++++++++--------
 5 files changed, 124 insertions(+), 85 deletions(-)
---
diff --git a/gnusound.spec b/gnusound.spec
index 208143c..29871f0 100644
--- a/gnusound.spec
+++ b/gnusound.spec
@@ -1,29 +1,30 @@
 Summary:	GNUsound - a multitrack sound editor for GNOME
 Summary(pl.UTF-8):	GNUsound - wielościeżkowy edytor dźwięku dla GNOME
 Name:		gnusound
-Version:	0.7.1
+Version:	0.7.5
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		X11/Applications/Sound
-Source0:	http://ftp.gnu.org/gnu/gnusound/%{name}-%{version}.tar.bz2
-# Source0-md5:	43eef7373be32b5ec523f82dac5ba7bb
-Source1:	%{name}.desktop
+Source0:	https://ftp.gnu.org/gnu/gnusound/%{name}-%{version}.tar.bz2
+# Source0-md5:	9f7515d9a68a54ac6b60ab78dfa72d80
 Patch0:		%{name}-Makefiles.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-deprecated.patch
+Patch3:		%{name}-format.patch
 URL:		http://www.gnu.org/software/gnusound/
 BuildRequires:	alsa-lib-devel >= 1.0.2
 BuildRequires:	audiofile-devel >= 0.2.3
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	ffmpeg-devel >= 0.4.9
 BuildRequires:	flac-devel
+#BuildRequires:	gmerlin-avdec = 0.1.2
 BuildRequires:	jack-audio-connection-kit-devel >= 0.94
 BuildRequires:	lame-libs-devel
 BuildRequires:	libglade2-devel >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.0.0
-BuildRequires:	libogg-devel
 BuildRequires:	libsamplerate-devel
 BuildRequires:	libsndfile-devel >= 1.0.4
-BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,28 +60,34 @@ trzeba to sprawdzić samemu.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-cp -f /usr/share/automake/config.sub config
+cp -pf /usr/share/automake/compile config
+cp -pf /usr/share/automake/config.sub config
+cp -pf /usr/share/automake/missing config
 %{__aclocal} -I config
 %{__autoconf} -I config
 %configure \
 	--with-libsamplerate \
 	--with-gnome2
 
-%{__make} CC="%{__cc}"
+%{__make} \
+	CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	desktopdir=%{_desktopdir}
 
-install -D doc/C/gnusound.1 $RPM_BUILD_ROOT%{_mandir}/man1/gnusound.1
-install -D gui/logo.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/gnusound.xpm
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/gnusound.desktop
+install -Dp doc/C/gnusound.1 $RPM_BUILD_ROOT%{_mandir}/man1/gnusound.1
+install -Dp gui/logo.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/gnusound.xpm
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc CHANGES NOTES README TODO
-%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/gnusound
 %{_libdir}/%{name}
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/gnusound.desktop
 %{_pixmapsdir}/gnusound.xpm
-%{_mandir}/man1/%{name}*
+%{_mandir}/man1/gnusound.1*
diff --git a/gnusound-Makefiles.patch b/gnusound-Makefiles.patch
index 0075e0c..1373e48 100644
--- a/gnusound-Makefiles.patch
+++ b/gnusound-Makefiles.patch
@@ -1,70 +1,56 @@
-diff -Nurb gnusound-0.7.1.bef/doc/Makefile gnusound-0.7.1.new/doc/Makefile
---- gnusound-0.7.1.bef/doc/Makefile	2005-05-27 20:32:20.000000000 +0200
-+++ gnusound-0.7.1.new/doc/Makefile	2005-05-31 01:39:33.000000000 +0200
-@@ -22,8 +22,7 @@
- docname=gnusound
- xslstylesheet=/usr/share/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl
- 
--owner_user ?= root
--owner_group ?= root
-+DESTDIR =
- 
- dist:
- 	for lang in $(LANGUAGES); do \
-@@ -52,10 +51,10 @@
- 
- install:
- 	for lang in $(LANGUAGES); do \
--		mkdir -p $(docrootdir)/$$lang; \
--		install -m 644 -o $(owner_user) -g $(owner_group) \
-+		mkdir -p $(DESTDIR)$(docrootdir)/$$lang; \
-+		install -m 644 \
- 			$$lang/*.xml $$lang/*.html $$lang/topic.dat \
--			$(docrootdir)/$$lang; \
-+			$(DESTDIR)$(docrootdir)/$$lang; \
- 	done
- 
- .PHONY: dist clean veryclean distclean install uninstall
-diff -Nurb gnusound-0.7.1.bef/doc/Makefile.in gnusound-0.7.1.new/doc/Makefile.in
---- gnusound-0.7.1.bef/doc/Makefile.in	2005-02-13 05:27:21.000000000 +0100
-+++ gnusound-0.7.1.new/doc/Makefile.in	2005-05-31 01:39:08.000000000 +0200
-@@ -22,8 +22,7 @@
- docname=@PACKAGE@
+--- gnusound-0.7.5/doc/Makefile.in.orig	2023-09-23 18:52:44.919969304 +0200
++++ gnusound-0.7.5/doc/Makefile.in	2023-09-23 19:04:00.322976999 +0200
+@@ -24,8 +24,7 @@ docname=$(name)
  xslstylesheet=@DB2XHTML_STYLESHEET@
+ omfdir=@datadir@/omf/$(name)
  
 -owner_user ?= root
 -owner_group ?= root
-+DESTDIR = 
++DESTDIR ?=
  
  dist:
  	for lang in $(LANGUAGES); do \
-@@ -52,10 +51,10 @@
+@@ -47,18 +46,18 @@ distclean: veryclean
+ 	rm -f Makefile
+ 
+ uninstall:
+-	rm -rf $(docrootdir)
++	rm -rf $(DESTDIR)$(docrootdir)
  
  install:
+-	mkdir -p $(omfdir)
++	mkdir -p $(DESTDIR)$(omfdir)
  	for lang in $(LANGUAGES); do \
 -		mkdir -p $(docrootdir)/$$lang; \
 -		install -m 644 -o $(owner_user) -g $(owner_group) \
 +		mkdir -p $(DESTDIR)$(docrootdir)/$$lang; \
-+		install -m 644  \
++		install -m 644 \
  			$$lang/*.xml $$lang/*.html $$lang/topic.dat \
 -			$(docrootdir)/$$lang; \
+-                install -m 644 -o $(owner_user) -g $(owner_group) \
 +			$(DESTDIR)$(docrootdir)/$$lang; \
++                install -m 644 \
+                         $$lang/$(name).omf \
+-                        $(omfdir)/$(name)-$$lang.omf; \
++                        $(DESTDIR)$(omfdir)/$(name)-$$lang.omf; \
  	done
  
  .PHONY: dist clean veryclean distclean install uninstall
-diff -Nurb gnusound-0.7.1.bef/Makefile.in gnusound-0.7.1.new/Makefile.in
---- gnusound-0.7.1.bef/Makefile.in	2005-03-12 00:15:10.000000000 +0100
-+++ gnusound-0.7.1.new/Makefile.in	2005-05-31 01:38:02.000000000 +0200
-@@ -24,6 +24,8 @@
+--- gnusound-0.7.5/Makefile.in.orig	2008-07-06 10:14:12.000000000 +0200
++++ gnusound-0.7.5/Makefile.in	2023-09-23 21:04:26.860494151 +0200
+@@ -22,8 +22,10 @@ export CFLAGS=@CFLAGS@ \
+ 	-DSYSCONFDIR="${sysconfdir}" \
+ 	-DPREFIX="${prefix}" \
  	-DDATADIR="${datadir}" 
- export LDFLAGS=@LIBS@ @LDFLAGS@
+-export LDFLAGS=@LIBS@ @LDFLAGS@
++export LDFLAGS=@LDFLAGS@ @LIBS@
  
-+DESTDIR =
++DESTDIR ?=
 +
  name=@PACKAGE@
  version=@VERSION@
  prefix=@prefix@
-@@ -33,9 +35,6 @@
+@@ -33,9 +35,6 @@ bindir=@bindir@
  libdir=@libdir@/$(name)
  datadir=@datadir@
  
@@ -74,8 +60,12 @@ diff -Nurb gnusound-0.7.1.bef/Makefile.in gnusound-0.7.1.new/Makefile.in
  gnusounddir=@GNUSOUNDDIR@
  guidir=$(libdir)/gui
  docdir=$(datadir)/gnome/help/$(name)
-@@ -158,14 +157,14 @@
- 	$(CC) `cat .ldflags` $(objects) -o src/$(name)
+@@ -190,17 +189,17 @@ $(objects): %.o: %.c src/config.h src/de
+ 
+ src/$(name): $(objects) .ldflags
+ 	rm -f src/$(name)
+-	$(CC) `cat .ldflags` $(objects) -o src/$(name)
++	$(CC) $(objects) -o src/$(name) `cat .ldflags` -lm
  
  install: all 
 -	$(MAKE) -C doc install owner_user=$(owner_user) owner_group=$(owner_group)
@@ -97,7 +87,7 @@ diff -Nurb gnusound-0.7.1.bef/Makefile.in gnusound-0.7.1.new/Makefile.in
  
  uninstall:
  	$(MAKE) -C modules uninstall
-@@ -217,7 +216,7 @@
+@@ -251,7 +250,7 @@ distcheck: dist
  		cd $(name)-$(version) && \
  		./configure --prefix=`pwd`/../install CFLAGS= && \
  		make && \
@@ -106,28 +96,6 @@ diff -Nurb gnusound-0.7.1.bef/Makefile.in gnusound-0.7.1.new/Makefile.in
  
  maintainer-install: dist
  	tar xjf $(name)-$(version).tar.bz2 
-diff -Nurb gnusound-0.7.1.bef/modules/Makefile gnusound-0.7.1.new/modules/Makefile
---- gnusound-0.7.1.bef/modules/Makefile	2005-05-27 20:32:21.000000000 +0200
-+++ gnusound-0.7.1.new/modules/Makefile	2005-05-31 00:42:11.000000000 +0200
-@@ -28,9 +28,6 @@
- moduledir=$(libdir)/modules
- gnusounddir=/home/p/src/gnusound
- 
--owner_user ?= root
--owner_group ?= root
--
- src=$(shell ls *.c)
- obj=$(addsuffix .so, $(basename $(src)))
- flags=$(addprefix ., $(addsuffix .cflags, $(basename $(src))))
-@@ -61,7 +58,7 @@
- 
- install:
- 	mkdir -p $(moduledir)
--	install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) $(moduledir)
-+	install -m 644 $(module_files) $(moduledir)
- 
- uninstall:
- 	(cd $(moduledir) && rm -f $(module_files))
 diff -Nurb gnusound-0.7.1.bef/modules/Makefile.in gnusound-0.7.1.new/modules/Makefile.in
 --- gnusound-0.7.1.bef/modules/Makefile.in	2005-02-13 05:27:57.000000000 +0100
 +++ gnusound-0.7.1.new/modules/Makefile.in	2005-05-31 01:40:18.000000000 +0200
@@ -137,7 +105,7 @@ diff -Nurb gnusound-0.7.1.bef/modules/Makefile.in gnusound-0.7.1.new/modules/Mak
  
 -owner_user ?= root
 -owner_group ?= root
-+DESTDIR = 
++DESTDIR ?= 
  
  src=$(shell ls *.c)
  obj=$(addsuffix .so, $(basename $(src)))
@@ -152,3 +120,5 @@ diff -Nurb gnusound-0.7.1.bef/modules/Makefile.in gnusound-0.7.1.new/modules/Mak
  
  uninstall:
  	(cd $(moduledir) && rm -f $(module_files))
+--- ../BUILD/gnusound-0.7.5/Makefile.in.orig	2023-09-23 21:05:55.943344881 +0200
++++ ../BUILD/gnusound-0.7.5/Makefile.in	2023-09-23 21:10:40.288471118 +0200
diff --git a/gnusound-deprecated.patch b/gnusound-deprecated.patch
new file mode 100644
index 0000000..e6fce8c
--- /dev/null
+++ b/gnusound-deprecated.patch
@@ -0,0 +1,34 @@
+--- gnusound-0.7.5/configure.ac.orig	2008-07-06 10:03:19.000000000 +0200
++++ gnusound-0.7.5/configure.ac	2023-09-23 20:34:32.123550409 +0200
+@@ -266,7 +266,7 @@ AC_ARG_WITH(gnome2,
+ if test "x$use_gnome2" = "xyes"; then
+   PKG_CHECK_MODULES(GNOME2,libgnomeui-2.0 >= 2.0.0 libglade-2.0 gthread-2.0,
+         AC_DEFINE(HAVE_GNOME2,,[use GNOME2])
+-        CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -rdynamic $GNOME2_CFLAGS"
++        CFLAGS="$CFLAGS -rdynamic $GNOME2_CFLAGS"
+         LIBS="$LIBS -rdynamic $GNOME2_LIBS",
+         use_gnome2=no)
+ fi
+--- gnusound-0.7.5/src/gui.c.orig	2005-06-19 17:44:26.000000000 +0200
++++ gnusound-0.7.5/src/gui.c	2023-09-23 20:53:53.150593919 +0200
+@@ -23,9 +23,6 @@
+  * Grab bag of GUI initialization and related utility functions.
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED 1
+-#define GNOME_DISABLE_DEPRECATED 1
+-
+ /* Has to come _before_ config.h ... */
+ 
+ #include <glade/glade.h>
+--- gnusound-0.7.5/src/gui.h.orig	2005-06-19 17:44:26.000000000 +0200
++++ gnusound-0.7.5/src/gui.h	2023-09-23 20:56:56.786265746 +0200
+@@ -24,8 +24,6 @@
+ #include <config.h>
+ 
+ #ifdef HAVE_GNOME2
+-# define GTK_DISABLE_DEPRECATED   1
+-# define GNOME_DISABLE_DEPRECATED 1
+ # define GUI_GTK_VERSION_TAG      "-2"
+ #else
+ # define GUI_GTK_VERSION_TAG      ""
diff --git a/gnusound-desktop.patch b/gnusound-desktop.patch
new file mode 100644
index 0000000..0fcd557
--- /dev/null
+++ b/gnusound-desktop.patch
@@ -0,0 +1,10 @@
+--- gnusound-0.7.5/gnusound.desktop.in.orig	2005-07-04 20:31:32.000000000 +0200
++++ gnusound-0.7.5/gnusound.desktop.in	2023-09-23 20:12:51.130598493 +0200
+@@ -6,5 +6,5 @@ Comment=Sound editor
+ Exec=gnusound %F
+ Icon=@GNUSOUND_LIBDIR@/gui/logo.xpm
+ Terminal=0
+-MimeType=audio/wav;audio/x-wav;audio/mpeg;audio/x-mpeg;audio/mpeg3;audio/x-mpeg-3;audio/x-mp3;video/mpeg;video/x-mpeg;audio/aiff;audio/x-aiff;audio/basic;video/avi;video/msvideo;video/x-msvideo;audio/x-au;audio/x-realaudio;audio/x-pn-realaudio;audio/voc;audio/x-voc;audio/x-flac;application/x-flac;application/ogg;audio/x-ulaw;audio/x-voc;video/quicktime;video/x-ms-asf;video/x-ms-wmv
+-Categories=Application;AudioVideo;
++MimeType=audio/wav;audio/x-wav;audio/mpeg;audio/x-mpeg;audio/mpeg3;audio/x-mpeg-3;audio/x-mp3;video/mpeg;video/x-mpeg;audio/aiff;audio/x-aiff;audio/basic;video/avi;video/msvideo;video/x-msvideo;audio/x-au;audio/x-realaudio;audio/x-pn-realaudio;audio/voc;audio/x-voc;audio/x-flac;application/x-flac;application/ogg;audio/x-ulaw;audio/x-voc;video/quicktime;video/x-ms-asf;video/x-ms-wmv;
++Categories=AudioVideo;
diff --git a/gnusound-format.patch b/gnusound-format.patch
new file mode 100644
index 0000000..28e6ce7
--- /dev/null
+++ b/gnusound-format.patch
@@ -0,0 +1,18 @@
+--- gnusound-0.7.5/src/gtk2/gui_dialogs.c.orig	2005-06-19 17:44:28.000000000 +0200
++++ gnusound-0.7.5/src/gtk2/gui_dialogs.c	2023-09-23 20:45:29.959986603 +0200
+@@ -56,6 +56,7 @@ gui_yes_no(const char *title,
+                                     GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_QUESTION,
+                                     GTK_BUTTONS_YES_NO,
++                                    "%s",
+                                     message);
+     button = gtk_dialog_run(GTK_DIALOG(dialog));
+     switch(button) {
+@@ -95,6 +96,7 @@ gui_alert(const char *format,
+                                     GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_INFO,
+                                     GTK_BUTTONS_CLOSE,
++                                    "%s",
+                                     wordwrap(message, 60));
+     gtk_dialog_run(GTK_DIALOG(dialog));
+     gtk_widget_destroy(dialog);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnusound.git/commitdiff/be40f7216ab7ff92bdc2db7b80eb7119e217b7d5

More information about the pld-cvs-commit mailing list