[SCM] supercollider/master: removing scons patches (no longer using scons)
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Sat Apr 7 15:20:57 UTC 2012
The following commit has been merged in the master branch:
commit 267335a6f5098b9bcde93673afb9c900e1b39e44
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Sat Apr 7 13:38:36 2012 +0100
removing scons patches (no longer using scons)
diff --git a/debian/patches/02_disable_elisp_compilation.diff b/debian/patches/02_disable_elisp_compilation.diff
deleted file mode 100644
index 7bb5b46..0000000
--- a/debian/patches/02_disable_elisp_compilation.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Do not byte compile .el files
- debian byte compiles at package install time but that cannot be relied
- upon in other systems.
-Forwarded: not-needed
-Author: Артём Попов <artfwo at gmail.com>
-Last-Update: 2011-06-11
---- a/common/SConstruct
-+++ b/common/SConstruct
-@@ -1273,10 +1273,10 @@
- 'sed \'s, at PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
- pkg_data_dir(FINAL_PREFIX))
- el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
-- elc_files = map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
-+ elc_files = [] #map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
- elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
-- env.Command(elc_files, el_files,
-- 'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
-+ #env.Command(elc_files, el_files,
-+ # 'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
- env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
- installEnv.Append(DATA = 'install-elisp')
-
diff --git a/debian/patches/03_fix_elisp_install_path.diff b/debian/patches/03_fix_elisp_install_path.diff
deleted file mode 100644
index c62c79a..0000000
--- a/debian/patches/03_fix_elisp_install_path.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Install elisp files into a package-specific subdir.
-Forwarded: no
-Author: Артём Попов <artfwo at gmail.com>
-Last-Update: 2011-06-11
---- a/common/SConstruct
-+++ b/common/SConstruct
-@@ -1274,7 +1274,7 @@
- pkg_data_dir(FINAL_PREFIX))
- el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
- elc_files = [] #map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
-- elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
-+ elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp', 'supercollider')
- #env.Command(elc_files, el_files,
- # 'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
- env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
diff --git a/debian/patches/06_deb_scvim.diff b/debian/patches/06_deb_scvim.diff
deleted file mode 100644
index ac653df..0000000
--- a/debian/patches/06_deb_scvim.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Do not build help at build time
- It will be built at first run.
-Forwarded: no
-Last-Update: 2011-06-11
---- a/editors/scvim/SConstruct
-+++ b/editors/scvim/SConstruct
-@@ -91,18 +91,18 @@
- DEFAULT_SC_HELP, PathOption.PathIsDir))
-
- #create our enviroment, with our options and custom builders
--env = Environment(options = opts, BUILDERS = {'BuildHelp' : build_help})
-+env = Environment(options = opts)
-
-
- #generate the help options
- Help(opts.GenerateHelpText(env))
-
- #XXX how do we test for vim?
--if not env.GetOption('clean'):
-- #test for the ruby
-- if os.system("ruby -e exit") != 0:
-- print "error: scvim depends on ruby and the ruby executable is not in your path"
-- Exit(1)
-+#if not env.GetOption('clean'):
-+# #test for the ruby
-+# if os.system("ruby -e exit") != 0:
-+# print "error: scvim depends on ruby and the ruby executable is not in your path"
-+# Exit(1)
-
- #get our variables from the options
- PREFIX = env.get('PREFIX')
-@@ -124,10 +124,10 @@
- )
-
- install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
--build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
-- source = Dir(SUPERCOLLIDER_HELP_DIR)))
-+#build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
-+# source = Dir(SUPERCOLLIDER_HELP_DIR)))
- AlwaysBuild(Dir(DOC_DIR))
--Depends(build_help, install_doc)
-+#Depends(build_help, install_doc)
-
- install_bin = env.Alias('install-bin',
- install_dir(env, 'bin', bin_dir(PREFIX), ANY_FILE_RE, 1))
-@@ -142,7 +142,7 @@
- env.Alias('install-all', [
- install_bin,
- install_vimfiles,
-- install_doc,
-+# install_doc,
- install_rc,
- install_classes])
-
diff --git a/debian/patches/07_deb_sced.diff b/debian/patches/07_deb_sced.diff
deleted file mode 100644
index 9c5396a..0000000
--- a/debian/patches/07_deb_sced.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Do not update mime database at build
-Forwarded: no
-Author: Артём Попов <artfwo at gmail.com>
-Last-Update: 2011-06-11
---- a/editors/sced/SConstruct
-+++ b/editors/sced/SConstruct
-@@ -123,7 +123,7 @@
- update_mime = Builder(action =
- 'update-mime-database ' + os.path.join( share_dir(PREFIX), 'mime/packages' ) )
-
--env.BUILDERS = update_mime
-+#env.BUILDERS = update_mime
-
- #install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
- #build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
diff --git a/debian/patches/10_fix_rpath.diff b/debian/patches/10_fix_rpath.diff
deleted file mode 100644
index b43eec6..0000000
--- a/debian/patches/10_fix_rpath.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Do not set rpath on binaries
-Author: Артём Попов <artfwo at gmail.com>
-Forwarded: no
-Last-Update: 2011-06-11
---- a/common/SConstruct
-+++ b/common/SConstruct
-@@ -789,7 +789,7 @@
- elif PLATFORM == 'linux':
- serverEnv.Append(
- CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
-- LINKFLAGS = ['-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
-+ LINKFLAGS = ['-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
-
- elif PLATFORM == 'freebsd':
- serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
-@@ -1042,12 +1042,12 @@
- CPPPATH = ['#include/icu/unicode'])
- elif PLATFORM == 'linux':
- langEnv.Append(
-- LINKFLAGS = ['-Wl,-rpath,build', '-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
-+ LINKFLAGS = ['-Wl,-rpath-link,build', '-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
-
-
- elif PLATFORM == 'freebsd':
- langEnv.Append(
-- LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
-+ LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
-
- libsclangEnv = langEnv.Clone(
- PKGCONFIG_NAME = 'libsclang',
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5120d95..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-02_disable_elisp_compilation.diff
-03_fix_elisp_install_path.diff
-06_deb_scvim.diff
-07_deb_sced.diff
-10_fix_rpath.diff
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list