Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1090
Modified Files:
gtkglext1.info gtkglext1.patch
Log Message:
All sorts o' build fixes
Index: gtkglext1.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gtkglext1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkglext1.patch 18 Sep 2008 06:18:05 -0000 1.1
+++ gtkglext1.patch 10 Apr 2009 09:04:40 -0000 1.2
@@ -1,37 +1,46 @@
-diff -Nurd -x'*~' gtkglext-1.0.6.orig/configure gtkglext-1.0.6/configure
---- gtkglext-1.0.6.orig/configure 2004-03-10 04:51:45.000000000 -0500
-+++ gtkglext-1.0.6/configure 2008-09-18 01:54:17.000000000 -0400
-@@ -25594,8 +25594,8 @@
- GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
+diff -Nurd -x'*~' gtkglext-1.0.6.orig/configure.in gtkglext-1.0.6/configure.in
+--- gtkglext-1.0.6.orig/configure.in 2004-03-10 04:47:37.000000000 -0500
++++ gtkglext-1.0.6/configure.in 2009-04-10 04:37:52.000000000 -0400
+@@ -56,7 +56,7 @@
+ m4_define([gmodule_required_version], [2.0.0])
+
+ # Pango
+-m4_define([pango_pkg], [pango])
++m4_define([pango_pkg], [pangox])
+ m4_define([pango_required_version], [1.0.0])
+
+ # PangoFT2
+@@ -792,8 +792,8 @@
+ GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
-GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags
$GDKGLEXT_PACKAGES`"
-GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs
$GDKGLEXT_PACKAGES` $MATH_LIB"
+GDKGLEXT_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`
$GDKGLEXT_EXTRA_CFLAGS"
+GDKGLEXT_DEP_LIBS="`$PKG_CONFIG --libs $GDKGLEXT_PACKAGES`
$GDKGLEXT_EXTRA_LIBS $MATH_LIB"
-
-
-
-@@ -25605,8 +25605,8 @@
- GTKGLEXT_PACKAGES="gtk+-2.0"
+ AC_SUBST([GDKGLEXT_PACKAGES])
+ AC_SUBST([GDKGLEXT_EXTRA_CFLAGS])
+ AC_SUBST([GDKGLEXT_EXTRA_LIBS])
+@@ -803,8 +803,8 @@
+ GTKGLEXT_PACKAGES="gtk_pkg"
GTKGLEXT_EXTRA_CFLAGS=""
GTKGLEXT_EXTRA_LIBS=""
-GTKGLEXT_DEP_CFLAGS="$GTKGLEXT_EXTRA_CFLAGS $GDKGLEXT_EXTRA_CFLAGS
`$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES`"
-GTKGLEXT_DEP_LIBS="$GTKGLEXT_EXTRA_LIBS $GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG
--libs $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES` $MATH_LIB"
+GTKGLEXT_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES
$GTKGLEXT_PACKAGES` $GTKGLEXT_EXTRA_CFLAGS $GDKGLEXT_EXTRA_CFLAGS"
+GTKGLEXT_DEP_LIBS="`$PKG_CONFIG --libs $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES`
$GTKGLEXT_EXTRA_LIBS $GDKGLEXT_EXTRA_LIBS $MATH_LIB"
+ AC_SUBST([GTKGLEXT_PACKAGES])
+ AC_SUBST([GTKGLEXT_EXTRA_CFLAGS])
+ AC_SUBST([GTKGLEXT_EXTRA_LIBS])
+diff -Nurd -x'*~' gtkglext-1.0.6.orig/gdk/x11/Makefile.am
gtkglext-1.0.6/gdk/x11/Makefile.am
+--- gtkglext-1.0.6.orig/gdk/x11/Makefile.am 2003-05-07 14:18:42.000000000
-0400
++++ gtkglext-1.0.6/gdk/x11/Makefile.am 2009-04-10 03:46:54.000000000 -0400
+@@ -15,7 +15,7 @@
+ -DGDK_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED
+-LDADDS = \
++gdkglext_x11_la_LIBADD = \
+ $(GDKGLEXT_DEP_LIBS)
-
-diff -Nurd -x'*~' gtkglext-1.0.6.orig/gdk/x11/Makefile.in
gtkglext-1.0.6/gdk/x11/Makefile.in
---- gtkglext-1.0.6.orig/gdk/x11/Makefile.in 2004-03-10 04:51:36.000000000
-0500
-+++ gtkglext-1.0.6/gdk/x11/Makefile.in 2008-09-18 01:55:50.000000000 -0400
-@@ -282,7 +282,7 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-
--libgdkglext_x11_la_LDFLAGS =
-+libgdkglext_x11_la_LDFLAGS = -lpangox-1.0 -lX11
- libgdkglext_x11_la_LIBADD =
- am__objects_1 =
- am__objects_2 = gdkglquery-x11.lo gdkglconfig-x11.lo gdkgloverlay-x11.lo \
+ gdkglext_x11_public_h_sources = \
Index: gtkglext1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gtkglext1.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtkglext1.info 16 Oct 2008 21:56:08 -0000 1.8
+++ gtkglext1.info 10 Apr 2009 09:04:40 -0000 1.9
@@ -3,7 +3,7 @@
# do not upgrade to 1.2.0...it breaks compatibility_version
#
http://sourceforge.net/tracker/index.php?func=detail&aid=1760579&group_id=54333&atid=473434
Version: 1.0.6
-Revision: 1009
+Revision: 1010
Description: OpenGL Extension to GTK
DescDetail: <<
@@ -18,13 +18,14 @@
DescPort: <<
Docs are not included (yet).
-libX11 is indirectly referenced. Maybe one of the BuildDepends .pc is
-missing a -lX11 flag?
+libgdkglext-x11 uses pango_x_font symbols, so link against pangox
+(which also links against pango) not just pango
-libgdkglext-x11 uses pango_x_font symbols, so link against pangox so
-that all dependent libs dynamically linked and all symbols resolved
+No such automake/libtool variable LIBADDS.
Make sure fink paths come before X11 paths.
+
+Need to upgrade ancient libtool to avoid libjpeg linker bug.
<<
Homepage: http://gtkglext.sourceforge.net/
License: GPL/LGPL
@@ -32,6 +33,8 @@
Depends: %n-shlibs (= %v-%r)
BuildDepends: <<
atk1 (>= 1.24.0-1),
+ autoconf,
+ automake1.10,
cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
@@ -44,7 +47,8 @@
libgettext3-dev,
libiconv-dev,
libpng3,
- pango1-xft2-ft219-dev (>= 1.22.0-4),
+ libtool2,
+ pango1-xft2-ft219-dev (>= 1.22.4-1),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.23),
x11-dev,
@@ -54,11 +58,16 @@
Source: mirror:sourceforge:gtkglext/gtkglext-%v.tar.bz2
Source-MD5: e347e028dfe98d69c5995f547108db77
PatchFile: %n.patch
-PatchFile-MD5: 3773b675e6de1567f8b682fe6b2a1e83
+PatchFile-MD5: dd3e9af6742841afa8952080445a3072
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
SetCFLAGS: -Os -pipe
-ConfigureParams: --disable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+ConfigureParams: --disable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc
+CompileScript: <<
+ autoreconf -fi
+ ./configure %c
+ make
+<<
DocFiles: AUTHORS COPYING COPYING.LIB ChangeLog ChangeLog.pre-1-0 INSTALL NEWS
README gdk/glext/README:README.gdk-glext.headers TODO
SplitOff: <<
Package: %N-shlibs
@@ -74,7 +83,7 @@
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pango1-xft2-ft219-shlibs (>= 1.22.4-1),
x11
<<
Files: lib/libgdkglext-x11-1.0.*.dylib lib/libgtkglext-x11-1.0.*.dylib
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
