summarylogtreecommitdiffstats
path: root/use-system-libxcb.patch
diff options
context:
space:
mode:
authorJakob Gahde2017-04-11 20:42:48 +0200
committerJakob Gahde2017-04-11 20:42:48 +0200
commitbc35a753a2f40b8694c6e9ee3371ef16e49cbe3e (patch)
tree441f27f3e17388a1afe60b0bd622d338a4f8d7c4 /use-system-libxcb.patch
parentbbab74e41fc917c71131a26da54a3423e3a3add4 (diff)
downloadaur-bc35a753a2f40b8694c6e9ee3371ef16e49cbe3e.tar.gz
radium 4.6.6-1: New version w/ changes courtesy of Teteros
Diffstat (limited to 'use-system-libxcb.patch')
-rw-r--r--use-system-libxcb.patch73
1 files changed, 45 insertions, 28 deletions
diff --git a/use-system-libxcb.patch b/use-system-libxcb.patch
index 5c5e3872aa8..422f823a0e1 100644
--- a/use-system-libxcb.patch
+++ b/use-system-libxcb.patch
@@ -1,30 +1,7 @@
-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 @@
+--- 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 @@
cd ../
fi
@@ -49,7 +26,47 @@ diff -aur --no-dereference package.pristine/bin/packages/build.sh package.new/bi
- 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~
+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 @@
+
+ #endif // !defined(RELEASE)
+
++/*
+ #if defined(FOR_LINUX)
+ {
+ QString name(dlpi_name);
+@@ -2534,7 +2535,7 @@
+ }
+ }
+ #endif
+-
++*/
+
+
+ if (is_main_root)