summarylogtreecommitdiffstats
path: root/use-system-libxcb.patch
diff options
context:
space:
mode:
authorKenjiTakahashi2017-02-02 04:56:24 +0100
committerKenjiTakahashi2017-02-02 04:56:24 +0100
commit0b5fb2e23cc56482985c32361145501f32547ce1 (patch)
tree500acfb7a810aa8835cea85c9335e1a823d15ece /use-system-libxcb.patch
parente8d35f22c9b0fd0665cae6e498bc907cbcac8be2 (diff)
downloadaur-0b5fb2e23cc56482985c32361145501f32547ce1.tar.gz
4.4.4-1: Bumped version
1. Adjusted faust patch for clang 3.9.1. 2. Adjusted vstsdk patch for upstream changes. 3. Using libxcb from [extra] to make sure we have all necessary patches. [Also makes libthread-stubs unneeded.] 4. Fixed X11_keyboard compilation flags.
Diffstat (limited to 'use-system-libxcb.patch')
-rw-r--r--use-system-libxcb.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/use-system-libxcb.patch b/use-system-libxcb.patch
new file mode 100644
index 00000000000..5c5e3872aa8
--- /dev/null
+++ b/use-system-libxcb.patch
@@ -0,0 +1,55 @@
+diff -aur --no-dereference package.pristine/Qt/Qt_Main.cpp package.new/Qt/Qt_Main.cpp
+--- package.pristine/Qt/Qt_Main.cpp 2017-01-26 17:00:32.000000000 +0100
++++ package.new/Qt/Qt_Main.cpp 2017-02-02 02:36:04.552338576 +0100
+@@ -2426,18 +2426,6 @@
+ //abort();
+
+ #endif // !defined(RELEASE)
+-
+-#if defined(FOR_LINUX)
+- {
+- QString name(dlpi_name);
+- if (name.contains("libxcb.so")){
+- if (!name.contains("bin/packages/libxcb-1.12/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
+
+
+
+Only in package.new/Qt: Qt_Main.cpp~
+diff -aur --no-dereference package.pristine/bin/packages/build.sh package.new/bin/packages/build.sh
+--- package.pristine/bin/packages/build.sh 2017-01-26 17:00:32.000000000 +0100
++++ package.new/bin/packages/build.sh 2017-02-02 02:36:22.135671428 +0100
+@@ -189,27 +189,5 @@
+ 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
+-
+
+ touch deletemetorebuild
+Only in package.new/bin/packages: build.sh~