cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix www/amaya/browser:

Browse Source 
- don't declare static stuff (that's only needed in one file) as
  extern in a header file.

- Use system jpeg again.
This commit is contained in:
kili 2010-06-06 12:27:26 +00:00
parent bc00c71e7e
commit 1b5771905c
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/amaya/browser/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:39 naddy Exp $
# $OpenBSD: Makefile,v 1.22 2010/06/06 12:27:26 kili Exp $
#
# Many variables moved to ../Makefile.inc
@ -6,7 +6,7 @@ COMMENT= test-bed browser/authoring tool of the W3C
AMAYA_VERSION= 5.1
DISTNAME= amaya-src-${AMAYA_VERSION}
PKGNAME= amaya-${AMAYA_VERSION}p5
PKGNAME= amaya-${AMAYA_VERSION}p6
HOMEPAGE= http://www.w3.org/Amaya/

21
www/amaya/browser/patches/patch-Amaya_configure_in
View File

@ -1,6 +1,17 @@
$OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
--- Amaya/configure.in.orig 2001-07-03 13:23:50.000000000 +0200
+++ Amaya/configure.in 2003-12-20 02:05:54.000000000 +0100
$OpenBSD: patch-Amaya_configure_in,v 1.3 2010/06/06 12:27:26 kili Exp $
--- Amaya/configure.in.orig Tue Jul 3 13:23:50 2001
+++ Amaya/configure.in Sat Jun 5 14:30:06 2010
@@ -55,8 +55,8 @@ AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/us
AC_ARG_WITH(graphic-libs, [ --without-graphic-libs doesn't use provided libjpeg, libpng.])
if test "$withval" = "no" ; then
dnl
- AC_MSG_CHECKING([for libjpeg version = 6b])
- AC_EGREP_CPP([x 62 *x],
+ AC_MSG_CHECKING([for libjpeg version = 7])
+ AC_EGREP_CPP([x 70 *x],
[#include <jpeglib.h>
x JPEG_LIB_VERSION x],
dnl
@@ -69,8 +69,8 @@ dnl
)
dnl
@ -45,7 +56,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
- break
- fi
- done
+
+motif_includes_with=
+AC_ARG_WITH(motif-includes,
+[ --with-motif-includes=DIR
@ -61,7 +72,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
+ use_gtk="$withval")
+no_gtk=yes
+if test "$use_gtk" != "no" ; then
+
GTK_INCLUDES="`gtk-config --cflags`"
AC_SUBST(GTK_INCLUDES)
GTK_LIBRARIES="`gtk-config --libs` -lgdk_imlib -ltiff -lgif"

16
www/amaya/browser/patches/patch-Amaya_thotlib_internals_var_boxes_tv_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Amaya_thotlib_internals_var_boxes_tv_h,v 1.1 2010/06/06 12:27:26 kili Exp $
--- Amaya/thotlib/internals/var/boxes_tv.h.orig Thu Mar 2 12:50:29 2000
+++ Amaya/thotlib/internals/var/boxes_tv.h Sat Jun 5 13:47:13 2010
@@ -23,12 +23,3 @@ THOT_EXPORT ThotBool AnyWidthUpdate;
/* paragraphe to be reformatted after insertion */
THOT_EXPORT PtrAbstractBox LastInsertParagraph;
THOT_EXPORT PtrAbstractBox LastInsertCell;
-
-/* text element where the last insertion is done */
-THOT_EXPORT PtrElement LastInsertElText;
-THOT_EXPORT PtrElement LastInsertElement;
-THOT_EXPORT int LastInsertThotWindow;
-
-/* attribute for which a presentation abstract box has been modified */
-THOT_EXPORT PtrAttribute LastInsertAttr;
-THOT_EXPORT PtrElement LastInsertAttrElem;