diff options
Diffstat (limited to 'use-system-libxcb.patch')
| -rw-r--r-- | use-system-libxcb.patch | 80 |
1 files changed, 31 insertions, 49 deletions
diff --git a/use-system-libxcb.patch b/use-system-libxcb.patch index febf5a68ff02..66ee585a26f8 100644 --- a/use-system-libxcb.patch +++ b/use-system-libxcb.patch @@ -1,73 +1,55 @@ -diff -Naur package.pristine/bin/packages/build.sh package.new/bin/packages/build.sh ---- package.pristine/bin/packages/build.sh 2017-07-27 22:03:27.000000000 +0200 -+++ package.new/bin/packages/build.sh 2017-07-29 01:42:41.079439969 +0200 -@@ -168,28 +168,28 @@ +diff --no-dereference -aur radium-5.7.6.pristine/bin/packages/build.sh radium-5.7.6.new/bin/packages/build.sh +--- radium-5.7.6.pristine/bin/packages/build.sh 2018-06-16 09:43:05.000000000 +0100 ++++ radium-5.7.6.new/bin/packages/build.sh 2018-06-17 07:54:17.473316625 +0100 +@@ -168,29 +168,6 @@ cd ../ fi -if [[ $RADIUM_QT_VERSION == 5 ]] -then - -- rm -fr xcb-proto-1.12/ -- tar xvjf xcb-proto-1.12.tar.bz2 -- cd xcb-proto-1.12/ +- rm -fr xcb-proto-1.13/ +- tar xvjf xcb-proto-1.13.tar.bz2 +- cd xcb-proto-1.13/ - mkdir install - ./configure --prefix=`pwd`/install PYTHON=`which python2` - make - make install - cd .. - -- rm -fr libxcb-1.12 -- tar xvjf libxcb-1.12.tar.bz2 -- cd libxcb-1.12 -- patch -p1 <../libxcb-1.12.patch -- export PKG_CONFIG_PATH=`pwd`/../xcb-proto-1.12/install/lib/pkgconfig:$PKG_CONFIG_PATH +- rm -fr libxcb-1.13 +- tar xvjf libxcb-1.13.tar.bz2 +- cd libxcb-1.13 +- #patch -p1 <../libxcb-1.12.patch +- export PKG_CONFIG_PATH=`pwd`/../xcb-proto-1.13/install/lib/pkgconfig:$PKG_CONFIG_PATH - CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CXXFLAGS" ./configure PYTHON=`which python2` - CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CXXFLAGS" make - cd .. - -fi -+# if [[ $RADIUM_QT_VERSION == 5 ]] -+# then -+# -+# rm -fr xcb-proto-1.12/ -+# tar xvjf xcb-proto-1.12.tar.bz2 -+# cd xcb-proto-1.12/ -+# mkdir install -+# ./configure --prefix=`pwd`/install PYTHON=`which python2` -+# make -+# make install -+# cd .. -+# -+# rm -fr libxcb-1.12 -+# tar xvjf libxcb-1.12.tar.bz2 -+# cd libxcb-1.12 -+# patch -p1 <../libxcb-1.12.patch -+# export PKG_CONFIG_PATH=`pwd`/../xcb-proto-1.12/install/lib/pkgconfig:$PKG_CONFIG_PATH -+# CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CXXFLAGS" ./configure PYTHON=`which python2` -+# CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CXXFLAGS" make -+# cd .. -+# -+# fi - +- # Build faust last since we reset the build flags. -diff -Naur package.pristine/Qt/Qt_Main.cpp package.new/Qt/Qt_Main.cpp ---- package.pristine/Qt/Qt_Main.cpp 2017-07-27 22:03:27.000000000 +0200 -+++ package.new/Qt/Qt_Main.cpp 2017-07-29 01:41:16.904955284 +0200 -@@ -3039,6 +3039,7 @@ + +diff --no-dereference -aur radium-5.7.6.pristine/Qt/Qt_Main.cpp radium-5.7.6.new/Qt/Qt_Main.cpp +--- radium-5.7.6.pristine/Qt/Qt_Main.cpp 2018-06-16 09:43:05.000000000 +0100 ++++ radium-5.7.6.new/Qt/Qt_Main.cpp 2018-06-17 07:58:40.783307624 +0100 +@@ -3444,18 +3444,6 @@ #endif // !defined(RELEASE) -+/* - #if defined(FOR_LINUX) - { - QString name(dlpi_name); -@@ -3050,6 +3051,7 @@ - } - } - #endif -+*/ - +-#if defined(FOR_LINUX) +- { +- QString name(dlpi_name); +- if (name.contains("libxcb.so")){ +- if (!name.contains("bin/packages/libxcb-1.13/src/.libs/")){ +- fprintf(stderr,"\n\n%c[31mError. A version of libxcb not included with Radium has been dynamically linked into the program. Something is wrong the installation of Radium.\nOlder versions of libxcb (probably before 1.11.1) are unstable with Radium.%c[0m\n\n", 0x1b, 0x1b); +- abort(); +- } +- } +- } +-#endif +- + if (is_main_root) |