Tue Apr 5 14:26:38 UTC 2011

8 files changed, 210 insertions, 0 deletions

diff --git a/community/amaya/PKGBUILD b/community/amaya/PKGBUILD
new file mode 100644
index 000000000..e22c16a49
--- /dev/null
+++ b/community/amaya/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 26069 2010-09-13 04:35:31Z bfanella $
+# Mantainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Zerial <fernando@zerial.org>
+# Contributor: Dalius <dagis@takas.lt>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=amaya
+pkgver=11.3.1
+pkgrel=7
+pkgdesc="W3C's Editor/Browser"
+arch=('i686' 'x86_64')
+url="http://www.w3.org/Amaya/"
+license=('Custom/BSD')
+depends=('wxgtk' 'libgl' 'raptor')
+makedepends=('imake' 'chrpath')
+options=('!makeflags')
+install=$pkgname.install
+source=(amaya-fix-amaya-wxfile.patch amaya-fix-thotlib-png14.patch amaya-fix-thotlib-wxfile.patch amaya-splitmode.patch amaya-wakeupidle.patch amaya-wxyield.patch  \
+http://www.w3.org/Amaya/Distribution/$pkgname-sources-$pkgver.tgz)
+md5sums=('4e79692553e88de93a3f56c40dd442dc'
+         '0418f3a614e6d0a8e27ae038c78d8c4d'
+	 '6501c87f7ab45e6c1a3ef214a6ed583e'
+	 'bc42d4b3ff7b43c8d0f7955dd1498b01'
+	 '32347b32aded742b705a2038416f74de'
+	 'c42175f9cc9e90277547828b9cf6a92a'
+         '4a92b4e043fbd1add5b1e17fb7ed8755')
+
+build() {
+	cd $srcdir/Amaya$pkgver
+
+	patch -p1 < $srcdir/amaya-fix-amaya-wxfile.patch
+	patch -p1 < $srcdir/amaya-fix-thotlib-png14.patch
+	patch -p1 < $srcdir/amaya-fix-thotlib-wxfile.patch
+	patch -p1 < $srcdir/amaya-splitmode.patch
+	patch -p1 < $srcdir/amaya-wakeupidle.patch
+        patch -p1 < $srcdir/amaya-wxyield.patch
+
+	cd Amaya
+	if [ ! -d ./WX ]; then
+		mkdir WX
+	fi
+	cd WX
+
+	if [ "$CARCH" = "x86_64" ] ; then
+		[ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86-64 ../../Mesa/configs/current
+	else
+		[ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86 ../../Mesa/configs/current
+	fi
+	../configure --prefix=/usr/share --exec=/usr/share --datadir=/usr/share --enable-system-raptor --enable-system-wx
+	
+	make
+}
+
+package() {
+	cd $srcdir/Amaya$pkgver/Amaya/WX
+
+	install -d $pkgdir/usr/bin
+	make prefix=$pkgdir/usr/share install
+
+	ln -f -s ../share/Amaya/wx/bin/amaya $pkgdir/usr/bin/amaya
+	install -Dm644 $srcdir/Amaya$pkgver/Amaya/amaya/COPYRIGHT \
+  		$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+
+	mkdir -p $pkgdir/usr/share/Amaya/lib
+	cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGL.so.1* $pkgdir/usr/share/Amaya/lib/
+  	cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGLU.so.1* $pkgdir/usr/share/Amaya/lib/
+  	chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/amaya_bin
+  	chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/print
+}
diff --git a/community/amaya/amaya-fix-amaya-wxfile.patch b/community/amaya/amaya-fix-amaya-wxfile.patch
new file mode 100644
index 000000000..6f5b0cf5f
--- /dev/null
+++ b/community/amaya/amaya-fix-amaya-wxfile.patch
@@ -0,0 +1,13 @@
+diff -aur Amaya11.3.1/Amaya/amaya/HTMLedit.c Amaya11.3.1.new/Amaya/amaya/HTMLedit.c
+--- Amaya11.3.1/Amaya/amaya/HTMLedit.c	2009-12-09 11:11:22.000000000 +0100
++++ Amaya11.3.1.new/Amaya/amaya/HTMLedit.c	2010-08-17 21:39:23.696495709 +0200
+@@ -1689,7 +1689,7 @@
+                 {
+ #ifdef _WX
+                   wxString tmpFile = TtaConvMessageToWX(tempURL);
+-                  wxFile::wxFile (tmpFile, wxFile::write);
++                  wxFile (tmpFile, wxFile::write);
+ #endif /* _WX */
+                 }
+             }
+
diff --git a/community/amaya/amaya-fix-thotlib-png14.patch b/community/amaya/amaya-fix-thotlib-png14.patch
new file mode 100644
index 000000000..2231db2de
--- /dev/null
+++ b/community/amaya/amaya-fix-thotlib-png14.patch
@@ -0,0 +1,56 @@
+diff -aur Amaya11.3.1/Amaya/thotlib/image/pnghandler.c Amaya11.3.1.new/Amaya/thotlib/image/pnghandler.c
+--- Amaya11.3.1/Amaya/thotlib/image/pnghandler.c	2009-09-09 11:54:50.000000000 +0200
++++ Amaya11.3.1.new/Amaya/thotlib/image/pnghandler.c	2010-08-17 20:42:10.823505508 +0200
+@@ -10,9 +10,9 @@
+  *          R. Guetari (W3C/INRIA) - Initial Windows version
+  */
+ 
++#include "png.h"
+ #include "thot_gui.h"
+ #include "thot_sys.h"
+-#include "png.h"
+ #include "constmedia.h"
+ #include "typemedia.h"
+ #include "picture.h"
+@@ -128,13 +128,13 @@
+   png_byte      **ppbRowPointers;
+   unsigned char  *pixels;
+   unsigned int    i, j, passes;
+-  unsigned long   lw, lh;
++  png_uint_32 lw, lh;
+   int             iBitDepth, iColorType;
+   double          dGamma;
+ 
+     /* Checks the eight byte PNG signature*/
+     fread (pbSig, 1, 8, pfFile);
+-    if (!png_check_sig (pbSig, 8))
++    if (png_sig_cmp (pbSig, 0, 8))
+         return NULL;	
+     /* create the two png(-info) structures*/
+     png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 
+@@ -169,13 +169,13 @@
+       png_set_strip_16 (png_ptr);
+     /* Grayscale =>RGB or RGBA */
+     if (iColorType == PNG_COLOR_TYPE_GRAY || iColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
+-      png_set_gray_to_rgb (png_ptr);
++      png_set_expand_gray_1_2_4_to_8(png_ptr);
+     /* Palette indexed colors to RGB */
+     if (iColorType == PNG_COLOR_TYPE_PALETTE)
+       png_set_palette_to_rgb (png_ptr);
+     /* 8 bits / channel is needed */
+     if (iColorType == PNG_COLOR_TYPE_GRAY && iBitDepth < 8) 
+-      png_set_gray_1_2_4_to_8(png_ptr);
++      png_set_expand_gray_1_2_4_to_8(png_ptr);
+     /* all transparency type : 1 color, indexed => alpha channel*/
+     if (png_get_valid (png_ptr, info_ptr,PNG_INFO_tRNS)) 
+       png_set_tRNS_to_alpha (png_ptr);
+@@ -822,7 +822,7 @@
+    TtaReadClose (fp);
+    if (ret != 8)
+       return FALSE;
+-   ret = png_check_sig ((png_byte*)buf, 8);
++   ret = !png_sig_cmp ((png_byte*)buf, 0, 8);
+    if (ret) return (TRUE);
+    return(FALSE);
+ }
+
diff --git a/community/amaya/amaya-fix-thotlib-wxfile.patch b/community/amaya/amaya-fix-thotlib-wxfile.patch
new file mode 100644
index 000000000..537419040
--- /dev/null
+++ b/community/amaya/amaya-fix-thotlib-wxfile.patch
@@ -0,0 +1,16 @@
+diff -aur Amaya11.3.1/Amaya/thotlib/base/platform.c Amaya11.3.1.new/Amaya/thotlib/base/platform.c
+--- Amaya11.3.1/Amaya/thotlib/base/platform.c	2009-12-02 12:23:07.000000000 +0100
++++ Amaya11.3.1.new/Amaya/thotlib/base/platform.c	2010-08-17 21:37:25.699840595 +0200
+@@ -329,9 +329,9 @@
+     {
+       tmp = (char *)TtaGetMemory (strlen(targetFileName)+10);
+       sprintf (tmp, "%s.tmp", targetFileName);
+-      wxFile::wxFile (targetFile, wxFile::write);
++      wxFile (targetFile, wxFile::write);
+       tmpFile = TtaConvMessageToWX(tmp);
+-      wxFile::wxFile (tmpFile, wxFile::write);
++      wxFile (tmpFile, wxFile::write);
+       result = wxFile::Exists(targetFile);
+       if (result)
+         result = wxConcatFiles (tmpFile, sourceFile, targetFile);
+
diff --git a/community/amaya/amaya-splitmode.patch b/community/amaya/amaya-splitmode.patch
new file mode 100644
index 000000000..e733955e4
--- /dev/null
+++ b/community/amaya/amaya-splitmode.patch
@@ -0,0 +1,10 @@
+diff -aur Amaya11.3.1/Amaya/thotlib/dialogue/AmayaPage.cpp Amaya11.3.1.new/Amaya/thotlib/dialogue/AmayaPage.cpp
+--- Amaya11.3.1/Amaya/thotlib/dialogue/AmayaPage.cpp	2009-09-09 12:07:49.000000000 +0200
++++ Amaya11.3.1.new/Amaya/thotlib/dialogue/AmayaPage.cpp	2010-08-17 20:54:13.606772367 +0200
+@@ -383,7 +383,7 @@
+ 					    /*| wxSP_PERMIT_UNSPLIT*/
+ #endif /* 0 */
+ 					    );
+-  SetSplitMode(0); // undefined
++  SetSplitMode(wxSPLIT_VERTICAL); // undefined not allowed
+   p_sizerTop2->Add( m_pSplitterWindow, 1, wxEXPAND, 0 );
diff --git a/community/amaya/amaya-wakeupidle.patch b/community/amaya/amaya-wakeupidle.patch
new file mode 100644
index 000000000..45949f322
--- /dev/null
+++ b/community/amaya/amaya-wakeupidle.patch
@@ -0,0 +1,11 @@
+diff -aur Amaya11.3.1/Amaya/thotlib/base/AmayaApp.cpp Amaya11.3.1.new/Amaya/thotlib/base/AmayaApp.cpp
+--- Amaya11.3.1/Amaya/thotlib/base/AmayaApp.cpp	2009-10-29 09:59:22.000000000 +0100
++++ Amaya11.3.1.new/Amaya/thotlib/base/AmayaApp.cpp	2010-08-17 21:01:23.823806630 +0200
+@@ -326,7 +326,7 @@
+ 
+   // Log window.
+ //  new wxLogWindow(NULL, wxT("Amaya traces"));
+-
++  wxWakeUpIdle();
+   return true;
+ }
diff --git a/community/amaya/amaya-wxyield.patch b/community/amaya/amaya-wxyield.patch
new file mode 100644
index 000000000..69235f5d4
--- /dev/null
+++ b/community/amaya/amaya-wxyield.patch
@@ -0,0 +1,21 @@
+diff -aur Amaya11.3.1/Amaya/thotlib/dialogue/appdialogue_wx.c Amaya11.3.1.new/Amaya/thotlib/dialogue/appdialogue_wx.c
+--- Amaya11.3.1/Amaya/thotlib/dialogue/appdialogue_wx.c	2009-09-15 17:17:02.000000000 +0200
++++ Amaya11.3.1.new/Amaya/thotlib/dialogue/appdialogue_wx.c	2010-08-17 21:07:40.973352206 +0200
+@@ -993,7 +993,7 @@
+    * this function waits for complete widgets initialisation */
+   /* notice: no not use safe yield here because it use a
+      wxWindowDisabler and it makes menus blinking */
+-  wxYield();
++  wxTheApp->Yield(TRUE);
+   return TRUE;
+ }
+ 
+@@ -1824,7 +1824,7 @@
+   TtaHandlePendingEvents();
+   /* wait for frame initialisation (needed by opengl) 
+    * this function waits for complete widgets initialisation */
+-  wxYield();
++  wxTheApp->Yield(TRUE);
+   /* fix accessibility problem : force the created frame to get the focus */
+   TtaRedirectFocus();
+
diff --git a/community/amaya/amaya.install b/community/amaya/amaya.install
new file mode 100644
index 000000000..a3b887285
--- /dev/null
+++ b/community/amaya/amaya.install
@@ -0,0 +1,14 @@
+post_install() {
+  xdg-desktop-menu forceupdate &> /dev/null || :
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
+}
+
+post_upgrade() {
+  xdg-desktop-menu forceupdate &> /dev/null || :
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
+}
+
+post_remove() {
+  xdg-desktop-menu forceupdate &> /dev/null || :
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
+}