[Gsrc-commit] /srv/bzr/gsrc/trunk r1088: clean up gnusound, but its build fails

[Brandon Invergo]

------------------------------------------------------------
revno: 1088
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 00:11:48 +0100
message:
  clean up gnusound, but its build fails
added:
  gnu/gnusound/config.mk
  gnu/gnusound/files/
  gnu/gnusound/files/fix-install.diff
modified:
  TODO
  gnu/gnusound/Makefile
  gnu/gnusound/sha256sums

=== modified file 'TODO'
--- a/TODO      2012-11-06 08:26:27 +0000
+++ b/TODO      2012-11-07 23:11:48 +0000
@@ -127,3 +127,4 @@
 ** gnash: .so hell
 ** gcompris 12.05: .so hell
 ** gnucap: major C++ errors
+** gnusound: gnome hell

=== modified file 'gnu/gnusound/Makefile'
--- a/gnu/gnusound/Makefile     2010-06-10 20:16:29 +0000
+++ b/gnu/gnusound/Makefile     2012-11-07 23:11:48 +0000
@@ -1,16 +1,38 @@
 GARNAME = gnusound
 GARVERSION = 0.7.5
+HOME_URL = http://www.gnu.org/software/gnusound/
+DESCRIPTION = A multitrack sound editor
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnusound/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.bz2
 SIGFILES = $(DISTNAME).tar.bz2.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/gnusound/
-DESCRIPTION = GNUsound
+PATCHFILES = fix-install.diff
+
+BUILDDEPS = 
+LIBDEPS = gtk2 glib cairo gdk-pixbuf atk  #libgnomeui libglade gthread
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) \
+                 --with-gtk-exec-prefix=$(prefix) \
+                 owner_user=`whoami` \
+                 owner_group=`whoami` \
+                 GNOME2_CFLAGS="-I$(prefix)/include/gtk-2.0 \
+                                -I$(prefix)/include/glib-2.0 \
+                                -I$(prefix)/lib/glib-2.0/include \
+                                -I$(prefix)/include/cairo \
+                                -I$(prefix)/include/pango-1.0 \
+                                -I$(prefix)/include/atk-1.0 \
+                                -I$(prefix)/include/gdk-pixbuf-2.0 \
+                                -I$(prefix)/lib/gtk-2.0/include"
+                 GNOME2_LIBS="-L$(prefix)/lib/ \
+                              -L$(prefix)/lib/cairo \
+                              -L$(prefix)/lib/gdk-pixbuf-2.0 \
+                              -L$(prefix)/lib/gtk-2.0 \
+                              -L$(prefix)/lib/glib-2.0"

=== added file 'gnu/gnusound/config.mk'
--- a/gnu/gnusound/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/gnusound/config.mk    2012-11-07 23:11:48 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gnusound ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/gnusound/files'
=== added file 'gnu/gnusound/files/fix-install.diff'
--- a/gnu/gnusound/files/fix-install.diff       1970-01-01 00:00:00 +0000
+++ b/gnu/gnusound/files/fix-install.diff       2012-11-07 23:11:48 +0000
@@ -0,0 +1,82 @@
+diff -x config.log -x config.status -ru work/gnusound-0.7.5/Makefile.in 
work/gnusound-0.7.5/Makefile.in
+--- work/gnusound-0.7.5/Makefile.in    2008-07-06 10:14:12.000000000 +0200
++++ work/gnusound-0.7.5/Makefile.in    2012-11-07 23:48:49.035244191 +0100
+@@ -24,6 +24,7 @@
+       -DDATADIR="${datadir}" 
+ export address@hidden@ @LDFLAGS@
+ 
++DESTDIR=
+ address@hidden@
+ address@hidden@
+ address@hidden@
+@@ -195,12 +196,12 @@
+ install: all 
+       $(MAKE) -C doc install owner_user=$(owner_user) 
owner_group=$(owner_group)
+       $(MAKE) -C modules install owner_user=$(owner_user) 
owner_group=$(owner_group)
+-      mkdir -p $(bindir)
+-      mkdir -p $(guidir)
+-      mkdir -p $(desktopdir)
+-      install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) $(bindir)
+-      install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) $(guidir)
+-      install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) 
$(desktopdir)
++      mkdir -p $(DESTDIR)$(bindir)
++      mkdir -p $(DESTDIR)$(guidir)
++      mkdir -p $(DESTDIR)$(desktopdir)
++      install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) 
$(DESTDIR)$(bindir)
++      install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) 
$(DESTDIR)$(guidir)
++      install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) 
$(DESTDIR)$(desktopdir)
+ 
+ uninstall:
+       $(MAKE) -C modules uninstall
+diff -x config.log -x config.status -ru work/gnusound-0.7.5/doc/Makefile.in 
work/gnusound-0.7.5/doc/Makefile.in
+--- work/gnusound-0.7.5/doc/Makefile.in        2005-06-19 17:44:22.000000000 
+0200
++++ work/gnusound-0.7.5/doc/Makefile.in        2012-11-07 23:48:38.261908746 
+0100
+@@ -16,6 +16,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ #
++DESTDIR=
+ LANGUAGES=C
+ address@hidden@
+ address@hidden@
+@@ -50,15 +51,15 @@
+       rm -rf $(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) \
+                       $$lang/*.xml $$lang/*.html $$lang/topic.dat \
+-                      $(docrootdir)/$$lang; \
++                      $(DESTDIR)$(docrootdir)/$$lang; \
+                 install -m 644 -o $(owner_user) -g $(owner_group) \
+                         $$lang/$(name).omf \
+-                        $(omfdir)/$(name)-$$lang.omf; \
++                        $(DESTDIR)$(omfdir)/$(name)-$$lang.omf; \
+       done
+ 
+ .PHONY: dist clean veryclean distclean install uninstall
+diff -x config.log -x config.status -ru 
work/gnusound-0.7.5/modules/Makefile.in work/gnusound-0.7.5/modules/Makefile.in
+--- work/gnusound-0.7.5/modules/Makefile.in    2005-06-19 17:44:26.000000000 
+0200
++++ work/gnusound-0.7.5/modules/Makefile.in    2012-11-07 23:49:18.718583103 
+0100
+@@ -16,7 +16,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ #
+-
++DESTDIR=
+ address@hidden@
+ address@hidden@
+ address@hidden@
+@@ -61,7 +61,7 @@
+ 
+ install:
+       mkdir -p $(moduledir)
+-      install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) 
$(moduledir)
++      install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) 
$(DESTDIR)$(moduledir)
+ 
+ uninstall:
+       (cd $(moduledir) && rm -f $(module_files))
+diff -x config.log -x config.status -ru work/gnusound-0.7.5/src/defines.h 
work/gnusound-0.7.5/src/defines.h

=== modified file 'gnu/gnusound/sha256sums'
--- a/gnu/gnusound/sha256sums   2010-06-11 09:39:08 +0000
+++ b/gnu/gnusound/sha256sums   2012-11-07 23:11:48 +0000
@@ -1,2 +1,3 @@
 8121d42858429c7b845e9e1bcc36872e0daa2da5615765122bf689c2bcb46269  
download/gnusound-0.7.5.tar.bz2
+d436995b7a8ce2c2b8db44b05b6905eeb8ddbc6dbfefe6d37d27fdb5e7ebb610  
download/fix-install.diff
 cc2f7af10725428236d13c86314520ff73bdd763cfebc5e4eb213976f140c2eb  
download/gnusound-0.7.5.tar.bz2.sig