Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44042d54b5ef2317bb9351bb1089c286e3182de2
commit 44042d54b5ef2317bb9351bb1089c286e3182de2 Author: Miklos Vajna <vmik...@frugalware.org> Date: Tue Aug 18 20:32:42 2009 +0200 openoffice.org-3.1.0-2-i686 - drop xextproto71-hack, not needed as of libxtst-1.0.99.1 diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index fed542e..7fc390b 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -52,8 +52,8 @@ else fi source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 \ http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,writer,impress,artwork,filters,testing,bootstrap,libs-gui,libs-core,libs-extern,components,postprocess,libs-extern-sys,extensions,extras,help}.tar.bz2 \ -{xextproto71,mono24}-hack) -signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +mono24-hack) +signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') NOEXTRACT=1 options=(${optio...@]} 'scriptlet') @@ -153,7 +153,6 @@ build() Fcd ooo-build$branch-$snapshot fi cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff || Fdie - cp -fv $Fsrcdir/xextproto71-hack patches/hotfixes/xextproto71-hack.diff || Fdie # Predownloaded tarballs for i in $Fsrcdir/$tree-m$milestone-* diff --git a/source/xapps/openoffice.org/xextproto71-hack b/source/xapps/openoffice.org/xextproto71-hack deleted file mode 100644 index 2744d42..0000000 --- a/source/xapps/openoffice.org/xextproto71-hack +++ /dev/null @@ -1,22 +0,0 @@ -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
