diff --git a/wireshark-1.12.6-fix-QT-PIC-PIE.patch b/wireshark-1.12.6-fix-QT-PIC-PIE.patch new file mode 100644 index 0000000..a2da5d5 --- /dev/null +++ b/wireshark-1.12.6-fix-QT-PIC-PIE.patch @@ -0,0 +1,47 @@ +From: Andreas Stieger +Date: Mon, 13 Jul 2015 11:30:56 +0200 +Subject: Compilation fails with qt5 5.4.1 and autotools due to lack of -fPIC +References: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11230 +Upstream: not yet + +Workaround for compilation error on Factory: + +[ 1248s] In file included from /usr/include/qt5/QtGui/qwindowdefs.h:37:0, +[ 1248s] from /usr/include/qt5/QtWidgets/qwidget.h:37, +[ 1248s] from /usr/include/qt5/QtWidgets/qframe.h:37, +[ 1248s] from /usr/include/qt5/QtWidgets/QFrame:1, +[ 1248s] from accordion_frame.h:25, +[ 1248s] from accordion_frame.cpp:26: +[ 1248s] /usr/include/qt5/QtCore/qglobal.h:1052:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC (-fPIE is not enough)." +[ 1248s] # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ +[ 1248s] ^ + +Should be considered a temporary fix. +Some discussion: https://build.opensuse.org/request/show/314996 + +diff --git a/configure.ac b/configure.ac +index bcd6f9e..a39a96f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1071,18 +1071,18 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed]) + # in the address space to make attacks more difficult. + # + CFLAGS_before_pie="$CFLAGS" +-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE) ++AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIC) + if test "x$CFLAGS" != "x$CFLAGS_before_pie" + then + # Restore CFLAGS + CFLAGS="$CFLAGS_before_pie" + + LDFLAGS_before_pie="$LDFLAGS" +- AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie]) ++ AC_WIRESHARK_LDFLAGS_CHECK([-fPIC -pie]) + if test "x$LDFLAGS" != "x$LDFLAGS_before_pie" + then + # We can use PIE +- PIE_CFLAGS="-fPIE" ++ PIE_CFLAGS="-fPIC" + PIE_LDFLAGS="-pie" + + # Restore LDFLAGS diff --git a/wireshark.changes b/wireshark.changes index 3a49061..343cd0c 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 13 09:35:18 UTC 2015 - astieger@suse.com + +- Fix Factory with QT (PIE/PIC) + adding wireshark-1.12.6-fix-QT-PIC-PIE.patch + ------------------------------------------------------------------- Thu Jun 18 17:43:18 UTC 2015 - astieger@suse.com diff --git a/wireshark.spec b/wireshark.spec index 2ac14cc..3555502 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -43,6 +43,7 @@ Patch4: wireshark-1.10.0-enable_lua.patch Patch5: wireshark-1.10.0-authors-pod2man.patch Patch6: wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch Patch7: wireshark-pkg-config.patch +Patch8: wireshark-1.12.6-fix-QT-PIC-PIE.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -190,6 +191,7 @@ sed \ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build # for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch