Mercurial > gub
changeset 5301:b8e4253e0920
Denemo: relocation, uninstall, option fixlets.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 07 Jul 2009 21:40:58 +0200 |
| parents | 3059047f101d |
| children | d1162ce5eb1d |
| files | nsis/denemo.nsi patches/denemo-prefops-mingw.patch patches/denemo-relocate-mingw.patch |
| diffstat | 3 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/nsis/denemo.nsi Tue Jul 07 15:12:26 2009 +0200 +++ b/nsis/denemo.nsi Tue Jul 07 21:40:58 2009 +0200 @@ -331,4 +331,6 @@ ; Error in macro RemoveTTFFont on macroline 9 ; Error in script "/home/janneke/vc/gub/target/mingw/installer/denemo--dbdir/denemo.nsi" on line 331 -- aborting creation process ; !insertmacro RemoveTTFFont "Denemo.ttf" + Delete "$WINDIR\Fonts\Denemo.ttf" + ClearErrors FunctionEnd
--- a/patches/denemo-prefops-mingw.patch Tue Jul 07 15:12:26 2009 +0200 +++ b/patches/denemo-prefops-mingw.patch Tue Jul 07 21:40:58 2009 +0200 @@ -1,14 +1,22 @@ ---- denemo-0.8.6/src/prefops.c~ 2009-07-01 16:17:15.000000000 +0200 -+++ denemo-0.8.6/src/prefops.c 2009-07-03 11:46:35.661920448 +0200 -@@ -77,13 +77,18 @@ initprefs () +--- denemo-0.8.6/src/prefops.c.orig 2009-07-01 16:17:15.000000000 +0200 ++++ denemo-0.8.6/src/prefops.c 2009-07-07 17:08:41.533006132 +0200 +@@ -71,19 +71,25 @@ initprefs () + + /* Reasonable default values */ + +- ret->lilypath = g_string_new ("lilypond"); + ret->midiplayer = g_string_new ("playmidi"); + ret->audioplayer = g_string_new ("play"); ret->csoundcommand = g_string_new ("csound -dm6"); ret->browser = g_string_new ("firefox"); ret->csoundorcfile = g_string_new (""); +#ifdef G_OS_WIN32 ++ ret->lilypath = g_string_new ("lilypond-windows"); + ret->pdfviewer = g_string_new ("acrord32"); + ret->imageviewer = g_string_new ("mspaint"); + ret->texteditor = g_string_new ("wordpad"); +#else /* !G_OS_WIN32 */ ++ ret->lilypath = g_string_new ("lilypond"); ret->pdfviewer = g_string_new ("xpdf"); + ret->imageviewer = g_string_new ("eog"); + ret->texteditor = g_string_new ("xedit");
--- a/patches/denemo-relocate-mingw.patch Tue Jul 07 15:12:26 2009 +0200 +++ b/patches/denemo-relocate-mingw.patch Tue Jul 07 21:40:58 2009 +0200 @@ -56,3 +56,14 @@ /* locale initialization */ //setlocale (LC_CTYPE, ""); //setlocale (LC_MESSAGES, ""); +--- denemo-0.8.6/src/utils.c~ 2009-07-07 14:44:35.176798844 +0200 ++++ denemo-0.8.6/src/utils.c 2009-07-07 16:47:50.428799860 +0200 +@@ -627,6 +627,8 @@ get_data_dir () + #ifdef G_OS_WIN32 + gchar *rootdir = g_win32_get_package_installation_directory (NULL, NULL); + datadir = g_build_filename (rootdir, "share", "denemo", NULL); ++ g_print ("rootdir=%s\n", rootdir); ++ g_print ("datadir=%s\n", datadir); + g_free (rootdir); + #else /* not G_OS_WIN32 */ + datadir = gbr_find_data_dir (PKGDATADIR);