diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-01-09 13:47:51 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-01-09 13:47:51 +0000 |
commit | 7a3611f5caa5e34c1f2b582640f97b733110ae63 (patch) | |
tree | 5b0baf1ad1b36444ffbf73707a377b15fc67692f /community/amaya | |
parent | 46783b68621b6ad45cdd9ed64cfa8cdcfbc6f318 (diff) |
Mon Jan 9 13:47:49 UTC 2012
Diffstat (limited to 'community/amaya')
-rw-r--r-- | community/amaya/PKGBUILD | 69 | ||||
-rw-r--r-- | community/amaya/amaya-fix-amaya-wxfile.patch | 13 | ||||
-rw-r--r-- | community/amaya/amaya-fix-thotlib-png14.patch | 56 | ||||
-rw-r--r-- | community/amaya/amaya-fix-thotlib-wxfile.patch | 16 | ||||
-rw-r--r-- | community/amaya/amaya-splitmode.patch | 10 | ||||
-rw-r--r-- | community/amaya/amaya-wakeupidle.patch | 11 | ||||
-rw-r--r-- | community/amaya/amaya-wxyield.patch | 21 | ||||
-rw-r--r-- | community/amaya/amaya.install | 14 |
8 files changed, 0 insertions, 210 deletions
diff --git a/community/amaya/PKGBUILD b/community/amaya/PKGBUILD deleted file mode 100644 index b054eb7ad..000000000 --- a/community/amaya/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 54286 2011-08-16 07:11:40Z 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=8 -pkgdesc="W3C's Editor/Browser" -arch=('i686' 'x86_64') -url="http://www.w3.org/Amaya/" -license=('Custom/BSD') -depends=('wxgtk' 'libgl' 'raptor1' 'libxt') -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 deleted file mode 100644 index 6f5b0cf5f..000000000 --- a/community/amaya/amaya-fix-amaya-wxfile.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 2231db2de..000000000 --- a/community/amaya/amaya-fix-thotlib-png14.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index 537419040..000000000 --- a/community/amaya/amaya-fix-thotlib-wxfile.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index e733955e4..000000000 --- a/community/amaya/amaya-splitmode.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 45949f322..000000000 --- a/community/amaya/amaya-wakeupidle.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 69235f5d4..000000000 --- a/community/amaya/amaya-wxyield.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index a3b887285..000000000 --- a/community/amaya/amaya.install +++ /dev/null @@ -1,14 +0,0 @@ -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 || : -} |