[40320] trunk/dports/x11/gtk2
afb at macports.org
afb at macports.org
Mon Sep 29 07:19:42 PDT 2008
Revision: 40320
http://trac.macports.org/changeset/40320
Author: afb at macports.org
Date: 2008-09-29 07:19:42 -0700 (Mon, 29 Sep 2008)
Log Message:
-----------
fix jasper libraries (#16689) and modules linking
Modified Paths:
--------------
trunk/dports/x11/gtk2/Portfile
Added Paths:
-----------
trunk/dports/x11/gtk2/files/
trunk/dports/x11/gtk2/files/patch-configure.diff
trunk/dports/x11/gtk2/files/patch-modules-gail.diff
trunk/dports/x11/gtk2/files/patch-modules-printbackends.diff
Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile 2008-09-29 14:13:52 UTC (rev 40319)
+++ trunk/dports/x11/gtk2/Portfile 2008-09-29 14:19:42 UTC (rev 40320)
@@ -5,7 +5,7 @@
name gtk2
version 2.14.3
-revision 1
+revision 2
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
maintainers nox openmaintainer
@@ -25,6 +25,9 @@
ftp://ftp.gtk.org/pub/gtk/v${branch}/ \
http://ftp.gtk.org/pub/gtk/v${branch}/
+patchfiles patch-configure.diff \
+ patch-modules-gail.diff patch-modules-printbackends.diff
+
if {[variant_isset no_x11]} {
default_variants +quartz
}
Added: trunk/dports/x11/gtk2/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-configure.diff (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-configure.diff 2008-09-29 14:19:42 UTC (rev 40320)
@@ -0,0 +1,30 @@
+--- ./configure.in.orig 2008-09-19 06:44:47.000000000 +0200
++++ ./configure.in 2008-09-29 14:20:44.000000000 +0200
+@@ -1163,8 +1163,11 @@ if $dynworks ; then
+ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+ fi
++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
++ fi
+ else
+- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+
+ # Checks to see whether we should include mediaLib
+--- ./configure.orig 2008-09-24 05:11:45.000000000 +0200
++++ ./configure 2008-09-29 14:20:57.000000000 +0200
+@@ -29764,8 +29764,11 @@ if $dynworks ; then
+ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+ fi
++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
++ fi
+ else
+- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+
+ # Checks to see whether we should include mediaLib
Added: trunk/dports/x11/gtk2/files/patch-modules-gail.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-modules-gail.diff (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-modules-gail.diff 2008-09-29 14:19:42 UTC (rev 40320)
@@ -0,0 +1,312 @@
+--- modules/other/gail//libgail-util/Makefile.am.orig 2008-09-19 06:44:18.000000000 +0200
++++ modules/other/gail//libgail-util/Makefile.am 2008-09-29 14:46:32.000000000 +0200
+@@ -62,6 +62,7 @@ libgailutil_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+ libgailutil_la_LIBADD = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/other/gail/libgail-util/Makefile.in.orig 2008-09-29 14:46:53.000000000 +0200
++++ modules/other/gail/libgail-util/Makefile.in 2008-09-29 14:46:47.000000000 +0200
+@@ -452,6 +452,7 @@
+
+
+ libgailutil_la_LIBADD = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/other/gail//tests/Makefile.am.orig 2008-09-19 06:44:18.000000000 +0200
++++ modules/other/gail//tests/Makefile.am 2008-09-29 14:51:33.000000000 +0200
+@@ -64,6 +64,7 @@ libtestaction_la_SOURCES = \
+
+ libtestaction_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -76,6 +77,7 @@ libtestbutton_la_SOURCES = \
+
+ libtestbutton_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -88,6 +90,7 @@ libtestcombo_la_SOURCES = \
+
+ libtestcombo_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -98,6 +101,7 @@ libtestcomponent_la_SOURCES = \
+
+ libtestcomponent_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -108,6 +112,7 @@ libtestimage_la_SOURCES = \
+
+ libtestimage_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -120,6 +125,7 @@ libtestmenuitem_la_SOURCES = \
+
+ libtestmenuitem_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -132,6 +138,7 @@ libtestnotebook_la_SOURCES = \
+
+ libtestnotebook_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -144,6 +151,7 @@ libtestobject_la_SOURCES = \
+
+ libtestobject_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -156,6 +164,7 @@ libtestoptionmenu_la_SOURCES = \
+
+ libtestoptionmenu_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -168,6 +177,7 @@ libtestpaned_la_SOURCES = \
+
+ libtestpaned_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -180,6 +190,7 @@ libtestprops_la_SOURCES = \
+
+ libtestprops_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -190,6 +201,7 @@ libtestselection_la_SOURCES = \
+
+ libtestselection_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -200,6 +212,7 @@ libteststatusbar_la_SOURCES = \
+
+ libteststatusbar_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -214,6 +227,7 @@ libtesttable_la_SOURCES = \
+
+ libtesttable_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -228,6 +242,7 @@ libtesttext_la_SOURCES = \
+
+ libtesttext_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -240,6 +255,7 @@ libtesttoplevel_la_SOURCES = \
+
+ libtesttoplevel_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -252,6 +268,7 @@ libtesttreetable_la_SOURCES = \
+
+ libtesttreetable_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -262,6 +279,7 @@ libtestvalues_la_SOURCES = \
+
+ libtestvalues_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+--- modules/other/gail//tests/Makefile.in.orig 2008-09-24 05:11:42.000000000 +0200
++++ modules/other/gail//tests/Makefile.in 2008-09-29 14:52:20.000000000 +0200
+@@ -472,6 +472,7 @@ libtestaction_la_SOURCES = \
+
+ libtestaction_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -486,6 +487,7 @@ libtestbutton_la_SOURCES = \
+
+ libtestbutton_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -500,6 +502,7 @@ libtestcombo_la_SOURCES = \
+
+ libtestcombo_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -512,6 +515,7 @@ libtestcomponent_la_SOURCES = \
+
+ libtestcomponent_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -524,6 +528,7 @@ libtestimage_la_SOURCES = \
+
+ libtestimage_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -538,6 +543,7 @@ libtestmenuitem_la_SOURCES = \
+
+ libtestmenuitem_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -552,6 +558,7 @@ libtestnotebook_la_SOURCES = \
+
+ libtestnotebook_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -566,6 +573,7 @@ libtestobject_la_SOURCES = \
+
+ libtestobject_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -580,6 +588,7 @@ libtestoptionmenu_la_SOURCES = \
+
+ libtestoptionmenu_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -594,6 +603,7 @@ libtestpaned_la_SOURCES = \
+
+ libtestpaned_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -608,6 +618,7 @@ libtestprops_la_SOURCES = \
+
+ libtestprops_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -620,6 +631,7 @@ libtestselection_la_SOURCES = \
+
+ libtestselection_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -632,6 +644,7 @@ libteststatusbar_la_SOURCES = \
+
+ libteststatusbar_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -648,6 +661,7 @@ libtesttable_la_SOURCES = \
+
+ libtesttable_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -664,6 +678,7 @@ libtesttext_la_SOURCES = \
+
+ libtesttext_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -678,6 +693,7 @@ libtesttoplevel_la_SOURCES = \
+
+ libtesttoplevel_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -692,6 +708,7 @@ libtesttreetable_la_SOURCES = \
+
+ libtesttreetable_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
+@@ -704,6 +721,7 @@ libtestvalues_la_SOURCES = \
+
+ libtestvalues_la_LDFLAGS = \
+ -rpath $(moduledir) -module -avoid-version $(no_undefined) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS) \
Added: trunk/dports/x11/gtk2/files/patch-modules-printbackends.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-modules-printbackends.diff (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-modules-printbackends.diff 2008-09-29 14:19:42 UTC (rev 40320)
@@ -0,0 +1,62 @@
+--- modules/printbackends/cups/Makefile.am.orig 2008-09-19 06:44:19.000000000 +0200
++++ modules/printbackends/cups/Makefile.am 2008-09-29 15:14:22.000000000 +0200
+@@ -16,6 +16,7 @@ INCLUDES = \
+ $(GTK_DEBUG_FLAGS)
+
+ LDADDS = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/printbackends/cups/Makefile.in.orig 2008-09-24 05:11:42.000000000 +0200
++++ modules/printbackends/cups/Makefile.in 2008-09-29 15:14:34.000000000 +0200
+@@ -422,6 +422,7 @@ INCLUDES = \
+
+
+ LDADDS = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/printbackends/file/Makefile.am.orig 2008-09-19 06:44:19.000000000 +0200
++++ modules/printbackends/file/Makefile.am 2008-09-29 15:09:09.000000000 +0200
+@@ -28,6 +28,7 @@ libprintbackend_file_la_LDFLAGS = \
+ -avoid-version -module $(no_undefined)
+
+ libprintbackend_file_la_LIBADD = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/printbackends/file/Makefile.in.orig 2008-09-24 05:11:42.000000000 +0200
++++ modules/printbackends/file/Makefile.in 2008-09-29 15:10:38.000000000 +0200
+@@ -437,6 +437,7 @@ libprintbackend_file_la_LDFLAGS = \
+
+
+ libprintbackend_file_la_LIBADD = \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+--- modules/printbackends/lpr/Makefile.am.orig 2008-09-19 06:44:19.000000000 +0200
++++ modules/printbackends/lpr/Makefile.am 2008-09-29 15:13:10.000000000 +0200
+@@ -16,6 +16,8 @@ INCLUDES = \
+
+ LDADDS = \
+ $(GTK_DEP_LIBS) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
++ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gtk/$(gtktargetlib)
+
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+--- modules/printbackends/lpr/Makefile.in.orig 2008-09-24 05:11:42.000000000 +0200
++++ modules/printbackends/lpr/Makefile.in 2008-09-29 15:13:20.000000000 +0200
+@@ -422,6 +422,8 @@ INCLUDES = \
+
+ LDADDS = \
+ $(GTK_DEP_LIBS) \
++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
++ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gtk/$(gtktargetlib)
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080929/e05fe202/attachment-0001.html
More information about the macports-changes
mailing list