From b7e9c278e8a8f0756bb0345ed7c223814c3965d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 12 Apr 2011 20:26:00 +0100 Subject: [PATCH] backport KDE4 build fix --- ...uplicate-code-block-mis-merge-prolly.patch | 34 +++++++++++++++++++ libreoffice.spec | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 0001-Removed-duplicate-code-block-mis-merge-prolly.patch diff --git a/0001-Removed-duplicate-code-block-mis-merge-prolly.patch b/0001-Removed-duplicate-code-block-mis-merge-prolly.patch new file mode 100644 index 0000000..6e91313 --- /dev/null +++ b/0001-Removed-duplicate-code-block-mis-merge-prolly.patch @@ -0,0 +1,34 @@ +From ea898caa151fb8e94b6bdb00b1008b6da98fddad Mon Sep 17 00:00:00 2001 +From: Katarina Machalkova +Date: Thu, 7 Apr 2011 13:11:00 +0200 +Subject: [PATCH] Removed duplicate code block (mis-merge, prolly) + +This fixes build with --enable-kde4 +--- + vcl/unx/kde4/KDEXLib.cxx | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx +index 7757014..ca435c8 100644 +--- a/vcl/unx/kde4/KDEXLib.cxx ++++ b/vcl/unx/kde4/KDEXLib.cxx +@@ -219,16 +219,6 @@ static bool qt_event_filter( void* m ) + return false; + } + +-static bool ( *old_qt_event_filter )( void* ); +-static bool qt_event_filter( void* m ) +-{ +- if( old_qt_event_filter != NULL && old_qt_event_filter( m )) +- return true; +- if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) +- return true; +- return false; +-} +- + void KDEXLib::setupEventLoop() + { + old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); +-- +1.7.4.2 + diff --git a/libreoffice.spec b/libreoffice.spec index e029b0c..0473bc6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -83,6 +83,7 @@ Patch8: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch Patch9: libreoffice-installfix.patch Patch10: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch Patch11: kde4configure.patch +Patch12: 0001-Removed-duplicate-code-block-mis-merge-prolly.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -695,6 +696,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch9 -p1 -b .libreoffice-installfix.patch %patch10 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch %patch11 -p0 -b .kde4configure.patch +%patch12 -p1 -b .Removed-duplicate-code-block-mis-merge-prolly.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1`