Mercurial > gub
changeset 5294:d67107a3a94e
Denemo: Add FONTCONFIG mingw relocation, and fixes for --srcdir build.
This installs actions, fonts, icons etc.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 07 Jul 2009 10:07:12 +0200 |
| parents | e0ab53d089c4 |
| children | e1b053eac7f9 |
| files | gub/specs/denemo.py patches/denemo-relocate-mingw.patch patches/denemo-srcdir-make.patch |
| diffstat | 3 files changed, 92 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/denemo.py Tue Jul 07 10:05:23 2009 +0200 +++ b/gub/specs/denemo.py Tue Jul 07 10:07:12 2009 +0200 @@ -1,12 +1,15 @@ ''' TODO: * figure out solution pango/pangocairo, lilypond/lilypondcairo mess - * build denemo from GIT, use lilypondcairo from tarball? - * denemo for linux, all audio and X dependencies? - * upstream patches - * external commands: lilypond, adoberd32 not working - * prefopts: move initial values into config file, instead of - patching C code? + * build denemo from GIT, use lilypond[cairo] from tarball 2.12.3/2.13.3? + * try: denemo for linux, all audio and X dependencies? + * try: adding jack on windows + * what about timidity? + * upstream all denemo patches + * prefopts: move initial values into config file, instead of patching C code? + * relocation: non-windows dynamic relocation in main.c + * relocation: fix locale dir + * font: Denemo.ttf? ''' from gub import misc @@ -16,6 +19,7 @@ class Denemo (target.AutoBuild): source = 'git://git.savannah.gnu.org/denemo.git' source = 'http://download.savannah.gnu.org/releases/denemo/denemo-0.8.6.tar.gz' + patches = ['denemo-srcdir-make.patch'] @staticmethod def version_from_configure (self): try: @@ -54,6 +58,7 @@ 'jack-devel', 'lash-devel', 'libaubio-devel', + 'librsvg-devel', 'libxml2-devel', 'lilypondcairo', 'portaudio-devel', @@ -72,7 +77,7 @@ + ' --program-prefix=') class Denemo__mingw (Denemo): - patches = ['denemo-mingw.patch', 'denemo-prefops-mingw.patch', 'denemo-relocate-mingw.patch'] + patches = Denemo.patches + ['denemo-mingw.patch', 'denemo-prefops-mingw.patch', 'denemo-relocate-mingw.patch'] def __init__ (self, settings, source): Denemo.__init__ (self, settings, source) # Configure (link) without -mwindows for denemo-console.exe
--- a/patches/denemo-relocate-mingw.patch Tue Jul 07 10:05:23 2009 +0200 +++ b/patches/denemo-relocate-mingw.patch Tue Jul 07 10:07:12 2009 +0200 @@ -1,6 +1,6 @@ ---- denemo-0.8.6/src/main.c~ 2009-07-01 16:17:15.000000000 +0200 -+++ denemo-0.8.6/src/main.c 2009-07-03 08:54:26.125846002 +0200 -@@ -427,11 +427,25 @@ main (int argc, char *argv[]) +--- denemo-0.8.6/src/main.c.orig 2009-07-06 16:51:25.613300954 +0200 ++++ denemo-0.8.6/src/main.c 2009-07-06 17:13:31.044798892 +0200 +@@ -427,11 +427,34 @@ main (int argc, char *argv[]) /* initialization of directory relocatability */ initdir(); #ifdef G_OS_WIN32 @@ -24,10 +24,19 @@ + g_setenv ("PANGO_MODULE_VERSION", "1.6.0", TRUE); + g_setenv ("PANGO_SO_EXTENSION", ".dll", TRUE); + g_print ("Setting PANGO_PREFIX=%s\n", prefix); ++ ++ g_setenv ("GTK_MODULE_VERSION", "2.10.0", TRUE); ++ g_setenv ("GTK_SO_EXTENSION", ".dll", TRUE); + g_setenv ("GTK_PREFIX", prefix, TRUE); + g_print ("Setting GTK_PREFIX=%s\n", prefix); -+ g_setenv ("GTK_MODULE_VERSION", "2.10.0", TRUE); -+ g_setenv ("GTK_SO_EXTENSION", ".dll", TRUE); ++ ++ gchar *fc_path = g_strconcat (prefix, "/etc/fonts", NULL); ++ g_setenv ("FONTCONFIG_PATH", fc_path, TRUE); ++ g_print ("Setting FONTCONFIG_PATH=%s\n", fc_path); ++ gchar *fc_file = g_strconcat (fc_path, "/fonts.conf", NULL); ++ g_setenv ("FONTCONFIG_FILE", fc_file, TRUE); ++ g_print ("Setting FONTCONFIG_FILE=%s\n", fc_file); ++ #endif /* locale initialization */ //setlocale (LC_CTYPE, "");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/denemo-srcdir-make.patch Tue Jul 07 10:07:12 2009 +0200 @@ -0,0 +1,66 @@ +--- denemo-0.8.6/Makefile.am~ 2009-07-01 16:17:15.000000000 +0200 ++++ denemo-0.8.6/Makefile.am 2009-07-06 13:06:42.473301148 +0200 +@@ -16,7 +16,7 @@ MAINTAINERCLEANFILES = Makefile.in aclo + depcomp + + install-data-hook: +- cp -r actions ${DESTDIR}/$(datadir)/${PACKAGE}/ ++ cp -r $(srcdir)/actions ${DESTDIR}/$(datadir)/${PACKAGE}/ + find $(DESTDIR)$(datadir)/${PACKAGE}/actions -type d -exec chmod 755 '{}' \; + dist-hook: @PACKAGE@.spec + cp $(srcdir)/@PACKAGE@.spec $(distdir) +--- denemo-0.8.6/Makefile.in~ 2009-07-01 16:19:20.000000000 +0200 ++++ denemo-0.8.6/Makefile.in 2009-07-06 13:07:00.381300299 +0200 +@@ -746,7 +746,7 @@ uninstall-am: uninstall-dist_sysconfDATA + + + install-data-hook: +- cp -r actions ${DESTDIR}/$(datadir)/${PACKAGE}/ ++ cp -r $(srcdir)/actions ${DESTDIR}/$(datadir)/${PACKAGE}/ + find $(DESTDIR)$(datadir)/${PACKAGE}/actions -type d -exec chmod 755 '{}' \; + dist-hook: @PACKAGE@.spec + cp $(srcdir)/@PACKAGE@.spec $(distdir) +--- denemo-0.8.6/fonts/Makefile.am~ 2009-07-01 16:17:15.000000000 +0200 ++++ denemo-0.8.6/fonts/Makefile.am 2009-07-06 13:08:37.953300890 +0200 +@@ -3,7 +3,7 @@ + + fontsdir = $(datadir)/fonts/truetype/denemo + +-fonts_DATA = Denemo.ttf LICENSE_OFL.txt ++fonts_DATA = $(srcdir)/Denemo.ttf $(srcdir)/LICENSE_OFL.txt + + EXTRA_DIST = $(fonts_DATA) + CLEANFILES = *~ #*# +--- denemo-0.8.6/fonts/Makefile.in~ 2009-07-01 16:19:19.000000000 +0200 ++++ denemo-0.8.6/fonts/Makefile.in 2009-07-06 13:08:58.736801898 +0200 +@@ -224,7 +224,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + fontsdir = $(datadir)/fonts/truetype/denemo +-fonts_DATA = Denemo.ttf LICENSE_OFL.txt ++fonts_DATA = $(srcdir)/Denemo.ttf $(srcdir)/LICENSE_OFL.txt + EXTRA_DIST = $(fonts_DATA) + CLEANFILES = *~ #*# + all: all-am +--- denemo-0.8.6/pixmaps/Makefile.am~ 2009-07-01 16:17:15.000000000 +0200 ++++ denemo-0.8.6/pixmaps/Makefile.am 2009-07-06 13:53:05.592798574 +0200 +@@ -135,7 +135,7 @@ icon-rest-4.svg \ + icon-rest-5.svg + + icondir=$(datadir)/pixmaps +-icon_DATA=denemo.png ++icon_DATA=$(srcdir)/denemo.png + + desktopdir = $(datadir)/applications + desktop_DATA = denemo.desktop +--- denemo-0.8.6/pixmaps/Makefile.in~ 2009-07-01 16:19:19.000000000 +0200 ++++ denemo-0.8.6/pixmaps/Makefile.in 2009-07-06 13:53:18.748801041 +0200 +@@ -361,7 +361,7 @@ icon-rest-4.svg \ + icon-rest-5.svg + + icondir = $(datadir)/pixmaps +-icon_DATA = denemo.png ++icon_DATA = $(srcdir)/denemo.png + desktopdir = $(datadir)/applications + desktop_DATA = denemo.desktop + EXTRA_DIST = $(pixmaps_DATA) $(icon_DATA) $(desktop_DATA)