From d3b3d5498c84cf07728d6c21de63b3eaeb4b2714 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 20 Jan 2020 11:14:04 +0000 Subject: [PATCH] Move all custom build patches into a single folder --- data/linux/build-pyqt.sh | 3 +- data/macos/build-deps-new.sh | 4 +- data/macos/build-deps.sh | 14 ++--- data/{linux => }/patches/cxfreeze-py37.patch | 0 .../patches/glib_skip-gettext.patch | 0 .../patches/pyliblo-python3.7.patch | 0 .../{macos => }/patches/qt55-newosx-fix.patch | 0 .../patches/qt56-cpp98-compat.patch | 0 .../patches/qt59-osx10.8-compat.patch | 0 .../patches/qt59-osx10.8-compat2.patch | 0 .../patches/qt59-osx10.8-compat3.patch | 0 data/windows/build-deps.sh | 4 +- data/windows/build-pyqt.sh | 2 +- .../fluidsynth-skip-drivers-build.patch | 60 ------------------- data/windows/patches/glib_skip-gettext.patch | 25 -------- data/windows/patches/pyliblo-python3.7.patch | 55 ----------------- 16 files changed, 13 insertions(+), 154 deletions(-) rename data/{linux => }/patches/cxfreeze-py37.patch (100%) rename data/{macos => }/patches/glib_skip-gettext.patch (100%) rename data/{macos => }/patches/pyliblo-python3.7.patch (100%) rename data/{macos => }/patches/qt55-newosx-fix.patch (100%) rename data/{macos => }/patches/qt56-cpp98-compat.patch (100%) rename data/{macos => }/patches/qt59-osx10.8-compat.patch (100%) rename data/{macos => }/patches/qt59-osx10.8-compat2.patch (100%) rename data/{macos => }/patches/qt59-osx10.8-compat3.patch (100%) delete mode 100644 data/windows/patches/fluidsynth-skip-drivers-build.patch delete mode 100644 data/windows/patches/glib_skip-gettext.patch delete mode 100644 data/windows/patches/pyliblo-python3.7.patch diff --git a/data/linux/build-pyqt.sh b/data/linux/build-pyqt.sh index 647735bd6..ab76c49b5 100755 --- a/data/linux/build-pyqt.sh +++ b/data/linux/build-pyqt.sh @@ -129,8 +129,7 @@ fi if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then cd pyliblo-${PYLIBLO_VERSION} if [ ! -f patched ]; then - ls ../../macos/patches - patch -p1 -i ../../macos/patches/pyliblo-python3.7.patch + patch -p1 -i ../../patches/pyliblo-python3.7.patch touch patched fi export CFLAGS="${CFLAGS} -I${PREFIX}/include -L${PREFIX}/lib" diff --git a/data/macos/build-deps-new.sh b/data/macos/build-deps-new.sh index 58a1bf95a..f7603a95a 100755 --- a/data/macos/build-deps-new.sh +++ b/data/macos/build-deps-new.sh @@ -239,7 +239,7 @@ fi if [ ! -f glib-${GLIB_VERSION}/build-done ]; then cd glib-${GLIB_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/glib_skip-gettext.patch + patch -p1 -i ../../patches/glib_skip-gettext.patch rm m4macros/glib-gettext.m4 touch patched fi @@ -499,7 +499,7 @@ fi if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then cd pyliblo-${PYLIBLO_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/pyliblo-python3.7.patch + patch -p1 -i ../../patches/pyliblo-python3.7.patch touch patched fi env CFLAGS="${CFLAGS} -I${TARGETDIR}/carla64/include" LDFLAGS="${LDFLAGS} -L${TARGETDIR}/carla64/lib" \ diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh index 6e24832e6..04ae5c62d 100755 --- a/data/macos/build-deps.sh +++ b/data/macos/build-deps.sh @@ -238,7 +238,7 @@ fi if [ ! -f glib-${GLIB_VERSION}/build-done ]; then cd glib-${GLIB_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/glib_skip-gettext.patch + patch -p1 -i ../../patches/glib_skip-gettext.patch rm m4macros/glib-gettext.m4 touch patched fi @@ -376,11 +376,11 @@ if [ ! -f qtbase-opensource-src-${QT5_VERSION}/build-done ]; then #sed -i -e "s|AWK=.*|AWK=/opt/local/bin/gawk|" configure #sed -i -e "s|/usr/bin/xcrun -find xcrun|true|" configure #sed -i -e "s|/usr/bin/xcrun -find xcrun|echo hello|" mkspecs/features/mac/default_pre.prf - #patch -p1 -i ../patches/qt55-newosx-fix.patch - #patch -p1 -i ../patches/qt56-cpp98-compat.patch - patch -p1 -i ../patches/qt59-osx10.8-compat.patch - patch -p1 -i ../patches/qt59-osx10.8-compat2.patch - patch -p1 -i ../patches/qt59-osx10.8-compat3.patch + #patch -p1 -i ../../patches/qt55-newosx-fix.patch + #patch -p1 -i ../../patches/qt56-cpp98-compat.patch + patch -p1 -i ../../patches/qt59-osx10.8-compat.patch + patch -p1 -i ../../patches/qt59-osx10.8-compat2.patch + patch -p1 -i ../../patches/qt59-osx10.8-compat3.patch sed -i -e "s/10.10/10.8/" mkspecs/macx-clang/qmake.conf sed -i -e "s/ --sdk \$sdk / /" configure sed -i -e "s/ --sdk \$\$sdk / /" mkspecs/features/mac/sdk.prf @@ -554,7 +554,7 @@ fi if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then cd pyliblo-${PYLIBLO_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/pyliblo-python3.7.patch + patch -p1 -i ../../patches/pyliblo-python3.7.patch touch patched fi env CFLAGS="${CFLAGS} -I${TARGETDIR}/carla64/include" LDFLAGS="${LDFLAGS} -L${TARGETDIR}/carla64/lib" \ diff --git a/data/linux/patches/cxfreeze-py37.patch b/data/patches/cxfreeze-py37.patch similarity index 100% rename from data/linux/patches/cxfreeze-py37.patch rename to data/patches/cxfreeze-py37.patch diff --git a/data/macos/patches/glib_skip-gettext.patch b/data/patches/glib_skip-gettext.patch similarity index 100% rename from data/macos/patches/glib_skip-gettext.patch rename to data/patches/glib_skip-gettext.patch diff --git a/data/macos/patches/pyliblo-python3.7.patch b/data/patches/pyliblo-python3.7.patch similarity index 100% rename from data/macos/patches/pyliblo-python3.7.patch rename to data/patches/pyliblo-python3.7.patch diff --git a/data/macos/patches/qt55-newosx-fix.patch b/data/patches/qt55-newosx-fix.patch similarity index 100% rename from data/macos/patches/qt55-newosx-fix.patch rename to data/patches/qt55-newosx-fix.patch diff --git a/data/macos/patches/qt56-cpp98-compat.patch b/data/patches/qt56-cpp98-compat.patch similarity index 100% rename from data/macos/patches/qt56-cpp98-compat.patch rename to data/patches/qt56-cpp98-compat.patch diff --git a/data/macos/patches/qt59-osx10.8-compat.patch b/data/patches/qt59-osx10.8-compat.patch similarity index 100% rename from data/macos/patches/qt59-osx10.8-compat.patch rename to data/patches/qt59-osx10.8-compat.patch diff --git a/data/macos/patches/qt59-osx10.8-compat2.patch b/data/patches/qt59-osx10.8-compat2.patch similarity index 100% rename from data/macos/patches/qt59-osx10.8-compat2.patch rename to data/patches/qt59-osx10.8-compat2.patch diff --git a/data/macos/patches/qt59-osx10.8-compat3.patch b/data/patches/qt59-osx10.8-compat3.patch similarity index 100% rename from data/macos/patches/qt59-osx10.8-compat3.patch rename to data/patches/qt59-osx10.8-compat3.patch diff --git a/data/windows/build-deps.sh b/data/windows/build-deps.sh index 1a82ae8bd..7472e1cc4 100755 --- a/data/windows/build-deps.sh +++ b/data/windows/build-deps.sh @@ -256,7 +256,7 @@ fi if [ ! -f glib-${GLIB_VERSION}/build-done ]; then cd glib-${GLIB_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/glib_skip-gettext.patch + patch -p1 -i ../../patches/glib_skip-gettext.patch sed -i "s|po docs|po|" Makefile.in touch patched fi @@ -282,7 +282,7 @@ fi if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then cd fluidsynth-${FLUIDSYNTH_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/fluidsynth-skip-drivers-build.patch + patch -p1 -i ../../patches/fluidsynth-skip-drivers-build.patch touch patched fi cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_SHARED_LIBS=OFF \ diff --git a/data/windows/build-pyqt.sh b/data/windows/build-pyqt.sh index c2aab433b..b52b3500e 100755 --- a/data/windows/build-pyqt.sh +++ b/data/windows/build-pyqt.sh @@ -209,7 +209,7 @@ fi if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then cd pyliblo-${PYLIBLO_VERSION} if [ ! -f patched ]; then - patch -p1 -i ../patches/pyliblo-python3.7.patch + patch -p1 -i ../../patches/pyliblo-python3.7.patch touch patched fi mkdir -p build diff --git a/data/windows/patches/fluidsynth-skip-drivers-build.patch b/data/windows/patches/fluidsynth-skip-drivers-build.patch deleted file mode 100644 index 2e433268f..000000000 --- a/data/windows/patches/fluidsynth-skip-drivers-build.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- fluidsynth-static-1.1.11.orig/src/CMakeLists.txt -+++ fluidsynth-static-1.1.11/src/CMakeLists.txt -@@ -175,11 +175,6 @@ set ( libfluidsynth_SOURCES - midi/fluid_midi_router.h - midi/fluid_seqbind.c - midi/fluid_seq.c -- drivers/fluid_adriver.c -- drivers/fluid_adriver.h -- drivers/fluid_mdriver.c -- drivers/fluid_mdriver.h -- drivers/fluid_aufile.c - bindings/fluid_cmd.c - bindings/fluid_cmd.h - bindings/fluid_filerenderer.c -@@ -335,32 +330,14 @@ target_link_libraries ( libfluidsynth - ${LIBFLUID_LIBS} - ) - --# ************ CLI program ************ -- --set ( fluidsynth_SOURCES fluidsynth.c ) -- --add_executable ( fluidsynth -- ${fluidsynth_SOURCES} --) -- --if ( FLUID_CPPFLAGS ) -- set_target_properties ( fluidsynth -- PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} ) --endif ( FLUID_CPPFLAGS ) -- --target_link_libraries ( fluidsynth -- libfluidsynth -- ${FLUID_LIBS} --) -- - if ( MACOSX_FRAMEWORK ) -- install ( TARGETS fluidsynth libfluidsynth -+ install ( TARGETS libfluidsynth - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - ARCHIVE DESTINATION ${FRAMEWORK_INSTALL_DIR} - ) - else ( MACOSX_FRAMEWORK ) -- install ( TARGETS fluidsynth libfluidsynth -+ install ( TARGETS libfluidsynth - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ---- fluidsynth-static-1.1.11.orig/src/utils/fluid_settings.c -+++ fluidsynth-static-1.1.11/src/utils/fluid_settings.c -@@ -297,8 +297,6 @@ fluid_settings_init(fluid_settings_t* se - fluid_shell_settings(settings); - fluid_player_settings(settings); - fluid_file_renderer_settings(settings); -- fluid_audio_driver_settings(settings); -- fluid_midi_driver_settings(settings); - } - - static int diff --git a/data/windows/patches/glib_skip-gettext.patch b/data/windows/patches/glib_skip-gettext.patch deleted file mode 100644 index e3e404c87..000000000 --- a/data/windows/patches/glib_skip-gettext.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- glib-2.22.4/configure.in 2010-01-07 01:19:11.000000000 +0100 -+++ glib-2.22.4.new/configure.in 2010-03-06 13:21:18.461943187 +0100 -@@ -465,13 +465,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/L - AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) - GLIB_GNU_GETTEXT - --if test "$gt_cv_have_gettext" != "yes" ; then -- AC_MSG_ERROR([ --*** You must have either have gettext support in your C library, or use the --*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html --]) --fi -- - LIBS="$INTLLIBS $LIBS" - - GETTEXT_PACKAGE=glib20 -@@ -2682,8 +2675,6 @@ dnl ************************** - dnl *** Checks for gtk-doc *** - dnl ************************** - --GTK_DOC_CHECK([1.11]) -- - AC_ARG_ENABLE(man, - [AC_HELP_STRING([--enable-man], - [regenerate man pages from Docbook [default=no]])],enable_man=yes, diff --git a/data/windows/patches/pyliblo-python3.7.patch b/data/windows/patches/pyliblo-python3.7.patch deleted file mode 100644 index 5cee8ea98..000000000 --- a/data/windows/patches/pyliblo-python3.7.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/liblo.c b/src/liblo.c -index bb314a5..6535baf 100644 ---- a/src/liblo.c -+++ b/src/liblo.c -@@ -13882,12 +13882,12 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) - *value = local_value; - *tb = local_tb; - #if CYTHON_COMPILING_IN_CPYTHON -- tmp_type = tstate->exc_type; -- tmp_value = tstate->exc_value; -- tmp_tb = tstate->exc_traceback; -- tstate->exc_type = local_type; -- tstate->exc_value = local_value; -- tstate->exc_traceback = local_tb; -+ tmp_type = tstate->exc_state.exc_type; -+ tmp_value = tstate->exc_state.exc_value; -+ tmp_tb = tstate->exc_state.exc_traceback; -+ tstate->exc_state.exc_type = local_type; -+ tstate->exc_state.exc_value = local_value; -+ tstate->exc_state.exc_traceback = local_tb; - /* Make sure tstate is in a consistent state when we XDECREF - these objects (DECREF may run arbitrary code). */ - Py_XDECREF(tmp_type); -@@ -13927,9 +13927,9 @@ bad: - static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) { - #if CYTHON_COMPILING_IN_CPYTHON - PyThreadState *tstate = PyThreadState_GET(); -- *type = tstate->exc_type; -- *value = tstate->exc_value; -- *tb = tstate->exc_traceback; -+ *type = tstate->exc_state.exc_type; -+ *value = tstate->exc_state.exc_value; -+ *tb = tstate->exc_state.exc_traceback; - Py_XINCREF(*type); - Py_XINCREF(*value); - Py_XINCREF(*tb); -@@ -13941,12 +13941,12 @@ static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) - #if CYTHON_COMPILING_IN_CPYTHON - PyObject *tmp_type, *tmp_value, *tmp_tb; - PyThreadState *tstate = PyThreadState_GET(); -- tmp_type = tstate->exc_type; -- tmp_value = tstate->exc_value; -- tmp_tb = tstate->exc_traceback; -- tstate->exc_type = type; -- tstate->exc_value = value; -- tstate->exc_traceback = tb; -+ tmp_type = tstate->exc_state.exc_type; -+ tmp_value = tstate->exc_state.exc_value; -+ tmp_tb = tstate->exc_state.exc_traceback; -+ tstate->exc_state.exc_type = type; -+ tstate->exc_state.exc_value = value; -+ tstate->exc_state.exc_traceback = tb; - Py_XDECREF(tmp_type); - Py_XDECREF(tmp_value); - Py_XDECREF(tmp_tb);