diff --git a/denemo.make b/denemo.make index 21259cf..c18a3eb 100644 --- a/denemo.make +++ b/denemo.make @@ -6,7 +6,7 @@ default: all DENEMO_BRANCH="master" DENEMO_REPO_URL=git://git.savannah.gnu.org/denemo.git -PLATFORMS=mingw linux-x86 darwin-x86 +PLATFORMS=mingw # derived info DENEMO_SOURCE_URL=$(DENEMO_REPO_URL)?branch=$(DENEMO_BRANCH) diff --git a/gub/specs/denemo.py b/gub/specs/denemo.py index 1308098..1123f00 100644 --- a/gub/specs/denemo.py +++ b/gub/specs/denemo.py @@ -54,10 +54,10 @@ class Denemo (target.AutoBuild): target.AutoBuild.compile (self) class Denemo__linux__x86 (Denemo): - source = 'http://www.denemo.org/downloads/denemo-1.0.0~rc10.tar.gz' - #source = 'git://git.savannah.gnu.org/denemo.git' - #branch = 'master' - patches = ['denemo.prefop.c.patch', 'denemo.main.c-envelope.patch'] + #source = 'http://www.denemo.org/downloads/denemo-1.0.0~rc10.tar.gz' + source = 'git://git.savannah.gnu.org/denemo.git' + branch = 'master' + #patches = ['denemo.prefop.c.patch', 'denemo.main.c-envelope.patch'] #branch = 'linux' #dependencies = + ['alsa-devel'] @@ -72,9 +72,9 @@ class Denemo__linux__x86 (Denemo): class Denemo__mingw__windows (Denemo): - source = 'http://www.denemo.org/downloads/denemo-1.0.0~rc10.tar.gz' -# source = 'git://git.savannah.gnu.org/denemo.git' -# branch = 'master' + #source = 'file://home/rshann/git-denemo/localbuild/denemo-1.0.0~rc10.tar.gz' + source = 'git://git.savannah.gnu.org/denemo.git' + branch = 'master' dependencies = [x for x in Denemo.dependencies if x.replace ('-devel', '') not in [ 'lash', diff --git a/gub/specs/libtool.py b/gub/specs/libtool.py index 014b701..44d5af7 100644 --- a/gub/specs/libtool.py +++ b/gub/specs/libtool.py @@ -5,7 +5,7 @@ from gub import target from gub import tools class Libtool (target.AutoBuild): - source = 'http://ftp.gnu.org/pub/gnu/libtool/libtool-2.2.6a.tar.gz' + source = 'http://ftp.gnu.org/pub/gnu/libtool/libtool-2.2.6b.tar.gz' #source = 'git://git.sv.gnu.org/libtool.git?branch=master&revision=77e114998457cb6170ad84b360cb5b9be90f2191' dependencies = ['tools::libtool'] configure_variables = (target.AutoBuild.configure_variables diff --git a/gub/specs/lilypondcairo.py b/gub/specs/lilypondcairo.py index 9f29dfd..59d42c9 100644 --- a/gub/specs/lilypondcairo.py +++ b/gub/specs/lilypondcairo.py @@ -6,12 +6,12 @@ from gub.specs import lilypond # in. Hmm. class Lilypondcairo (lilypond.Lilypond): - source = 'http://lilypond.org/download/source/v2.13/lilypond-2.13.54.tar.gz' + source = 'http://lilypond.org/download/source/v2.16/lilypond-2.16.2.tar.gz' dependencies = [x.replace ('pango', 'pangocairo') for x in lilypond.Lilypond.dependencies] - patches = [ - '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch', - ] + #patches = [ + # '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch', + # ] def get_conflict_dict (self): return {'': ['lilypond']} @@ -19,9 +19,9 @@ class Lilypondcairo__mingw (lilypond.Lilypond__mingw): source = Lilypondcairo.source dependencies = [x.replace ('pango', 'pangocairo') for x in lilypond.Lilypond__mingw.dependencies] - patches = [ - '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch', - ] + ##patches = [ + ## '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch', + ## ] def get_conflict_dict (self): return {'': ['lilypond']} diff --git a/gub/specs/portmidi.py b/gub/specs/portmidi.py index 5b4c891..88bfe4a 100644 --- a/gub/specs/portmidi.py +++ b/gub/specs/portmidi.py @@ -6,3 +6,4 @@ class Portmidi (target.AutoBuild): class Portmidi__mingw (target.AutoBuild): source = 'http://www.denemo.org/downloads/gub/libportmidi-0.218.tar.gz' + force_autoupdate = True diff --git a/nsis/denemo.nsi b/nsis/denemo.nsi index 30de321..ad76520 100644 --- a/nsis/denemo.nsi +++ b/nsis/denemo.nsi @@ -113,8 +113,8 @@ fresh_install: SectionEnd Function registry_path - ReadRegStr $R0 HKLM "${ENVIRON}" "PATH" - WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$R0;$INSTDIR\usr\bin" + ;;;ReadRegStr $R0 HKLM "${ENVIRON}" "PATH" + ;;;WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$R0;$INSTDIR\usr\bin" FunctionEnd ;; copy & paste from the NSIS code examples