diff --git a/GNUmakefile b/GNUmakefile index 5946d7044..161f62e6f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -29,17 +29,14 @@ lily% cygwin%: $(MAKE) -f lilypond.make $@ denemo-%: - $(MAKE) -f inkscape.make $@ - -inkscape-%: - $(MAKE) -f inkscape.make $@ + $(MAKE) -f denemo.make $@ test: rm -rf target make -f lilypond.make tools LOCAL_GUB_OPTIONS=-vvv bin/gub -p $(BUILD_PLATFORM) --branch=lilypond=master:master lilypond -vvv -README: web/index.html web/basics.html web/lilypond.html web/denemo.html web/inkscape.html web/history.html web/links.html +README: web/index.html web/basics.html web/lilypond.html web/denemo.html web/history.html web/links.html w3m -dump $^ | sed 's/website by.*$..//' > $@ web: README diff --git a/README b/README index 89d277674..ef1bc71c8 100644 --- a/README +++ b/README @@ -43,7 +43,6 @@ Send bug reports and patches to lilypond-devel@gnu.org. Supported installer packages GNU Denemo -Inkscape GNU LilyPond with all essential dependencies. Currently, 207 package build specifications are included in GUB. @@ -137,12 +136,6 @@ Examples this leaves the installer in uploads/ - * Build Inkscape for your platform - - bin/gub inkscape-installer - - this leaves the installer in uploads/ - * Cross build Denemo (http://denemo.org) for Windows (mingw32) make denemo @@ -624,35 +617,6 @@ More examples -GUB -- Inkscape - -INSTALLING - -Optional: Prepare build environment - - make -f inkscape.make bootstrap - -Build everything - - make inkscape - -this leaves installers in uploads/ - -More examples - - * Build all Inkscape installers - - make inkscape - - this leaves installers for GNU/Linux (x86, x86_64, powerpc), - FreeBSD (x86, x86_64) and Windows, and documentation in uploads/ - - OR (old style) - - bin/gub inkscape - bin/gib inkscape --branch=inkscape=trunk inkscape - - GUB the Grand Unified Builder diff --git a/gub/mirrors.py b/gub/mirrors.py index 585cc77f0..eceec19ee 100644 --- a/gub/mirrors.py +++ b/gub/mirrors.py @@ -83,8 +83,6 @@ gcc_41 = 'ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-%(version)s/gcc-%(version)s.tar.bz2' gcc_snap = 'ftp://ftp.fu-berlin.de/unix/languages/gcc/snapshots/%(version)s/gcc-%(version)s.tar.bz2' -boost_1_33_1 = 'http://surfnet.dl.sourceforge.net/sourceforge/boost/boost_1_33_1.tar.%(format)s' - gnucvs = ':pserver:anoncvs@cvs.sv.gnu.org:/cvsroot/%(name)s' redhat_snapshots = 'ftp://sources.redhat.com/pub/%(name)s/snapshots/%(name)s-%(version)s.tar.%(format)s' diff --git a/gub/specs/boost-jam.py b/gub/specs/boost-jam.py deleted file mode 100644 index f822fccc6..000000000 --- a/gub/specs/boost-jam.py +++ /dev/null @@ -1,10 +0,0 @@ -from gub import misc -from gub import tools - -class Boost_jam (tools.ShBuild): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/boost/boost-jam-3.1.11.tgz' - make_flags = ' gcc --symbols' - install_command = misc.join_lines (''' -install -d %(install_prefix)s/bin -&& install -m755 bin.*/bjam %(install_prefix)s/bin -''') diff --git a/gub/specs/boost.py b/gub/specs/boost.py deleted file mode 100644 index 8ce9175b0..000000000 --- a/gub/specs/boost.py +++ /dev/null @@ -1,203 +0,0 @@ -import os -# -from gub import context -from gub import loggedos -from gub import misc -from gub import target -from gub import tools - -def add_plain_lib_names (logger, file): - base = (os.path.basename (file) - .replace ('-mt.a', '.a') - .replace ('-s.a', '.a') - .replace ('-mt.so', '.so') - .replace ('-s.so', '.so')) - misc.symlink_in_dir (file, base) - -def replace_links (logger, file): - if os.path.islink (file): - link = os.readlink (file) - loggedos.system (logger, ''' -rm %(file)s -cp %(link)s %(file)s -''' % locals ()) - -class Boost (target.BjamBuild_v2): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/boost/boost_1_38_0.tar.bz2' - dependencies = [] - def stages (self): - return misc.list_insert_before (target.BjamBuild_v2.stages (self), - 'compile', - ['build_bjam']) - def build_bjam (self): - self.system ('cd %(builddir)s/tools/jam/src && CC=gcc sh build.sh gcc && mv bin.*/bjam %(builddir)s') - boost_modules = [ - 'date_time', - 'filesystem', - 'function_types', - #'graph', - 'iostreams', - #'math', - 'program_options', - #'python', - 'regex', - 'serialization', - 'signals', - 'system', - #'test', - 'thread', - #'wave' - ] - compile_command = (target.BjamBuild_v2.compile_command - .replace ('bjam ', '%(builddir)s/bjam ') - + ' -sNO_BZIP2=1' - + ' -sNO_ZLIB=1' - + ' --with-'.join ([''] + boost_modules)) - license_files = ['%(srcdir)s/LICENSE_1_0.txt'] - def install (self): - target.BjamBuild_v2.install (self) - # Bjam `installs' header files by using symlinks to the source dir? - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.so') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.so') - self.map_locate (replace_links, '%(install_prefix)s/include/boost', '*') - -class Boost__freebsd__x86 (Boost): - patches = ['boost-1.38.0-freebsd4.patch'] - compile_command = (Boost.compile_command - .replace ('--with-serialization', '')) - -class UGLYFIXBoost__mingw (Boost): - @context.subst_method - def target_os (self): - return 'windows' - ## UGH, function in boost-1.38 breaks badly - ## the easy fix is to revert to 1.33.1 - ''' -/home/janneke/vc/gub/target/mingw/root/usr/include/boost/function/function_template.hpp:965: error: declaration of 'class R' -/home/janneke/vc/gub/target/mingw/root/usr/include/boost/function/function_template.hpp:652: error: shadows template parm 'class R' -/home/janneke/vc/gub/target/mingw/root/usr/include/boost/function/function_template.hpp:979: error: declaration of 'class R' -/home/janneke/vc/gub/target/mingw/root/usr/include/boost/function/function_template.hpp:652: error: shadows template parm 'class R' -/home/janneke/vc/gub/target/mingw/root/usr/include/boost/function/function_template.hpp:983: error: cannot define member function 'boost::function0::operator()' within 'boost::function0' -''' - def __init__ (self, settings, source): - Boost.__init__ (self, settings, source) - self.function_source = repository.get_repository_proxy (self.settings.downloads, 'http://lilypond.org/downloads/gub-sources/boost-function/boost-function-1.34.1.tar.gz?strip=0') - def connect_command_runner (self, runner): - printf ('FIXME: deferred workaround: should support multiple sources') - if (runner): - self.function_source.connect_logger (runner.logger) - return Boost.connect_command_runner (self, runner) - def download (self): - Boost.download (self) - self.function_source.download () - def install (self): - Boost.install (self) - self.install_function () - def install_function (self): - function_dir = self.expand ('%(install_prefix)s/include') - def defer (logger): - self.function_source.update_workdir (function_dir) - self.func (defer) - -class BjamBuild_v1 (target.MakeBuild): - @context.subst_method - def CFLAGS (self): - return '' - compile_command = misc.join_lines (''' -bjam --q -'-sTOOLS=gcc' -'-sGCC=%(toolchain_prefix)sgcc -fPIC -DBOOST_PLATFORM_CONFIG=\\"boost/config/platform/linux.hpp\\"' -'-sGXX=%(toolchain_prefix)sg++ -fPIC -DBOOST_PLATFORM_CONFIG=\\"boost/config/platform/linux.hpp\\"' -'-sBUILD=release space on off static' -'-sPYTHON_VERSION=2.4' -'-scxxflags=-fPIC' ---layout=system ---builddir=%(builddir)s ---prefix=%(prefix_dir)s ---exec-prefix=%(prefix_dir)s ---libdir=%(prefix_dir)s/lib ---includedir=%(prefix_dir)s/include ---verbose -''') - install_command = (compile_command - .replace ('=%(prefix_dir)s', '=%(install_prefix)s') - + ' install') - -class Boost_v1 (BjamBuild_v1): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/boost/boost_1_33_1.tar.bz2' - def stages (self): - return misc.list_insert_before (BjamBuild_v1.stages (self), - 'compile', - ['build_bjam']) - def build_bjam (self): - # the separately available boost-jam is terribly broken wrt - # building boost: build included bjam - self.system ('cd %(builddir)s/tools/build/jam_src && CC=gcc sh build.sh gcc && mv bin.*/bjam %(builddir)s') - license_files = ['%(srcdir)s/LICENSE_1_0.txt'] - boost_modules = [ - 'date_time', - 'filesystem', - 'function_types', - #'graph', - 'iostreams', - #'math', - 'program_options', - #'python', - 'regex', - 'serialization', - 'signals', - 'system', - #'test', - 'thread', - #'wave' - ] - compile_command = (BjamBuild_v1.compile_command - .replace ('bjam ', '%(builddir)s/bjam ') - + ' -sNO_BZIP2=1' - + ' -sNO_ZLIB=1' - + ' --with-'.join ([''] + boost_modules)) - install_command = (BjamBuild_v1.install_command - .replace ('bjam ', '%(builddir)s/bjam ') - + ' -sNO_BZIP2=1' - + ' -sNO_ZLIB=1' - + ' --with-'.join ([''] + boost_modules)) - def install (self): - BjamBuild_v1.install (self) - # Bjam `installs' header files by using symlinks to the source dir? - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.so') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.so') - self.map_locate (replace_links, '%(install_prefix)s/include/boost', '*') - -class Boost__mingw (Boost_v1): - compile_command = (Boost_v1.compile_command - .replace ('linux.hpp', 'win32.hpp')) - -class Boost__tools (tools.BjamBuild_v2, Boost): - @context.subst_method - def CXX (self): - return 'g++' - def stages (self): - return Boost.stages (self) - def build_bjam (self): - # the separately available boost-jam is terribly broken wrt - # building boost: build included bjam - self.system ('cd %(builddir)s/tools/jam/src && CC=gcc sh build.sh gcc && mv bin.*/bjam %(builddir)s') - compile_command = (tools.BjamBuild_v2.compile_command - .replace ('bjam ', '%(builddir)s/bjam ') - + ' -sNO_BZIP2=1' - + ' -sNO_ZLIB=1' - + ' --with-'.join ([''] + Boost.boost_modules)) - def install (self): - tools.BjamBuild_v2.install (self) - # Bjam `installs' header files by using symlinks to the source dir? - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-mt.so') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.a') - self.map_locate (add_plain_lib_names, '%(install_prefix)s/lib', 'libboost_*-s.so') - self.map_locate (replace_links, '%(install_prefix)s/include/boost', '*') diff --git a/gub/specs/cairomm.py b/gub/specs/cairomm.py deleted file mode 100644 index 4eb3fac64..000000000 --- a/gub/specs/cairomm.py +++ /dev/null @@ -1,9 +0,0 @@ -from gub import target - -class Cairomm (target.AutoBuild): - source = 'http://www.cairographics.org/releases/cairomm-1.8.0.tar.gz' - dependencies = ['cairo-devel', 'libsig++-devel'] - -class Cairomm__freebsd (Cairomm): - configure_variables = (Cairomm.configure_variables - + ' CFLAGS=-pthread CXXFLAGS=-pthread') diff --git a/gub/specs/gsl.py b/gub/specs/gsl.py deleted file mode 100644 index 5bf10d8f7..000000000 --- a/gub/specs/gsl.py +++ /dev/null @@ -1,4 +0,0 @@ -from gub import target - -class Gsl (target.AutoBuild): - source = 'http://ftp.gnu.org/gnu/gsl/gsl-1.12.tar.gz' diff --git a/gub/specs/gtkmm.py b/gub/specs/gtkmm.py deleted file mode 100644 index 1fbf908bb..000000000 --- a/gub/specs/gtkmm.py +++ /dev/null @@ -1,5 +0,0 @@ -from gub import target - -class Gtkmm (target.AutoBuild): - source = 'http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.3.tar.gz' - dependencies = ['cairomm-devel', 'gtk+-devel', 'pangomm-devel'] diff --git a/gub/specs/inkscape-installer.py b/gub/specs/inkscape-installer.py deleted file mode 100644 index 2e7190963..000000000 --- a/gub/specs/inkscape-installer.py +++ /dev/null @@ -1,33 +0,0 @@ -import os -import sys -# -from gub import misc -from gub import target -from gub.specs import inkscape - -# FIXME: make target.Installer/target.BaseBuild packag? -# This is much more work than just calling -# bin/gib --platform= --branch=PACKAGE=BRANCH PACKAGE -# not really a 'python driver'. -class Inkscape_installer (target.AutoBuild): - source = Inkscape.source - never_install = 'True' - def __init__ (self, settings, source): - target.AutoBuild.__init__ (self, settings, source) - source.is_tracking = misc.bind_method (lambda x: True, source) - source.is_downloaded = misc.bind_method (lambda x: True, source) - source.update_workdir = misc.bind_method (lambda x: True, source) - dependencies = [self.settings.target_platform + '::inkscape'] - subpackage_names = [''] - def stages (self): - return ['compile', 'install', 'package'] - def compile (self): - inkscape_branch = self.source.full_branch_name () - self.system (sys.executable - + misc.join_lines (''' -bin/gib ---platform=%(target_platform)s ---branch=inkscape=%(inkscape_branch)s -lilypond -'''), locals ()) - install_command = 'true' diff --git a/gub/specs/inkscape.py b/gub/specs/inkscape.py deleted file mode 100644 index 3ab887b5b..000000000 --- a/gub/specs/inkscape.py +++ /dev/null @@ -1,117 +0,0 @@ -from gub import build -from gub import context -from gub import misc -from gub import target - -class Inkscape (target.AutoBuild): - source = 'svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape&module=inkscape&branch=trunk&revision=22714' - branch = 'trunk' - dependencies = [ - 'cross/gcc-c++-runtime', - 'tools::automake', - 'tools::gettext', - 'tools::intltool', - 'tools::pkg-config', - 'boost-devel', - 'glibmm-devel', - 'gtkmm-devel', - 'gtk+-devel', - 'gsl-devel', - 'lcms-devel', - 'poppler-devel', - 'popt-devel', - 'libgc-devel', - 'libpng-devel', - 'librsvg-devel', - 'libsig++-devel', - 'libxml2-devel', - 'libxslt-devel', - ] - configure_flags = (target.AutoBuild.configure_flags - + ' --enable-lcms' - + ' --enable-binreloc=yes' - ) - configure_variables = (target.AutoBuild.configure_variables - + ' CXXFLAGS=-fpermissive' - ) - def __init__ (self, settings, source): - target.AutoBuild.__init__ (self, settings, source) - build.add_dict (self, - {'ACLOCAL_FLAGS': ' -I '.join ([''] + self.aclocal_path ()), }) - source.is_tracking = misc.bind_method (lambda x: True, source) - def patch (self): - target.AutoBuild.patch (self) - self.file_sub ([('AC_PATH_PROG\(PKG_CONFIG,', - 'AC_PATH_PROG(ARE_YOU_FREAKING_MAD__OVERRIDING_PKG_CONFIG,')], - '%(srcdir)s/configure.ac') - -class Inkscape__mingw (Inkscape): - parallel_build_broken = True # linking breaks: two simultaneous - # inkscape.exe linking processes!? - patches = [ - 'inkscape-mingw.patch', - 'inkscape-mingw-DATADIR.h.patch', - ] - dependencies = [x for x in Inkscape.dependencies - if 'poppler' not in x] - configure_flags = (Inkscape.configure_flags - + ' --disable-poppler-cairo') - -class Inkscape__freebsd (Inkscape): - configure_variables = (Inkscape.configure_variables - + ' CFLAGS=-pthread' - + ' CXXFLAGS="-fpermissive -pthread"') - dependencies = Inkscape.dependencies + ['cross/gcc-runtime'] - -class Inkscape__freebsd__x86 (Inkscape__freebsd): - patches = [ - 'inkscape-isfinite.patch', - 'inkscape-wstring.patch', - #'inkscape-round.patch', - 'inkscape-round-2.patch', - ] - def patch (self): - Inkscape__freebsd.patch (self) - self.file_sub ([ - ('wchar_t', 'char'), - ('WCHAR_T', 'CHAR'), - ], - '%(srcdir)s/src/util/ucompose.hpp') - def configure (self): - Inkscape__freebsd.configure (self) - self.file_sub ([ - ('(/[*] config.h. Generated)', r''' -#ifndef C99_ROUND -#define C99_ROUND -#ifdef __cplusplus -extern "C" { -#endif -double floor (double); -int sscanf(const char *str, const char *format, ...); -#ifdef __cplusplus -} -#endif -static inline double -round (double x) -{ - return (floor (x - 0.5) + 1.0); -} -static inline long long -atoll (char const *s) -{ - long long _l = 0LL; - sscanf(s, "%%lld", &_l); - return _l; -} -#define fmin(x,y) (xy? x : y) -#define INFINITY (__builtin_inff()) -#endif /* C99_ROUND */ -\1'''),], - '%(builddir)s/config.h') - -class Inkscape__darwin (Inkscape): - dependencies = [x for x in Inkscape.dependencies - if x.replace ('-devel', '') not in [ - 'libxml2', # Included in darwin-sdk, hmm? - ]] diff --git a/gub/specs/lcms.py b/gub/specs/lcms.py deleted file mode 100644 index f83574039..000000000 --- a/gub/specs/lcms.py +++ /dev/null @@ -1,14 +0,0 @@ -from gub import target -from gub import tools - -class Lcms (target.AutoBuild): - source = 'http://sourceforge.net/projects/lcms/files/lcms/1.18/lcms-1.18a.tar.gz' - dependencies = ['tools::libtool'] - def configure (self): - target.AutoBuild.configure (self) - self.system ('rm -f %(srcdir)s/include/icc34.h') - -class Lcms__tools (tools.AutoBuild, Lcms): - def configure (self): - tools.AutoBuild.configure (self) - self.system ('rm -f %(srcdir)s/include/icc34.h') diff --git a/gub/specs/libgc.py b/gub/specs/libgc.py deleted file mode 100644 index 186ae2f5a..000000000 --- a/gub/specs/libgc.py +++ /dev/null @@ -1,23 +0,0 @@ -from gub import target - -class Libgc (target.AutoBuild): - configure_flags = target.AutoBuild.configure_flags + ' --enable-threads=pthreads' - #source = 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz' - source = 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz&version=6.8' - -class Libgc__freebsd (Libgc): - make_flags = 'THREADDLLIBS=-pthread' - -class Libgc__freebsd__x86 (Libgc__freebsd): - source = 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz&version=6.8' - #patches = ['libgc-6.8-freebsd-x86_64.patch'] - -class Libgc__mingw (Libgc): - dependencies = [ - 'pthreads-w32', - ] - patches = [ - 'libgc-6.8-mingw-pthreads.patch', - ] - force_autoupdate = True - source = 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz&version=6.8' diff --git a/gub/specs/libxslt.py b/gub/specs/libxslt.py deleted file mode 100644 index 4a8a5a334..000000000 --- a/gub/specs/libxslt.py +++ /dev/null @@ -1,34 +0,0 @@ -from gub import context -from gub import loggedos -from gub import misc -from gub import target -from gub import tools - -class Libxslt (target.AutoBuild): - source = 'http://xmlsoft.org/sources/libxslt-1.1.24.tar.gz' - def patch (self): - self.system ('rm -f %(srcdir)s/libxslt/xsltconfig.h') - dependencies = ['libxml2-devel', 'zlib-devel'] - configure_flags = (target.AutoBuild.configure_flags - + misc.join_lines (''' ---without-python ---without-crypto -''')) - @context.subst_method - def config_script (self): - return 'xslt-config' - -class Libxslt__mingw (Libxslt): - configure_flags = (Libxslt.configure_flags - + misc.join_lines (''' ---without-plugins -''')) - -class Libxslt__darwin (Libxslt): - dependencies = [x for x in Libxslt.dependencies - if x.replace ('-devel', '') not in [ - 'libxml2', # Included in darwin-sdk, hmm? - ]] - -class Libxslt__tools (tools.AutoBuild, Libxslt): - dependencies = Libxslt.dependencies + ['libtool'] diff --git a/gub/specs/pangomm.py b/gub/specs/pangomm.py deleted file mode 100644 index 13a28a3cf..000000000 --- a/gub/specs/pangomm.py +++ /dev/null @@ -1,9 +0,0 @@ -from gub import target - -class Pangomm (target.AutoBuild): - source = 'http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-2.14.1.tar.gz' - dependencies = ['cairomm-devel', 'glibmm-devel', 'libsig++-devel', 'pangocairo-devel'] - configure_variables = (target.AutoBuild.configure_variables - + ' CFLAGS=-I%(system_prefix)s/include/freetype2' - + ''' LDFLAGS='-lfreetype -lz' ''') - make_flags = ''' 'sublib_cflags=$(PANGOMM_CFLAGS) $(CFLAGS)' ''' diff --git a/gub/specs/popt.py b/gub/specs/popt.py deleted file mode 100644 index 40390dd3e..000000000 --- a/gub/specs/popt.py +++ /dev/null @@ -1,15 +0,0 @@ -from gub import target - -class Popt (target.AutoBuild): - source = 'http://rpm5.org/files/popt/popt-1.14.tar.gz' - config_cache_overrides = target.AutoBuild.config_cache_overrides + ''' -ac_cv_va_copy=${ac_cv_va_copy=C99} -''' - -class Popt__freebsd__x86 (Popt): - patches = ['popt-no-wchar-hack.patch'] - -class Popt__mingw (Popt): - patches = ['popt-no-sys-ioctl.patch'] - configure_variables = (Popt.configure_variables - + ' CFLAGS="-Drandom=rand -Dsrandom=srand"') diff --git a/gub/target.py b/gub/target.py index 4f142c98a..f711e698a 100644 --- a/gub/target.py +++ b/gub/target.py @@ -224,48 +224,6 @@ def stages (self): compile_command = '%(configure_binary)s build' install_command = '%(configure_binary)s install' -class BjamBuild_v2 (MakeBuild): - dependencies = ['tools::boost-jam'] - def patch (self): - MakeBuild.patch (self) - '''http://goodliffe.blogspot.com/2008/05/cross-compiling-boost.html - -Now, here's the magic. Brace yourself. This is how you use a custom -gcc compiler, you write some odd rule into some very well hidden -config file: - -echo "using gcc : 4.2.2 : PATH_TO_DIR/arm-softfloat-linux-gnu-g++ ; " -> tools/build/v2/user-config.jam -''' - gcc_version = '' #don't care - self.dump (''' -using gcc : %(gcc_version)s : %(system_prefix)s%(cross_dir)s/bin/%(CXX)s ; -''', - '%(srcdir)s/tools/build/v2/user-config.jam', - env=locals ()) - compile_command = misc.join_lines (''' -bjam --q ---layout=system ---builddir=%(builddir)s ---prefix=%(prefix_dir)s ---exec-prefix=%(prefix_dir)s ---libdir=%(prefix_dir)s/lib ---includedir=%(prefix_dir)s/include ---verbose -cxxflags=-fPIC -toolset=gcc -target-os=%(target_os)s -debug-symbols=off -link=shared -runtime-link=shared -threading=multi -release -''') - install_command = (compile_command - .replace ('=%(prefix_dir)s', '=%(install_prefix)s') - + ' install') - class NullBuild (AutoBuild): def stages (self): return ['patch', 'install', 'package', 'clean'] diff --git a/gub/tools.py b/gub/tools.py index 8218375b1..b06afe52e 100644 --- a/gub/tools.py +++ b/gub/tools.py @@ -206,32 +206,6 @@ def stages (self): ' %(scons_flags)s') install_command = compile_command + ' %(install_flags)s' -class BjamBuild_v2 (MakeBuild): - dependencies = ['boost-jam'] - def patch (self): - MakeBuild.patch (self) - compile_command = misc.join_lines (''' -bjam --q ---layout=system ---builddir=%(builddir)s ---prefix=%(system_prefix)s ---exec-prefix=%(system_prefix)s ---libdir=%(system_prefix)s/lib ---includedir=%(system_prefix)s/include ---verbose -cxxflags=-fPIC -toolset=gcc -debug-symbols=off -link=shared -runtime-link=shared -threading=multi -release -''') - install_command = (compile_command - .replace ('=%(system_prefix)s', '=%(install_prefix)s') - + ' install') - class NullBuild (AutoBuild): def stages (self): return ['patch', 'install', 'package', 'clean'] diff --git a/gub/tools32.py b/gub/tools32.py index 20c7956b0..53731e428 100644 --- a/gub/tools32.py +++ b/gub/tools32.py @@ -45,32 +45,6 @@ def stages (self): ' %(scons_flags)s') install_command = compile_command + ' %(install_flags)s' -class BjamBuild_v2 (MakeBuild): - dependencies = ['boost-jam'] - def patch (self): - MakeBuild.patch (self) - compile_command = misc.join_lines (''' -bjam --q ---layout=system ---builddir=%(builddir)s ---prefix=%(system_prefix)s ---exec-prefix=%(system_prefix)s ---libdir=%(system_prefix)s/lib ---includedir=%(system_prefix)s/include ---verbose -cxxflags=-fPIC -toolset=gcc -debug-symbols=off -link=shared -runtime-link=shared -threading=multi -release -''') - install_command = (compile_command - .replace ('=%(system_prefix)s', '=%(install_prefix)s') - + ' install') - class NullBuild (AutoBuild): def stages (self): return ['patch', 'install', 'package', 'clean'] diff --git a/inkscape.make b/inkscape.make deleted file mode 100644 index debfc7e62..000000000 --- a/inkscape.make +++ /dev/null @@ -1,50 +0,0 @@ -.PHONY: all gub3-packages gub3-installers -.PHONY: inkscape inkscape-installer inkscape-installers print-success - -all: inkscape inkscape-installer print-success - -include gub.make - - -INKSCAPE_BRANCH=trunk?revision=20605 -INKSCAPE_REPO_URL=svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape?module=inkscape -#source = 'svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape&module=inkscape&branch=trunk&revision=20605' - -PLATFORMS=linux-x86 -# Cocoa/Carbon? -# PLATFORMS+=darwin-ppc darwin-x86 -PLATFORMS+=mingw -PLATFORMS+=linux-64 -PLATFORMS+=linux-ppc -PLATFORMS+=freebsd-x86 freebsd-64 -#PLATFORMS+=cygwin - -#derived info -INKSCAPE_SOURCE_URL=$(INKSCAPE_REPO_URL)?branch=$(INKSCAPE_BRANCH) -INKSCAPE_DIRRED_BRANCH=$(shell $(PYTHON) gub/repository.py --branch-dir '$(INKSCAPE_SOURCE_URL)') -INKSCAPE_FLATTENED_BRANCH=$(shell $(PYTHON) gub/repository.py --full-branch-name '$(INKSCAPE_SOURCE_URL)') - -BUILD_PACKAGE='$(INKSCAPE_SOURCE_URL)' -INSTALL_PACKAGE = inkscape - -INSTALLER_BUILDER_OPTIONS =\ - --version-db=versiondb/inkscape.versions\ - $(if $(INKSCAPE_BRANCH), --branch=blinkscape=$(INKSCAPE_FLATTENED_BRANCH),)\ - $(if $(INKSCAPE_BRANCH), --branch=inkscape=trunk,)\ -# - -MAKE += -f inkscape.make - -inkscape: packages - -inkscape-installer: installers -inkscape-installers: installers - -update-versions: - $(PYTHON) gub/versiondb.py --no-sources --version-db=versiondb/inkscape.versions --download --platforms="mingw" --url=http://lilypond.org/blog/janneke/software/inkscape - -print-success: - @echo installer: uploads/inkscape*$(BUILD_PLATFORM).sh - -print-branches: - @echo "--branch=inkscape=$(INKSCAPE_FLATTENED_BRANCH)" diff --git a/patches/boost-1.38.0-freebsd4.patch b/patches/boost-1.38.0-freebsd4.patch deleted file mode 100644 index 4bf0d4de0..000000000 --- a/patches/boost-1.38.0-freebsd4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost-1.38.0/libs/filesystem/src/operations.cpp~ 2009-01-19 15:10:41.000000000 +0100 -+++ boost-1.38.0/libs/filesystem/src/operations.cpp 2009-02-10 16:37:06.000000000 +0100 -@@ -65,7 +65,7 @@ using boost::system::system_category; - - # else // BOOST_POSIX_API - # include --# if !defined(__APPLE__) && !defined(__OpenBSD__) -+# if !defined(__APPLE__) && !defined(__OpenBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ <= 4) - # include - # define BOOST_STATVFS statvfs - # define BOOST_STATVFS_F_FRSIZE vfs.f_frsize diff --git a/patches/inkscape-isfinite.patch b/patches/inkscape-isfinite.patch deleted file mode 100644 index 25fc6ec38..000000000 --- a/patches/inkscape-isfinite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inkscape-trunk-20605/src/2geom/isnan.h~ 2009-02-09 11:54:31.000000000 +0100 -+++ inkscape-trunk-20605/src/2geom/isnan.h 2009-02-11 11:08:32.000000000 +0100 -@@ -93,7 +93,7 @@ - #include - #define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a)) - #else --# define IS_FINITE(_a) (std::isfinite(_a)) -+# define IS_FINITE(_a) (!isinf(_a)) - #endif - /* If the above doesn't work, then try (finite(_a) && !IS_NAN(_a)) or - * (!IS_NAN((_a) - (_a))). diff --git a/patches/inkscape-mingw-DATADIR.h.patch b/patches/inkscape-mingw-DATADIR.h.patch deleted file mode 100644 index 10c50863e..000000000 --- a/patches/inkscape-mingw-DATADIR.h.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- inkscape-trunk-20605/src/prefix.h~ 2009-01-30 13:37:53.000000000 +0100 -+++ inkscape-trunk-20605/src/prefix.h 2009-02-06 14:06:18.000000000 +0100 -@@ -17,6 +17,12 @@ - #ifndef _PREFIX_H_ - #define _PREFIX_H_ - -+#ifdef __MINGW32__ -+#define DATADIR __mingw_DATADIR__ -+#include -+#undef DATADIR -+#endif / * __MINGW32__ */ -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ ---- inkscape-trunk-20605/src/main.cpp~ 2009-01-30 13:37:53.000000000 +0100 -+++ inkscape-trunk-20605/src/main.cpp 2009-02-06 16:06:36.000000000 +0100 -@@ -519,6 +519,9 @@ static int _win32_set_inkscape_env(const - * Add INKSCAPE_EXTENSIONDIR to PYTHONPATH so that extensions in users home - * can find inkex.py et al. (Bug #197475) - */ -+#ifdef __MINGW32__ -+#define DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) -+#endif /* __MINGW32__ */ - static int set_extensions_env() - { - char *oldenv = getenv("PYTHONPATH"); ---- inkscape-trunk-20605/src/extension/init.cpp~ 2009-01-30 13:37:02.000000000 +0100 -+++ inkscape-trunk-20605/src/extension/init.cpp 2009-02-06 17:28:25.000000000 +0100 -@@ -138,6 +138,10 @@ update_pref(Glib::ustring const &pref_pa - } - } - -+#ifdef __MINGW32__ -+#define DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) -+#endif /* __MINGW32__ */ -+ - /** - * Invokes the init routines for internal modules. - * diff --git a/patches/inkscape-mingw.patch b/patches/inkscape-mingw.patch deleted file mode 100644 index 953800025..000000000 --- a/patches/inkscape-mingw.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -purN inkscape-trunk/src/color-profile.cpp.orig inkscape-trunk/src/color-profile.cpp ---- inkscape-trunk/src/color-profile.cpp.orig 2010-06-03 13:54:10.995489100 +0200 -+++ inkscape-trunk/src/color-profile.cpp 2010-06-03 13:54:21.216685738 +0200 -@@ -34,7 +34,7 @@ - #include "dom/util/digest.h" - - #ifdef WIN32 --#include -+#include - #endif // WIN32 - - using Inkscape::ColorProfile; ---- inkscape-trunk-20605/src/ui/dialog/filedialogimpl-win32.cpp~ 2009-01-30 13:37:43.000000000 +0100 -+++ inkscape-trunk-20605/src/ui/dialog/filedialogimpl-win32.cpp 2009-02-06 16:34:10.000000000 +0100 -@@ -1321,10 +1321,10 @@ void FileOpenDialogImplWin32::render_pre - if(_preview_bitmap_image) // Is the image a pixbuf? - { - // Set the transformation -- const Matrix matrix = { -+ const Matrix matrix ( - scaleFactor, 0, - 0, scaleFactor, -- svgX, svgY }; -+ svgX, svgY ); - context->set_matrix (matrix); - - // Render the image ---- inkscape-trunk/src/dialogs/export.cpp~ 2010-06-03 10:48:54.000000000 +0200 -+++ inkscape-trunk/src/dialogs/export.cpp 2010-06-03 14:05:34.054237582 +0200 -@@ -62,7 +62,7 @@ - - #ifdef WIN32 - #include --#include -+#include - #include - #endif - ---- inkscape-trunk/configure.ac~ 2010-06-03 14:06:14.334256081 +0200 -+++ inkscape-trunk/configure.ac 2010-06-03 15:11:42.944239713 +0200 -@@ -261,6 +261,7 @@ case "$host" in - *-*-mingw*) - platform_win32=yes - WIN32_CFLAGS="-mms-bitfields -DLIBXML_STATIC" -+ W32_INKSCAPE_LIBS="-lmscms" - ;; - *) - platform_win32=no -@@ -270,6 +270,7 @@ esac - AC_MSG_RESULT([$platform_win32]) - AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") - AC_SUBST(WIN32_CFLAGS) -+AC_SUBST(W32_INKSCAPE_LIBS) - - AC_MSG_CHECKING([for Solaris platform]) - case "$host" in ---- inkscape-trunk/src/Makefile.am.orig 2010-06-03 16:53:37.974239005 +0200 -+++ inkscape-trunk/src/Makefile.am 2010-06-03 16:54:18.615490866 +0200 -@@ -40,6 +40,7 @@ all_libs = \ - $(FREETYPE_LIBS) \ - $(kdeldadd) \ - $(win32ldflags) \ -+ $(W32_INKSCAPE_LIBS) \ - $(CARBON_LDFLAGS) \ - $(PERL_LIBS) \ - $(PYTHON_LIBS) \ diff --git a/patches/inkscape-round-2.patch b/patches/inkscape-round-2.patch deleted file mode 100644 index dfed03142..000000000 --- a/patches/inkscape-round-2.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- inkscape-trunk-20605/src/ege-adjustment-action.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/ege-adjustment-action.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -62,6 +62,7 @@ - - #include "ege-adjustment-action.h" - -+#include "config.h" - - - static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass ); ---- inkscape-trunk-20605/src/display/pixblock-transform.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/display/pixblock-transform.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -25,6 +25,8 @@ - #include "libnr/nr-pixblock.h" - #include <2geom/matrix.h> - -+#include "config.h" -+ - namespace NR { - - struct RGBA { ---- inkscape-trunk-20605/src/2geom/convex-cover.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/2geom/convex-cover.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -34,6 +34,8 @@ - #include - #include - -+#include "config.h" -+ - /** Todo: - + modify graham scan to work top to bottom, rather than around angles - + intersection diff --git a/patches/inkscape-round.patch b/patches/inkscape-round.patch deleted file mode 100644 index 72a766e7e..000000000 --- a/patches/inkscape-round.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- inkscape-trunk-20605/src/selection-chemistry.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/selection-chemistry.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -91,6 +91,8 @@ - - #include "ui/clipboard.h" - -+#define round(x) (floor (x -0.5)+ 1.0) -+ - using Geom::X; - using Geom::Y; - ---- inkscape-trunk-20605/src/sp-guide.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/sp-guide.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -41,6 +41,8 @@ - #include <2geom/angle.h> - #include "document.h" - -+#define round(x) (floor (x -0.5)+ 1.0) -+ - using std::vector; - - enum { ---- inkscape-trunk-20605/src/ege-adjustment-action.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/ege-adjustment-action.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -62,6 +62,8 @@ - - #include "ege-adjustment-action.h" - -+#define round(x) (floor (x -0.5)+ 1.0) -+ - - - static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass ); ---- inkscape-trunk-20605/src/rubberband.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/rubberband.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -19,6 +19,8 @@ - #include "display/canvas-bpath.h" - #include "display/curve.h" - -+#define round(x) (floor (x -0.5)+ 1.0) -+ - Inkscape::Rubberband *Inkscape::Rubberband::_instance = NULL; - - Inkscape::Rubberband::Rubberband(SPDesktop *dt) ---- inkscape-trunk-20605/src/seltrans.cpp~ 2009-02-09 11:54:42.000000000 +0100 -+++ inkscape-trunk-20605/src/seltrans.cpp 2009-02-11 12:25:25.000000000 +0100 -@@ -19,6 +19,8 @@ - #include <2geom/angle.h> - #include "display/snap-indicator.h" - -+#define round(x) (floor (x -0.5)+ 1.0) -+ - - static void sp_remove_handles(SPKnot *knot[], gint num); - diff --git a/patches/inkscape-wstring.patch b/patches/inkscape-wstring.patch deleted file mode 100644 index 91ec838b6..000000000 --- a/patches/inkscape-wstring.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- inkscape-trunk-20605/src/util/ucompose.hpp~ 2009-02-09 11:54:41.000000000 +0100 -+++ inkscape-trunk-20605/src/util/ucompose.hpp 2009-02-11 11:35:59.000000000 +0100 -@@ -127,7 +127,7 @@ namespace UStringPrivate - { - os << obj; - -- std::wstring str = os.str(); -+ std::string str = os.str(); - - return Glib::convert(std::string(reinterpret_cast(str.data()), - str.size() * sizeof(wchar_t)), -@@ -171,7 +171,7 @@ namespace UStringPrivate - output.insert(pos, rep); - } - -- os.str(std::wstring()); -+ os.str(std::string()); - //os.clear(); - ++arg_no; - } diff --git a/patches/libgc-6.8-freebsd-x86_64.patch b/patches/libgc-6.8-freebsd-x86_64.patch deleted file mode 100644 index 6c735bc26..000000000 --- a/patches/libgc-6.8-freebsd-x86_64.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libgc-0/include/private/gcconfig.h~ 2006-07-07 23:08:05.000000000 +0200 -+++ libgc-0/include/private/gcconfig.h 2009-02-10 09:10:52.000000000 +0100 -@@ -334,6 +334,10 @@ - # define I386 - # define mach_type_known - # endif -+# if defined(FREEBSD) && defined(__x86_64__) -+# define X86_64 -+# define mach_type_known -+# endif - # if defined(__NetBSD__) && (defined(i386) || defined(__i386__)) - # define I386 - # define mach_type_known ---- gc6.8/os_dep.c~ 2006-04-22 01:26:47.000000000 +0200 -+++ gc6.8/os_dep.c 2009-02-10 11:12:11.000000000 +0100 -@@ -84,7 +84,7 @@ - # define NEED_FIND_LIMIT - # endif - --#if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__)) -+#if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__)) - # include - # if !defined(PCR) - # define NEED_FIND_LIMIT -@@ -1392,7 +1392,7 @@ int * etext_addr; - } - # endif - --# if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR) -+# if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR) - /* Its unclear whether this should be identical to the above, or */ - /* whether it should apply to non-X86 architectures. */ - /* For now we don't assume that there is always an empty page after */ diff --git a/patches/libgc-6.8-mingw-pthreads.patch b/patches/libgc-6.8-mingw-pthreads.patch deleted file mode 100644 index 3a1c8ff25..000000000 --- a/patches/libgc-6.8-mingw-pthreads.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- libgc-6.8/configure.in~ 2006-06-07 07:01:52.000000000 +0200 -+++ libgc-6.8/configure.in 2011-01-29 11:50:21.967211128 +0100 -@@ -143,6 +143,10 @@ case "$THREADS" in - *-*-cygwin*) - AC_DEFINE(GC_WIN32_THREADS) - ;; -+ *-*-mingw*) -+ AC_DEFINE(GC_WIN32_THREADS) -+ AC_DEFINE(THREAD_LOCAL_ALLOC) -+ ;; - *-*-darwin*) - AC_DEFINE(GC_DARWIN_THREADS) - AC_DEFINE(THREAD_LOCAL_ALLOC) ---- libgc-6.8/include/gc_pthread_redirects.h~ 2006-02-17 05:07:29.000000000 +0100 -+++ libgc-6.8/include/gc_pthread_redirects.h 2011-01-29 11:17:25.303026857 +0100 -@@ -48,7 +48,8 @@ - /* We treat these similarly. */ - # include - # include -- -+# define _PID_T_ -+# include - int GC_pthread_create(pthread_t *new_thread, - const pthread_attr_t *attr, - void *(*start_routine)(void *), void *arg); ---- libgc-6.8/mark_rts.c~ 2005-02-01 20:05:05.000000000 +0100 -+++ libgc-6.8/mark_rts.c 2011-01-29 12:29:41.444915320 +0100 -@@ -618,7 +618,7 @@ ptr_t cold_gc_frame; - /* If the world is not stopped, this is unsafe. It is */ - /* also unnecessary, since we will do this again with the */ - /* world stopped. */ --# ifdef THREAD_LOCAL_ALLOC -+# if defined (THREAD_LOCAL_ALLOC) && !defined(GC_WIN32_THREADS) - if (GC_world_stopped) GC_mark_thread_local_free_lists(); - # endif - ---- libgc-6.8/misc.c~ 2006-02-10 20:38:46.000000000 +0100 -+++ libgc-6.8/misc.c 2011-01-29 12:28:31.187195541 +0100 -@@ -498,7 +498,7 @@ void GC_init() - UNLOCK(); - ENABLE_SIGNALS(); - --# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC) -+#if (defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)) && !defined(GC_WIN32_THREADS) - /* Make sure marker threads and started and thread local */ - /* allocation is initialized, in case we didn't get */ - /* called from GC_init_parallel(); */ diff --git a/patches/popt-no-sys-ioctl.patch b/patches/popt-no-sys-ioctl.patch deleted file mode 100644 index abd859696..000000000 --- a/patches/popt-no-sys-ioctl.patch +++ /dev/null @@ -1,14 +0,0 @@ - i686-mingw32-gcc -mwindows -mms-bitfields -DHAVE_CONFIG_H -I. -I/home/janneke/vc/gub/target/mingw/src/popt-1.14 -I. -I/home/janneke/vc/gub/target/mingw/src/popt-1.14 -Wall -W -D_GNU_SOURCE -D_REENTRANT -g -O2 -MT popthelp.lo -MD -MP -MF .deps/popthelp.Tpo -c /home/janneke/vc/gub/target/mingw/src/popt-1.14/popthelp.c -DDLL_EXPORT -DPIC -o .libs/popthelp.o -/home/janneke/vc/gub/target/mingw/src/popt-1.14/popthelp.c:15:23: error: sys/ioctl.h: No such file or directory - ---- popt-1.14/popthelp.c~ 2008-03-27 18:33:08.000000000 +0100 -+++ popt-1.14/popthelp.c 2009-02-05 10:04:11.000000000 +0100 -@@ -10,7 +10,7 @@ - - #include "system.h" - --#define POPT_USE_TIOCGWINSZ -+#undef POPT_USE_TIOCGWINSZ - #ifdef POPT_USE_TIOCGWINSZ - #include - #endif diff --git a/patches/popt-no-wchar-hack.patch b/patches/popt-no-wchar-hack.patch deleted file mode 100644 index 024e8f7e5..000000000 --- a/patches/popt-no-wchar-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- popt-1.14/popthelp.c~ 2008-03-27 18:33:08.000000000 +0100 -+++ popt-1.14/popthelp.c 2009-02-11 09:14:40.000000000 +0100 -@@ -15,7 +15,7 @@ - #include - #endif - --#define POPT_WCHAR_HACK -+#undef POPT_WCHAR_HACK - #ifdef POPT_WCHAR_HACK - #include /* for mbsrtowcs */ - /*@access mbstate_t @*/ diff --git a/web/applications.html b/web/applications.html index 2ac64c3fa..1f708b1ed 100644 --- a/web/applications.html +++ b/web/applications.html @@ -28,7 +28,6 @@

Applications

Installer packages

GNU Denemo
- Inkscape
GNU LilyPond

GUB Build specifications

@@ -43,11 +42,8 @@

GUB Build specifications

gub/specs/bash.py
gub/specs/binutils.py
gub/specs/bison.py
- gub/specs/boost-jam.py
- gub/specs/boost.py
gub/specs/busybox.py
gub/specs/bzip2.py
- gub/specs/cairomm.py
gub/specs/cairo.py
gub/specs/cmake.py
gub/specs/coreutils.py
@@ -96,8 +92,6 @@

GUB Build specifications

gub/specs/gmp.py
gub/specs/g++.py
gub/specs/grep.py
- gub/specs/gsl.py
- gub/specs/gtkmm.py
gub/specs/gtk+.py
gub/specs/gub-utils.py
gub/specs/guile-config.py
@@ -107,15 +101,12 @@

GUB Build specifications

gub/specs/icoutils.py
gub/specs/imagemagick.py
gub/specs/__init__.py
- gub/specs/inkscape-installer.py
- gub/specs/inkscape.py
gub/specs/inputproto.py
gub/specs/intltool.py
gub/specs/jack.py
gub/specs/jade.py
gub/specs/kbproto.py
gub/specs/lash.py
- gub/specs/lcms.py
gub/specs/libapr.py
gub/specs/libapr-util.py
gub/specs/libaubio.py
@@ -123,7 +114,6 @@

GUB Build specifications

gub/specs/libdbi.py
gub/specs/libexif.py
gub/specs/libfftw.py
- gub/specs/libgc.py
gub/specs/libgcrypt.py
gub/specs/libgd.py
gub/specs/libgnugetopt.py
@@ -154,7 +144,6 @@

GUB Build specifications

gub/specs/libxml2.py
gub/specs/libxml++.py
gub/specs/libxrender.py
- gub/specs/libxslt.py
gub/specs/lilypad.py
gub/specs/lilypondcairo.py
gub/specs/lilypond-doc.py
@@ -175,7 +164,6 @@

GUB Build specifications

gub/specs/nsis.py
gub/specs/osx-lilypad.py
gub/specs/pangocairo.py
- gub/specs/pangomm.py
gub/specs/pango.py
gub/specs/patch.py
gub/specs/perl-extutils-makemaker.py
@@ -185,7 +173,6 @@

GUB Build specifications

gub/specs/pjproject.py
gub/specs/pkg-config.py
gub/specs/poppler.py
- gub/specs/popt.py
gub/specs/portaudio.py
gub/specs/psmisc.py
gub/specs/pthreads-w32.py
diff --git a/web/history.html b/web/history.html index aa1a2430a..78ad78c19 100644 --- a/web/history.html +++ b/web/history.html @@ -89,7 +89,7 @@

HISTORY

GUB3, adding cross-platform build dependencies and patches for an OpenOffice.org MinGW cross build, including all essential libraries. Later, - Inkscape is added, exploring and + Inkscape is added, exploring and implementing x.org dependencies. After that, building a windows installer for GNU Denemo took only one day, including all dependencies. diff --git a/web/index.html b/web/index.html index 1e57166e3..8f23c33eb 100644 --- a/web/index.html +++ b/web/index.html @@ -73,7 +73,6 @@

BUGS

Supported installer packages

GNU Denemo
-Inkscape
GNU LilyPond
with all essential dependencies. Currently, 207 package build @@ -175,12 +174,6 @@

Examples

this leaves the installer in uploads/ - * Build Inkscape for your platform - - bin/gub inkscape-installer - - this leaves the installer in uploads/ - * Cross build Denemo (http://denemo.org) for Windows (mingw32) make denemo diff --git a/web/inkscape.html b/web/inkscape.html deleted file mode 100644 index 41900166e..000000000 --- a/web/inkscape.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - GUB -- Inkscape - - -

GUB -- Inkscape

- -

INSTALLING

- -

Optional: Prepare build environment

- -
-  make -f inkscape.make bootstrap
-
- -

Build everything

- -
-  make inkscape
-
- -this leaves installers in uploads/ - -

More examples

- -
-  * Build all Inkscape installers
-
-      make inkscape
- 
-    this leaves installers for GNU/Linux (x86, x86_64, powerpc),
-    FreeBSD (x86, x86_64) and Windows, and documentation in uploads/
-
-    OR (old style)
-
-      bin/gub inkscape
-      bin/gib inkscape --branch=inkscape=trunk inkscape
-
- - - - -