mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-30 20:18:52 +02:00
Merge all changes from trunk
This commit is contained in:
@@ -14,7 +14,7 @@ BUILD {
|
||||
fi
|
||||
libtoolize --force --copy --install
|
||||
autoreconf -i
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ BUILD {
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@@ -7,22 +7,23 @@ STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd graphviz-2.24.0
|
||||
cp /boot/common/share/libtool/config/config.guess config
|
||||
cp /boot/common/share/libtool/config/config.guess lib/gd/config
|
||||
cp /boot/common/share/libtool/config/config.guess libltdl
|
||||
cp /boot/common/share/libtool/config/config.sub config
|
||||
cp /boot/common/share/libtool/config/config.sub lib/gd/config
|
||||
cp /boot/common/share/libtool/config/config.sub libltdl
|
||||
libtoolize -fci
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
./configure --prefix=/boot/common --disable-shared --enable-static CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv"
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
CFLAGS="-O0" \
|
||||
LDFLAGS="-L`finddir B_COMMON_LIB_DIRECTORY` -liconv"
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd graphviz-2.24.0
|
||||
make install
|
||||
cd /boot/common/bin
|
||||
cd `finddir B_COMMON_BIN_DIRECTORY`
|
||||
ln -s dot_static dot
|
||||
}
|
||||
|
||||
LICENSE="CPL v1.0"
|
||||
COPYRIGHT="1994-2010 AT&T Corp."
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DESCRIPTION="graphviz - Open Source Graph Visualization Software."
|
||||
HOMEPAGE="http://www.graphviz.org/"
|
||||
DESCRIPTION="graphviz - Open Source Graph Visualization Software."
|
||||
HOMEPAGE="http://www.graphviz.org/"
|
||||
SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz"
|
||||
CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee"
|
||||
REVISION="1"
|
||||
@@ -7,17 +7,20 @@ STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd graphviz-2.26.3
|
||||
libtoolize --force --copy --install
|
||||
libtoolize -fci
|
||||
autoconf
|
||||
./configure --prefix=/boot/common --disable-shared --enable-static --disable-perl CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv"
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
|
||||
--enable-shared \
|
||||
--disable-perl
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd graphviz-2.26.3
|
||||
make install
|
||||
cd ${DESTDIR}/boot/common/bin
|
||||
ln -s dot_static dot
|
||||
}
|
||||
|
||||
LICENSE="CPL v1.0"
|
||||
COPYRIGHT="1994-2010 AT&T Corp."
|
||||
|
||||
@@ -4,7 +4,7 @@ diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in
|
||||
@@ -427,6 +427,9 @@
|
||||
/* Define to 1 if you have struct dioattr */
|
||||
#undef HAVE_STRUCT_DIOATTR
|
||||
|
||||
|
||||
+/* Define to 1 if you have the <sysexits.h> header file. */
|
||||
+#undef HAVE_SYSEXITS_H
|
||||
+
|
||||
@@ -14,13 +14,13 @@ diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in
|
||||
@@ -578,6 +581,9 @@
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
|
||||
+/* Define to the home page for this package. */
|
||||
+#undef PACKAGE_URL
|
||||
+
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
|
||||
diff -up graphviz-2.26.3/configure.ac.orig graphviz-2.26.3/configure.ac
|
||||
--- graphviz-2.26.3/configure.ac.orig 2010-01-26 09:00:29.029622272 -0700
|
||||
+++ graphviz-2.26.3/configure.ac 2010-03-18 18:03:33.265289728 -0600
|
||||
@@ -82,9 +82,52 @@ diff -up graphviz-2.26.3/lib/gd/gd_png.c.orig graphviz-2.26.3/lib/gd/gd_png.c
|
||||
@@ -150,7 +150,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
- if (!png_check_sig (sig, 8)) { /* bad signature */
|
||||
+ if (png_sig_cmp(sig, 0, 8)) { /* bad signature */
|
||||
return NULL; /* bad signature */
|
||||
}
|
||||
|
||||
|
||||
diff -up graphviz-2.26.3/lib/gvc/gvcext.h.orig graphviz-2.26.3/lib/gvc/gvcext.h
|
||||
--- graphviz-2.26.3/lib/gvc/gvcext.h.orig 2009-07-08 17:14:20.054525952 +0200
|
||||
+++ graphviz-2.26.3/lib/gvc/gvcext.h 2011-04-13 19:38:04.150470656 +0200
|
||||
@@ -65,6 +65,9 @@ extern "C" {
|
||||
|
||||
typedef struct gvplugin_available_s gvplugin_available_t;
|
||||
|
||||
+#undef lt_preloaded_symbols
|
||||
+#define lt_preloaded_symbols lt_GRAPHVIZ_LTX_preloaded_symbols
|
||||
+
|
||||
/*visual studio*/
|
||||
#ifdef WIN32_DLL
|
||||
#ifndef GVC_EXPORTS
|
||||
diff -up graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig graphviz-2.26.3/lib/vmalloc/vmhdr.h
|
||||
--- graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig 2009-06-03 03:10:55.040894464 +0200
|
||||
+++ graphviz-2.26.3/lib/vmalloc/vmhdr.h 2011-04-04 18:51:05.289931264 +0200
|
||||
@@ -54,6 +54,10 @@ extern "C" {
|
||||
#include <ast_common.h>
|
||||
#include "FEATURE/vmalloc"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ #undef _hdr_malloc
|
||||
+#endif
|
||||
+
|
||||
#endif /*_PACKAGE_ast*/
|
||||
|
||||
#undef free
|
||||
diff -up graphviz-2.26.3/lib/common/const.h.orig graphviz-2.26.3/lib/common/const.h
|
||||
--- graphviz-2.26.3/lib/common/const.h.orig 2009-08-28 21:46:42.059506688 +0200
|
||||
+++ graphviz-2.26.3/lib/common/const.h 2011-02-18 18:48:44.856162304 +0100
|
||||
@@ -67,7 +67,11 @@
|
||||
#define DEFAULT_FONTSIZE 14.0
|
||||
#define DEFAULT_LABEL_FONTSIZE 11.0 /* for head/taillabel */
|
||||
#define MIN_FONTSIZE 1.0
|
||||
-#define DEFAULT_FONTNAME "Times-Roman"
|
||||
+#ifdef __HAIKU__
|
||||
+ #define DEFAULT_FONTNAME "DejaVuSans"
|
||||
+#else
|
||||
+ #define DEFAULT_FONTNAME "Times-Roman"
|
||||
+#endif
|
||||
#define DEFAULT_FILL "lightgrey"
|
||||
#define LINESPACING 1.20
|
||||
|
||||
|
||||
25
media-gfx/hqx/hqx-1.1.bep
Normal file
25
media-gfx/hqx/hqx-1.1.bep
Normal file
@@ -0,0 +1,25 @@
|
||||
DESCRIPTION="hqx ('hq' stands for 'high quality' and 'x' stands for magnification) is one of the pixel art scaling algorithms developed by Maxim Stepin"
|
||||
HOMEPAGE="http://code.google.com/p/hqx/"
|
||||
SRC_URI="http://hqx.googlecode.com/files/hqx-1.1.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="untested"
|
||||
DEPEND="media-libs/devil >= 1.7.8"
|
||||
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
|
||||
|
||||
CHECKSUM_MD5="e4d3132b5f3614a75975b62fe6a066bb"
|
||||
BUILD {
|
||||
cd hqx-1.1
|
||||
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
|
||||
cd hqx-1.1
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="GNU LGPL v2"
|
||||
COPYRIGHT="2003 Maxim Stepin,
|
||||
2010 Cameron Zemek"
|
||||
@@ -1,6 +1,6 @@
|
||||
DESCRIPTION="ImageMagick - A collection of tools and libraries for many image formats"
|
||||
HOMEPAGE="A collection of tools and libraries for many image formats"
|
||||
SRC_URI="ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick.tar.gz"
|
||||
SRC_URI="http://www.imagemagick.org/download/legacy/ImageMagick-6.6.1-10.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="media-libs/libpng,
|
||||
@@ -19,7 +19,7 @@ BUILD {
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common \
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--enable-shared \
|
||||
--enable-fast-install \
|
||||
--with-modules=yes \
|
||||
|
||||
@@ -12,7 +12,7 @@ BUILD {
|
||||
|
||||
INSTALL {
|
||||
cd pngcrush-1.7.6-nolib
|
||||
cp -a -f pngcrush /boot/common/bin
|
||||
cp -a -f pngcrush `finddir B_COMMON_BIN_DIRECTORY`
|
||||
}
|
||||
LICENSE="LibPNG"
|
||||
COPYRIGHT="1998-2009 Glenn Randers-Pehrson
|
||||
|
||||
Reference in New Issue
Block a user