Fix the KDE startup bug.

3 files changed, 21 insertions, 6 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 2ed15e33..5973cdfd 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -167,6 +167,8 @@
 #               KDE integration libraries and SDK documentation have been
 #               split off the main package and into libreoffice-kde-integration
 #               and libreoffice-sdkdoc sub-packages.
+# 4.2.3-2:    20/apr/2014 by Eric Hameleers <alien@slackware.com>
+#             * Fix nasty bug on KDE.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -182,7 +184,7 @@ PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -782,6 +784,9 @@ if [ "$P1" != "--oldbuild" ]; then
   # Add internal copies of Google's Carlito and Caladea fonts:
   cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  # Fix bug on KDE where application freezes:
+  cat $SRCDIR/patches/libreoffice.kde_qt_sessionmanager.patch \
+    | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
 fi
 
 if [ -z "$SRCURL[0]" ]; then
@@ -1005,7 +1010,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 # have a choice to leave these libraries out:
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
-for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
+for KDEFILE in libvclplug_kde4lo.so libkde4be1lo.so ; do
   mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index 2ed15e33..5973cdfd 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -167,6 +167,8 @@
 #               KDE integration libraries and SDK documentation have been
 #               split off the main package and into libreoffice-kde-integration
 #               and libreoffice-sdkdoc sub-packages.
+# 4.2.3-2:    20/apr/2014 by Eric Hameleers <alien@slackware.com>
+#             * Fix nasty bug on KDE.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -182,7 +184,7 @@ PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -782,6 +784,9 @@ if [ "$P1" != "--oldbuild" ]; then
   # Add internal copies of Google's Carlito and Caladea fonts:
   cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  # Fix bug on KDE where application freezes:
+  cat $SRCDIR/patches/libreoffice.kde_qt_sessionmanager.patch \
+    | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
 fi
 
 if [ -z "$SRCURL[0]" ]; then
@@ -1005,7 +1010,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 # have a choice to leave these libraries out:
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
-for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
+for KDEFILE in libvclplug_kde4lo.so libkde4be1lo.so ; do
   mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index 2ed15e33..5973cdfd 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -167,6 +167,8 @@
 #               KDE integration libraries and SDK documentation have been
 #               split off the main package and into libreoffice-kde-integration
 #               and libreoffice-sdkdoc sub-packages.
+# 4.2.3-2:    20/apr/2014 by Eric Hameleers <alien@slackware.com>
+#             * Fix nasty bug on KDE.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -182,7 +184,7 @@ PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -782,6 +784,9 @@ if [ "$P1" != "--oldbuild" ]; then
   # Add internal copies of Google's Carlito and Caladea fonts:
   cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  # Fix bug on KDE where application freezes:
+  cat $SRCDIR/patches/libreoffice.kde_qt_sessionmanager.patch \
+    | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
 fi
 
 if [ -z "$SRCURL[0]" ]; then
@@ -1005,7 +1010,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 # have a choice to leave these libraries out:
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
-for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
+for KDEFILE in libvclplug_kde4lo.so libkde4be1lo.so ; do
   mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done