Commit 9c7ea8e7 authored by Georges Khaznadar's avatar Georges Khaznadar

modifications for version 3.10.0

parent 4e350e4e
supercollider (1:3.10.0+repack-1) unstable; urgency=medium
* upgraded to the newest upstream source
* refreshed quilt patches
* added a new patch to fix an error in upstream code
(file server/supernova/utilities/time_tag.hp): the result
of get_nanoseconds() had to be type-casted to long.
Closes: #914640
* added build-dependencies on qtwebengine5-dev, libqt5websockets5-dev,
libqt5svg5-dev
* delete quilt patch 'supernova-i686-march-flag.patch', which defeats
the configuration step.
* modified the path to a documentation file for installation
* modified emacsen configuration files to fit the patterns found
with ELPA. This prevents the installation with xemacs and emacs <= 23.
Closes: #916858
* expanded Files-Excluded with 'HelpSource/lib/*.min.js' in d/copyright
* added install overrides to create symlinks for
- HelpSource/lib/codemirror-5.39.2.min.js
- HelpSource/lib/codemirror-addon-simple-5.39.2.min.js
- HelpSource/lib/jquery.min.js
-- Georges Khaznadar <georgesk@debian.org> Mon, 24 Dec 2018 16:31:59 +0100
supercollider (1:3.9.3+repack-1) UNPUBLISHED; urgency=medium
* upgraded to the newest upstream source
* modified the watch file to add the suffix +repack instead of -repack
so the deb release is not lesser than the upstream package, which
might be misleading
* updated debian patches; two of them are refreshed (fuzzy patching
was successful), the others deletes since they were already integrated
upstream.
* modified d/supercollider-vim.install since the only stuff related to
vim is built under editors/, and much of the files installed in the
previous debian release are missing from the build tree; this results
probably in a useless package for supercollider-vim.
* disabled the use of ccache by patching CMakeLists.txt; this has no
backdraw for debuilding since the compilation is done only once.
-- Georges Khaznadar <georgesk@debian.org> Sun, 21 Oct 2018 21:15:07 +0200
supercollider (1:3.8.0~repack-2) unstable; urgency=medium
* Demote Depends of supercollider-language on supercollider-server to a Recommends.
......@@ -458,7 +500,7 @@ supercollider (20051211-1) unstable; urgency=low
* Prevent byte-compilation for xemacs (closes: #338169, #342358)
* sclang is now to be compiled only on supported platforms
(closes: #276212, #290339)
* 10fix_emacs_help.dpatch: fix path for Help
* 10fix_emacs_help.dpatch: fix path for Help
-- Paul Brossier <piem@debian.org> Mon, 12 Dec 2005 10:12:21 +0000
......@@ -560,7 +602,7 @@ supercollider (040926-3) unstable; urgency=low
supercollider (040926-2) unstable; urgency=low
* Asked for supercollider to be added to Packages-arch-specific
* Asked for supercollider to be added to Packages-arch-specific
and for the 64-bit arch to be removed from archive (see: #276212)
* Back to Architecture: any in debian/control (closes: #274240)
......@@ -634,16 +676,16 @@ supercollider (040709-1) unstable; urgency=low
* Updated README.Debian
* Completed supercollider.desktop entries
* Cvs update
* Added workaround 'cd SC_SYNTHDEF_PATH' to both wrapper
* Added workaround 'cd SC_SYNTHDEF_PATH' to both wrapper
-- Paul Brossier <piem@altern.org> Mon, 12 Jul 2004 18:40:06 +0100
supercollider (040513-2) unstable; urgency=low
* Fixed clz.h (thanks again Guenter)
* Fixed clz.h (thanks again Guenter)
* added missing build deps (thanks G.Geiger)
* fixed sclang.wrapper
-- Paul Brossier <piem@altern.org> Tue, 8 Jun 2004 17:04:06 +0100
supercollider (040513-1) unstable; urgency=low
......
Source: supercollider
Section: sound
Priority: optional
Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/supercollider.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/supercollider.git
Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Vcs-Git: https://salsa.debian.org/multimedia-team/supercollider.git
Vcs-Browser: https://salsa.debian.org/multimedia-team/supercollider
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Uploaders: Alexandre Quessy <alexandre@quessy.net>,
Dan Stowell <danstowell@users.sourceforge.net>,
Felipe Sateler <fsateler@debian.org>
......@@ -30,6 +30,9 @@ Build-Depends:
qtdeclarative5-dev,
libqt5opengl5-dev,
libqt5webkit5-dev,
qtwebengine5-dev,
libqt5websockets5-dev,
libqt5svg5-dev,
qtpositioning5-dev,
libqt5sensors5-dev,
libboost-dev (>= 1.57),
......
......@@ -10,12 +10,12 @@ Bug-Debian: https://bugs.debian.org/878347
CMakeLists.txt | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f42ed30..615e52a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,21 +318,6 @@ if(MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign -fno-strict-aliasing")
Index: supercollider/CMakeLists.txt
===================================================================
--- supercollider.orig/CMakeLists.txt
+++ supercollider/CMakeLists.txt
@@ -355,21 +355,6 @@ elseif(MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
endif()
-# support for building on Raspberry Pi 1/2/3 and BBB
......
disabled the use of ccache, to prevent FTBFS; as the compilation is done once
it has no backdraws to make the debian package.
Index: supercollider/CMakeLists.txt
===================================================================
--- supercollider.orig/CMakeLists.txt
+++ supercollider/CMakeLists.txt
@@ -150,12 +150,13 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON
#############################################
# Detect CCache
-find_program(CCacheExectuable ccache)
-if( CCacheExectuable )
- # only used with >=cmake-3.4
- set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" )
- set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
-endif()
+## disable the usage of ccache for debian build
+## find_program(CCacheExecutable ccache)
+## if( CCacheExecutable )
+## # only used with >=cmake-3.4
+## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" )
+## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" )
+## endif()
#############################################
# Options
fixed a type inconsistency: forced the result of get_nanoseconds() to
double before the division by 1000.
Index: supercollider/server/supernova/utilities/time_tag.hpp
===================================================================
--- supercollider.orig/server/supernova/utilities/time_tag.hpp
+++ supercollider/server/supernova/utilities/time_tag.hpp
@@ -229,7 +229,7 @@ public:
#ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
#else
- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
+ time_duration offset = seconds(get_secs() - ntp_offset) + microseconds((long) get_nanoseconds()/1000);
#endif
return ptime(base, offset);
}
supernova-i686-march-flag.patch
Disable-128bit-float-constants.patch
adding-functional-header-in-PyrSerialPrim.cpp.patch
DiskIO_UGens-include-functional.patch
PyrSched.cpp-include-functional-to-fix-FTBFS.patch
Remove-autodetection-of-raspberry-cpus.patch
disable-ccache.patch
fix-numeric-type.patch
......@@ -6,11 +6,11 @@ Subject: Fix supernova build on x86
server/supernova/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
index c71a8dd..fda7d1d 100644
--- a/server/supernova/CMakeLists.txt
+++ b/server/supernova/CMakeLists.txt
@@ -149,6 +149,10 @@ else()
Index: supercollider/server/supernova/CMakeLists.txt
===================================================================
--- supercollider.orig/server/supernova/CMakeLists.txt
+++ supercollider/server/supernova/CMakeLists.txt
@@ -155,6 +155,10 @@ else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
endif()
......
......@@ -51,6 +51,9 @@ override_dh_auto_install:
# this needs to be an absolute not relative softlink,
# because supercollider copies it around. hence not using dh_link for this.
ln -sf /usr/share/javascript/prettify/prettify.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/prettify.js
ln -sf /usr/share/javascript/codemirror/codemirror.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-5.39.2.min.js
ln -sf /usr/share/javascript/codemirror/addon/mode/simple.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/codemirror-addon-simple-5.39.2.min.js
ln -sf /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/lib/jquery.min.js
install -d $(CURDIR)/debian/tmp/usr/share/applications
install -m 644 debian/scel.desktop $(CURDIR)/debian/tmp/usr/share/applications
install -m 644 debian/scvim.desktop $(CURDIR)/debian/tmp/usr/share/applications
......
editors/scel/README.md
editors/sc-el/README.md
......@@ -8,38 +8,51 @@
FLAVOR=$1
PACKAGE=SuperCollider
if [ ${FLAVOR} = emacs ]; then exit 0; fi
echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
#FLAVORTEST=`echo $FLAVOR | cut -c-6`
#if [ ${FLAVORTEST} = xemacs ] ; then
# SITEFLAG="-no-site-file"
#else
# SITEFLAG="--no-site-file"
#fi
FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
fi
install -m 755 -d ${ELCDIR}
cd ${ELDIR}
FILES=`echo *.el`
cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
cat << EOF > path.el
case $FLAVOR in
emacs)
exit 0
;;
emacs2[0123]*)
echo install/${PACKAGE}: Skipping obsolete emacs ${FLAVOR}
exit 0
;;
xemacs*)
echo install/${PACKAGE}: Skipping unsupported emacs ${FLAVOR}
exit 0
;;
*)
echo install/${PACKAGE}: Handling install of emacsen flavor ${FLAVOR}
#FLAVORTEST=`echo $FLAVOR | cut -c-6`
#if [ ${FLAVORTEST} = xemacs ] ; then
# SITEFLAG="-no-site-file"
#else
# SITEFLAG="--no-site-file"
#fi
FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
fi
install -m 755 -d ${ELCDIR}
cd ${ELDIR}
FILES=`echo *.el`
cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
cat << EOF > path.el
(setq load-path (cons "." load-path) byte-compile-warnings nil)
EOF
${FLAVOR} ${FLAGS} ${FILES}
rm -f *.el path.el
${FLAVOR} ${FLAGS} ${FILES}
rm -f *.el path.el
exit 0
esac
exit 0
......@@ -4,12 +4,25 @@
FLAVOR=$1
PACKAGE=SuperCollider
if [ ${FLAVOR} != emacs ]; then
if test -x /usr/sbin/install-info-altdir; then
echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/supercollider.info.gz
fi
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
fi
case $FLAVOR in
emacs)
exit 0
;;
emacs2[0123]*)
echo remove/${PACKAGE}: Skipping obsolete emacs ${FLAVOUR}
exit 0
;;
xemacs*)
echo remove/${PACKAGE}: Skipping unsupported emacs ${FLAVOUR}
exit 0
;;
*)
if test -x /usr/sbin/install-info-altdir; then
echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/supercollider.info.gz
fi
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
esac
editors/scvim/README.md
editors/scvim/SCVim.scd
#editors/scvim/SCVim.scd
usr/bin/sclangpipe_app
usr/bin/scvim
usr/share/vim
usr/share/scvim
usr/share/SuperCollider/Extensions/scvim
#usr/bin/sclangpipe_app
#usr/bin/scvim
#usr/share/vim
#usr/share/scvim
#usr/share/SuperCollider/Extensions/scvim
#debian/supercollider-vim.yaml usr/share/vim/registry/
usr/share/applications/scvim.desktop
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment