This the debdiff for -2 which includes packaging the PNG image provided by upstream as well as the XPM needed for the Debian menu which is the initial error raised at runtime as well as the main fix to omit calls from gpe-mixer that expect a framebuffer device to be available without X.
gpe-mixer already uses the CDBS patch system and retains the patch for
the desktop file so adding one patch and removing an old one should not
be a problem for a freeze exception.
To re-enable this code, pass -DUSE_FB when rebuilding for a device that
uses gpe-mixer on the framebuffer device without X.
diff -u gpe-mixer-0.42/debian/changelog gpe-mixer-0.42/debian/changelog
--- gpe-mixer-0.42/debian/changelog
+++ gpe-mixer-0.42/debian/changelog
@@ -1,3 +1,10 @@
+gpe-mixer (0.42-2) unstable; urgency=low
+
+ * fails to start if not using the framebuffer (Closes: #498373)
+ (also needs the PNG packaged or symlinked).
+
+ -- Neil Williams <[EMAIL PROTECTED]> Wed, 10 Sep 2008 11:49:18 +0100
+
gpe-mixer (0.42-1) unstable; urgency=low
* Initial release. (Closes: #404381: ITP: gpe-mixer -- audio mixer
diff -u gpe-mixer-0.42/debian/rules gpe-mixer-0.42/debian/rules
--- gpe-mixer-0.42/debian/rules
+++ gpe-mixer-0.42/debian/rules
@@ -9,6 +9,7 @@
common-install-arch::
install -d debian/gpe-mixer/usr/share/pixmaps/
install -m 0644 debian/gpe-mixer.xpm debian/gpe-mixer/usr/share/pixmaps/
+ install -m 0644 gpe-mixer.png debian/gpe-mixer/usr/share/pixmaps/
install -d debian/gpe-mixer/usr/share/man/man1/
install -m 0644 debian/gpe-mixer.1 debian/gpe-mixer/usr/share/man/man1/
reverted:
--- gpe-mixer-0.42/debian/patches/020-Makefile-pixmap.patch
+++ gpe-mixer-0.42.orig/debian/patches/020-Makefile-pixmap.patch
@@ -1,12 +0,0 @@
-diff -Nur gpe-mixer-0.42/Makefile gpe-mixer-0.42.new/Makefile
---- gpe-mixer-0.42/Makefile 2006-12-24 11:16:54.000000000 +0000
-+++ gpe-mixer-0.42.new/Makefile 2006-12-24 11:17:16.000000000 +0000
-@@ -38,8 +38,6 @@
- install-program: all $(PACKAGE).desktop
- mkdir -p $(DESTDIR)$(PREFIX)/bin
- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
-- mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
-- install -m 644 $(PACKAGE).png
$(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
- mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
- install -m 644 pixmaps/*.png $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/
- mkdir -p $(DESTDIR)$(PREFIX)/share/applications
only in patch2:
unchanged:
--- gpe-mixer-0.42.orig/Makefile
+++ gpe-mixer-0.42/Makefile
@@ -38,8 +38,6 @@
install-program: all $(PACKAGE).desktop
mkdir -p $(DESTDIR)$(PREFIX)/bin
install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
- mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
- install -m 644 $(PACKAGE).png
$(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
install -m 644 pixmaps/*.png $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/
mkdir -p $(DESTDIR)$(PREFIX)/share/applications
only in patch2:
unchanged:
--- gpe-mixer-0.42.orig/debian/patches/040-omit-framebuffer.patch
+++ gpe-mixer-0.42/debian/patches/040-omit-framebuffer.patch
@@ -0,0 +1,14 @@
+diff -Nur -x '*.orig' -x '*~' gpe-mixer-0.42/gpe-mixer.c
gpe-mixer-0.42.new/gpe-mixer.c
+--- gpe-mixer-0.42/gpe-mixer.c 2005-08-04 16:58:00.000000000 +0100
++++ gpe-mixer-0.42.new/gpe-mixer.c 2008-09-09 17:24:33.000000000 +0100
+@@ -249,8 +249,10 @@
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title (GTK_WINDOW (window), "Mixer");
+ gtk_window_set_default_size(GTK_WINDOW(window), 240, 100);
++#ifdef USE_FB
+ gtk_widget_realize (window);
+ gdk_window_set_type_hint (window->window, GDK_WINDOW_TYPE_HINT_TOOLBAR);
++#endif
+
+ /* Destroy handler */
+ g_signal_connect (G_OBJECT (window), "destroy",
--
Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/
signature.asc
Description: This is a digitally signed message part
