Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv454/common/main/finkinfo/libs
Modified Files:
libgdiplus.info libgdiplus.patch
Log Message:
fix libgdiplus build
Index: libgdiplus.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/libgdiplus.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgdiplus.patch 24 Mar 2005 20:29:06 -0000 1.4
+++ libgdiplus.patch 6 Jun 2005 15:13:12 -0000 1.5
@@ -1,17 +1,19 @@
---- libgdiplus-1.1.5/Makefile.in Fri Mar 18 08:59:48 2005
-+++ libgdiplus-1.1.5-new/Makefile.in Thu Mar 24 14:39:08 2005
-@@ -182,7 +182,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = libpixman cairo src tests
-+SUBDIRS = libpixman cairo src tests
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libgdiplus.pc
- DISTCLEANFILES = libgdiplus.pc
---- libgdiplus-1.1.5/configure Fri Mar 18 08:59:50 2005
-+++ libgdiplus-1.1.5-new/configure Thu Mar 24 14:55:50 2005
-@@ -19390,7 +19390,7 @@
+diff -uNr libgdiplus-1.1.7/cairo/configure libgdiplus-1.1.7-new/cairo/configure
+--- libgdiplus-1.1.7/cairo/configure Tue May 3 14:44:58 2005
++++ libgdiplus-1.1.7-new/cairo/configure Mon Jun 6 10:53:19 2005
+@@ -22369,7 +22369,7 @@
+ enableval="$enable_glitz"
+ use_glitz=$enableval
+ else
+- use_glitz=yes
++ use_glitz=no
+ fi;
+
+ if test "x$use_glitz" = "xyes"; then
+diff -uNr libgdiplus-1.1.7/configure libgdiplus-1.1.7-new/configure
+--- libgdiplus-1.1.7/configure Tue May 3 14:44:36 2005
++++ libgdiplus-1.1.7-new/configure Mon Jun 6 11:08:08 2005
+@@ -19633,7 +19633,7 @@
_ACEOF
else
@@ -20,7 +22,43 @@
echo Cairo installation OK
else
{ { echo "$as_me:$LINENO: error: \"Did not find Cairo ==
0.3.0\"" >&5
-@@ -20954,13 +20954,13 @@
+@@ -20004,7 +20004,7 @@
+ #define _REENTRANT 1
+ _ACEOF
+
+- CFLAGS="-pthreads $CFLAGS"
++ CFLAGS="$CFLAGS"
+ ;;
+
+ *-*-darwin*)
+@@ -20014,7 +20014,7 @@
+ _ACEOF
+
+ CFLAGS="-no-cpp-precomp $CFLAGS"
+- LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
++ LDFLAGS="-Xlinker -framework -Xlinker ApplicationServices
$LDFLAGS"
+ ;;
+
+ *)
+@@ -20037,7 +20037,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_CFLAGS=$CFLAGS
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+
+
+ ac_ext=c
+@@ -20106,7 +20106,7 @@
+ if test $myapp_cv_gcc_pthread = yes
+ then
+ myapp_threads=""
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+ else
+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+ echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+@@ -21197,13 +21197,13 @@
fi
if test x$with_libungif != xno && test -z "$LIBUNGIF"; then
@@ -37,7 +75,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21157,7 +21157,7 @@
+@@ -21400,7 +21400,7 @@
fi
if test $ac_cv_header_gif_lib_h = yes; then
Index: libgdiplus.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/libgdiplus.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- libgdiplus.info 6 Jun 2005 02:04:22 -0000 1.20
+++ libgdiplus.info 6 Jun 2005 15:13:12 -0000 1.21
@@ -5,9 +5,8 @@
Source-MD5: 458c2c4aec84ac1cccb15b6c31fa8f7a
Patch: %n.patch
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
-# FIXME: add cairo dep back in when libgdiplus supports cairo 0.4.0
-Depends: libgettext3-shlibs, glib2-shlibs (>= 2.2.1-4), libiconv,
libjpeg-shlibs, libpixman1-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs,
giflib-shlibs | libungif-shlibs, mono (>= %v-1)
-BuildDepends: libgettext3, gettext-tools, glib2-dev (>= 2.0.4-1), glib2 (>=
2.0.4-1), glitz (>= 0.4.0-1), libiconv-dev, libicu31-dev, libicu32-dev,
libjpeg, libpixman1, libpng3, libtiff, libungif | giflib, mono-dev (>= %v-1),
pkgconfig
+Depends: cairo (>= 0.5.0-1), libgettext3-shlibs, glib2-shlibs (>= 2.2.1-4),
libiconv, libjpeg-shlibs, libpixman1-shlibs (>= 0.1.5-1), libpng3-shlibs (>=
1.2.5-4), libtiff-shlibs, giflib-shlibs | libungif-shlibs, mono (>= %v-1)
+BuildDepends: cairo (>= 0.5.0-1), libgettext3-dev, gettext-tools, glib2-dev
(>= 2.0.4-1), glib2 (>= 2.0.4-1), glitz (>= 0.4.0-1), libiconv-dev,
libicu31-dev, libicu32-dev, libjpeg, libpixman1 (>= 0.1.5-1), libpng3, libtiff,
libungif | giflib, mono-dev (>= %v-1), pkgconfig
Homepage: http://go-mono.com/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Description: System.Drawing implementation for Mono
@@ -15,12 +14,11 @@
SetCPPFLAGS: -I%p/include
NoSETLDFLAGS: true
SetLIBS: -L%p/lib
-ConfigureParams: --mandir=%p/share/man --with-cairo=installed
--disable-dependency-tracking
+ConfigureParams: --mandir=%p/share/man --with-cairo=included
--disable-dependency-tracking
CompileScript: <<
#!/bin/sh -ex
export lt_cv_sys_max_cmd_len=65536
- perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
./configure %c
make
<<
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
