summarylogtreecommitdiffstats
path: root/use-system-libxcb.patch
blob: 66ee585a26f832835b813f406ccf2b943b6c11a2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
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.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.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
-
 
 # Build faust last since we reset the build flags.
 
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);
-    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)