[pkgsrc/trunk]: pkgsrc/misc/openoffice2 - Fix hang when clicking the systray ...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/266a260b92bd
branches:  trunk
changeset: 528174:266a260b92bd
user:      hira <hira%pkgsrc.org@localhost>
date:      Sun Apr 22 23:15:24 2007 +0000

description:
- Fix hang when clicking the systray icon.
 - Restore sensitivity of the systray menu when closing the open dialog.
 - Add missing two scripts and a symbolic link.

Bump PKGREVISION.

diffstat:

 misc/openoffice2/Makefile         |  19 ++++++++++++++++---
 misc/openoffice2/distinfo         |   4 +++-
 misc/openoffice2/patches/patch-ck |  15 +++++++++++++++
 misc/openoffice2/patches/patch-cl |  14 ++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diffs (110 lines):

diff -r a4a64a7e644c -r 266a260b92bd misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sun Apr 22 22:45:07 2007 +0000
+++ b/misc/openoffice2/Makefile Sun Apr 22 23:15:24 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/04/21 05:40:27 hira Exp $
+# $NetBSD: Makefile,v 1.16 2007/04/22 23:15:24 hira Exp $
 #
 
 OO_VER=                        2.2.0
+PKGREVISION=           1
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
 CATEGORIES=            misc
@@ -78,9 +79,10 @@
 MESSAGE_SUBST+=                OO_RELEASE=${OO_RELEASE}
 INSTALLATION_DIRS=     bin
 
+OO_UNXNAME=    openoffice.org2.2
 OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
-OO_PKGROOT=    /opt/openoffice.org2.2
-OO_PROGRAMS=   scalc sdraw simpress soffice swriter
+OO_PKGROOT=    /opt/${OO_UNXNAME}
+OO_PROGRAMS=   scalc sdraw simpress soffice swriter unopkg
 
 post-extract:
        ${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h                \
@@ -97,6 +99,12 @@
                        ${TAR} xpfk $$f;                        \
                done;                                           \
        done
+       ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
+       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/soffice \"\$$@\"" \
+               >> ${WRKDIR}/${OO_UNXNAME}
+       ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
+       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/spadmin"  \
+               >> ${WRKDIR}/${OO_UNXNAME}-printeradmin
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/${OO_RELEASE}
@@ -106,6 +114,9 @@
                ${LN} -sf ${PREFIX}/${OO_RELEASE}/program/$$f   \
                        ${PREFIX}/bin/$$f;                      \
        done
+       ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin  \
+               ${PREFIX}/bin
 
 post-install:
        cd ${PREFIX} &&                                         \
@@ -116,6 +127,8 @@
        for f in ${OO_PROGRAMS}; do                             \
                ${ECHO} bin/$$f >> ${PLIST_SRC};                \
        done
+       ${ECHO} bin/${OO_UNXNAME} >> ${PLIST_SRC}
+       ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${PLIST_SRC}
 
 # everything specific to your OS/Arch goes into its own Makefile
 # group together i386, i486, i586 and i686 (for Linux)
diff -r a4a64a7e644c -r 266a260b92bd misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Sun Apr 22 22:45:07 2007 +0000
+++ b/misc/openoffice2/distinfo Sun Apr 22 23:15:24 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/04/21 05:40:27 hira Exp $
+$NetBSD: distinfo,v 1.16 2007/04/22 23:15:24 hira Exp $
 
 SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
 RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
@@ -60,3 +60,5 @@
 SHA1 (patch-ch) = bcfeb99318a16e83f2e54fb94d275224c67182fb
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
 SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
+SHA1 (patch-ck) = e7d9f3043ac975c7e13937b1d47650a5de7a3d36
+SHA1 (patch-cl) = cf405103c2adc7df68d148ed58e8f5700ae16524
diff -r a4a64a7e644c -r 266a260b92bd misc/openoffice2/patches/patch-ck
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-ck Sun Apr 22 23:15:24 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ck,v 1.1 2007/04/22 23:15:25 hira Exp $
+
+--- vcl/unx/gtk/app/gtkinst.cxx.orig   2007-04-23 05:50:27.000000000 +0900
++++ vcl/unx/gtk/app/gtkinst.cxx        2007-04-23 05:51:07.000000000 +0900
+@@ -329,7 +329,9 @@
+     // that locked the mutex with Grab()
+     OMutex::acquire();
+     mnCount = nGrabs;
+-    if( mnCount == 0 )
++    if( mnCount == 0 ) {
++        gdk_threads_leave();
+         mnThreadId = 0;
++    }
+     OMutex::release();
+ }
diff -r a4a64a7e644c -r 266a260b92bd misc/openoffice2/patches/patch-cl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-cl Sun Apr 22 23:15:24 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-cl,v 1.1 2007/04/22 23:15:25 hira Exp $
+
+--- sfx2/source/appl/shutdownicon.cxx.orig     2007-04-23 06:14:32.000000000 +0900
++++ sfx2/source/appl/shutdownicon.cxx  2007-04-23 06:15:48.000000000 +0900
+@@ -530,9 +530,7 @@
+         }
+     }
+ 
+-#ifdef WNT
+         LeaveModalMode();
+-#endif
+     return 0;
+ }
+