77 lines
3.7 KiB
Diff
77 lines
3.7 KiB
Diff
--- source/build_linux_common.sh.orig 2025-10-30 18:28:15.000000000 +0100
|
|
+++ source/build_linux_common.sh 2026-01-05 14:38:13.999781422 +0100
|
|
@@ -147,9 +147,9 @@
|
|
#export QT_CFLAGS="-DQT_STATIC -DQT3_SUPPORT -I$RQTDIR/include/Qt3Support -I$RQTDIR/include/QtCore -I$RQTDIR/include/QtGui -I$RQTDIR/include/QtNetwork -I$RQTDIR/include/QtSql -I$RQTDIR/include/QtOpenGL -Ibin/packages/qhttpserver-master/src"
|
|
#export QT_LDFLAGS="$RQTDIR/lib/libQt3Support.a $RQTDIR/lib/libQtSql.a $RQTDIR/lib/libQtOpenGL.a $RQTDIR/lib/libQtGui.a $RQTDIR/lib/libQtNetwork.a $RQTDIR/lib/libQtCore.a -lSM -lICE -lfreetype -lfontconfig -lXrender -lpng -lglib-2.0 -lgobject-2.0"
|
|
|
|
-QT_INCLUDE_PATH=`$QMAKE -query QT_INSTALL_HEADERS`
|
|
-export QT_UI_CFLAGS="-I $QT_INCLUDE_PATH/QtUiTools" # Doing this instead of using pkg since there are bugs in the dependencies of the pkg file in some versions of Qt. (same with the lib file below)
|
|
-export QT_UI_LDFLAGS="`$QMAKE -query QT_INSTALL_LIBS`/libQt5UiTools.a"
|
|
+#QT_INCLUDE_PATH=`$QMAKE -query QT_INSTALL_HEADERS`
|
|
+#export QT_UI_CFLAGS="-I $QT_INCLUDE_PATH/QtUiTools" # Doing this instead of using pkg since there are bugs in the dependencies of the pkg file in some versions of Qt. (same with the lib file below)
|
|
+#export QT_UI_LDFLAGS="`$QMAKE -query QT_INSTALL_LIBS`/libQt5UiTools.a"
|
|
|
|
|
|
#One of these:
|
|
--- source/configuration.sh.orig 2026-01-05 12:10:37.393648921 +0100
|
|
+++ source/configuration.sh 2026-01-05 14:41:36.490185173 +0100
|
|
@@ -239,13 +239,14 @@
|
|
handle_failure "Not empty"
|
|
fi
|
|
|
|
- A=$($PKGqt --libs-only-L Qt5Core | xargs)
|
|
- B="-L$($QMAKE -query QT_INSTALL_PREFIX)/lib"
|
|
- if [ "$A" != "$B" ] ; then
|
|
- handle_failure "$PKGqt and $QMAKE doesn't seem to point to the same Qt:\n" \
|
|
- "PKG: \"$A\".\n" \
|
|
- "${QMAKE}: \"$B\""
|
|
- fi
|
|
+ A=$($PKGqt --libs-only-L Qt5Core | xargs)
|
|
+ B="-L$($QMAKE -query QT_INSTALL_PREFIX)/lib"
|
|
+ if [ "$A" != "$B" ] ; then
|
|
+ printf "$PKGqt and $QMAKE don't seem to point to the same Qt.\nBut we don't give a shit on NixOS.\n"
|
|
+# handle_failure "$PKGqt and $QMAKE doesn't seem to point to the same Qt:\n" \
|
|
+# "PKG: \"$A\".\n" \
|
|
+# "${QMAKE}: \"$B\""
|
|
+ fi
|
|
else
|
|
if ! is_set QMAKE_LIBS_ONLY_L_SHOULD_BE_EMPTY ; then
|
|
if [ "$($QMAKE -query QT_INSTALL_PREFIX)" != "/usr" ] ; then
|
|
--- source/Makefile.Qt.orig 2026-01-05 12:12:34.852622893 +0100
|
|
+++ source/Makefile.Qt 2026-01-05 12:12:42.535293687 +0100
|
|
@@ -305,7 +305,7 @@
|
|
|
|
WARNINGS_AS_ERRORS ?= 1
|
|
|
|
-WERROR=""
|
|
+WERROR=
|
|
|
|
ifeq ($(WARNINGS_AS_ERRORS), 1)
|
|
WERROR = -Werror
|
|
--- source/bin/packages/build.sh.orig 2026-01-05 12:14:03.963801383 +0100
|
|
+++ source/bin/packages/build.sh 2026-01-13 09:29:20.265932446 +0100
|
|
@@ -86,6 +86,7 @@
|
|
tar xvzf faust-2.81.2.tar.gz
|
|
mv faust-2.81.2 faust
|
|
cd faust
|
|
+ patch -p1 <../faust_llvm_21.patch
|
|
rm -fr libraries
|
|
tar xvzf ../faustlibraries_2024_01_05.tar.gz
|
|
mv faustlibraries libraries
|
|
@@ -130,6 +131,7 @@
|
|
tar xvzf Visualization-Library-master.tar.gz
|
|
cd Visualization-Library-master/
|
|
patch -p1 <../visualization.patch
|
|
+ patch -p1 <../vl_lib_cmake.patch
|
|
sed -i.backup 's/add_subdirectory("freetype")//' src/vlGraphics/plugins/CMakeLists.txt
|
|
#sed -i s/"VL_ACTOR_USER_DATA 0"/"VL_ACTOR_USER_DATA 1"/ src/vlCore/config.hpp
|
|
export MYFLAGS="-std=gnu++11 $CPPFLAGS -fPIC -g -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-implicit-function-declaration `pkg-config --cflags freetype2` " # -D_GLIBCXX_USE_CXX11_ABI=0
|
|
@@ -149,7 +151,7 @@
|
|
|
|
build_libpds() {
|
|
|
|
- NOWARNS="-Wno-return-mismatch -Wno-implicit-function-declaration -Wno-int-conversion -Wno-implicit-int"
|
|
+ NOWARNS="-Wno-return-mismatch -Wno-implicit-function-declaration -Wno-int-conversion -Wno-implicit-int -Wno-format-security"
|
|
|
|
rm -fr libpd-master
|
|
tar xvzf libpd-master.tar.gz
|