summarylogtreecommitdiffstats
path: root/use-system-libxcb.patch
diff options
context:
space:
mode:
Diffstat (limited to 'use-system-libxcb.patch')
-rw-r--r--use-system-libxcb.patch75
1 files changed, 38 insertions, 37 deletions
diff --git a/use-system-libxcb.patch b/use-system-libxcb.patch
index 422f823a0e1..febf5a68ff0 100644
--- a/use-system-libxcb.patch
+++ b/use-system-libxcb.patch
@@ -1,7 +1,7 @@
-diff -aur --no-dereference package.pristine/bin/packages/build.sh package.new/bin/packages/build.sh
---- package.pristine/bin/packages/build.sh 2017-03-26 19:27:43.000000000 +0000
-+++ package.new/bin/packages/build.sh 2017-03-30 05:14:35.867793829 +0000
-@@ -189,27 +189,27 @@
+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 @@
cd ../
fi
@@ -12,7 +12,7 @@ diff -aur --no-dereference package.pristine/bin/packages/build.sh package.new/bi
- tar xvjf xcb-proto-1.12.tar.bz2
- cd xcb-proto-1.12/
- mkdir install
-- ./configure --prefix=`pwd`/install
+- ./configure --prefix=`pwd`/install PYTHON=`which python2`
- make
- make install
- cd ..
@@ -20,53 +20,54 @@ diff -aur --no-dereference package.pristine/bin/packages/build.sh package.new/bi
- 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
-- ./configure
-- make
+- 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
-+# make
-+# make install
-+# cd ..
-+#
-+# rm -fr libxcb-1.12
-+# tar xvjf libxcb-1.12.tar.bz2
-+# cd libxcb-1.12
-+# export PKG_CONFIG_PATH=`pwd`/../xcb-proto-1.12/install/lib/pkgconfig:$PKG_CONFIG_PATH
-+# ./configure
-+# 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
- touch deletemetorebuild
-diff -aur --no-dereference package.pristine/Qt/Qt_Main.cpp package.new/Qt/Qt_Main.cpp
---- package.pristine/Qt/Qt_Main.cpp 2017-03-26 19:27:43.000000000 +0000
-+++ package.new/Qt/Qt_Main.cpp 2017-03-30 05:12:36.587795134 +0000
-@@ -2523,6 +2523,7 @@
+ # 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 @@
+
#endif // !defined(RELEASE)
+/*
#if defined(FOR_LINUX)
{
QString name(dlpi_name);
-@@ -2534,7 +2535,7 @@
+@@ -3050,6 +3051,7 @@
}
}
#endif
--
+*/
+
- if (is_main_root)