Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dee8494915ba401adabf3ed7e13b651760a58394

commit dee8494915ba401adabf3ed7e13b651760a58394
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Aug 12 13:15:53 2009 +0200

openoffice.org-3.1.0-2-i686

- add mozilla subpkg
- add missing xextproto71-hack

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 8dfa75d..fed542e 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -57,15 +57,18 @@ signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' 
'' '' '' '' '' '' ''
NOEXTRACT=1
options=(${optio...@]} 'scriptlet')

-subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-mono")
-subdescs=("$pkgname kde integration" "$pkgname gnome integration" "The 
OpenOffice.org Software Development Kit" "$pkgname mono integration")
+subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" "$pkgname-mono" 
"$pkgname-mozilla")
+subdescs=("$pkgname kde integration" "$pkgname gnome integration" \
+       "The OpenOffice.org Software Development Kit" "$pkgname mono 
integration" \
+       "$pkgname mozilla integration")
subdepends=("$pkgname=$pkgver kdelibs>=3.5.5" \
"$pkgname=$pkgver gnome-vfs libbonobo evolution-data-server-ldap" \
"$pkgname=$pkgver java-gcj-compat ecj" \
-       "$pkgname=$pkgver mono")
-subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
-subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra')
-subinstall=("" "$_F_gnome_scriptlet" "" "")
+       "$pkgname=$pkgver mono" \
+       "$pkgname=$pkgver")
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 
x86_64')
+subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra' 'xapps')
+subinstall=("" "$_F_gnome_scriptlet" "" "" "")

ooodicts="af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi 
zu"
ooosubpkgs=('de' 'es' 'fr' 'hu')
@@ -214,9 +217,12 @@ build()
# Fix invalid hardwired mktemp path in unopkg
Fsed /bin/mktemp mktemp $Fdestdir/usr/lib/openoffice.org/program/unopkg

-       # Enable the mozilla plugin
+       # Enable and split the mozilla plugin
Fmkdir /usr/lib/mozilla/plugins
Fln /usr/lib/openoffice.org/program/libnpsoplugin.so /usr/lib/mozilla/plugins/
+       Fsplit openoffice.org-mozilla 
usr/lib/openoffice.org/basis-link/program/nsplugin \
+               usr/lib/mozilla/plugins/libnpsoplugin.so \
+               usr/lib/openoffice.org/program/libnpsoplugin.so

# Split out the i18n stuff
for i in "${ooosubpk...@]}"
diff --git a/source/xapps/openoffice.org/xextproto71-hack 
b/source/xapps/openoffice.org/xextproto71-hack
new file mode 100644
index 0000000..2744d42
--- /dev/null
+++ b/source/xapps/openoffice.org/xextproto71-hack
@@ -0,0 +1,22 @@
+diff --git vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
+index 1e0a27e..2bab894 100644
+--- vcl/unx/source/app/saldisp.cxx
++++ vcl/unx/source/app/saldisp.cxx
+@@ -81,7 +81,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned 
char*, int*);
+ #endif
+ #endif
+
+-#if __XTestExtension__
++#if 0
+ #include <X11/extensions/XTest.h>
+ #include <X11/extensions/XKB.h>
+ #include <X11/XKBlib.h>
+@@ -1054,7 +1054,7 @@ void SalDisplay::Beep() const
+
+ void SalDisplay::SimulateKeyPress( USHORT nKeyCode )
+ {
+-#if __XTestExtension__
++#if 0
+     if (nKeyCode == KEY_CAPSLOCK)
+     {
+         XLIB_KeyCode keyCaps = XKeysymToKeycode(GetDisplay(), XK_Caps_Lock);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to