SOURCES: gnome-libs-link.patch (NEW) - fix libs linking (ready for...

[qboosh]

Author: qboosh                       Date: Sun Aug 27 09:28:17 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix libs linking (ready for --as-needed now)

---- Files affected:
SOURCES:
   gnome-libs-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gnome-libs-link.patch
diff -u /dev/null SOURCES/gnome-libs-link.patch:1.1
--- /dev/null	Sun Aug 27 11:28:17 2006
+++ SOURCES/gnome-libs-link.patch	Sun Aug 27 11:28:12 2006
@@ -0,0 +1,115 @@
+--- gnome-libs-1.4.2/libgnome/Makefile.am.orig	2002-03-27 07:51:57.000000000 +0100
++++ gnome-libs-1.4.2/libgnome/Makefile.am	2006-08-27 00:39:19.925619250 +0200
+@@ -87,7 +87,7 @@
+ gnome-config.o: parse-path.cP
+ 
+ libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
+-libgnome_la_LIBADD = $(GLIB_LIBS) -lm
++libgnome_la_LIBADD = $(GLIB_LIBS) $(ESD_LIBS) $(DB_LIB) -lpopt -lm
+ 
+ bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
+ 	gconfigger gnome-gen-mimedb
+@@ -102,7 +102,7 @@
+ 
+ gnome_moz_remote_SOURCES = gnome-moz-remote.c vroot.h
+ gnome_moz_remote_LDADD = libgnome.la $(LIBSUPPORT) $(LIBGNOME_LIBS) \
+-	$(X_LIBS) $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) $(INTLLIBS)
++	$(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(INTLLIBS)
+ 
+ gconfigger_SOURCES = gconfigger.c
+ gconfigger_LDADD = libgnome.la $(LIBSUPPORT) \
+--- gnome-libs-1.4.2/configure.in.orig	2006-08-27 00:41:30.021749000 +0200
++++ gnome-libs-1.4.2/configure.in	2006-08-27 00:46:10.487277750 +0200
+@@ -117,8 +117,8 @@
+ AC_CHECK_HEADERS(dlfcn.h locale.h)
+ 
+ AC_CACHE_CHECK([for gmodule support], ac_cv_gmodule,[
+-  save_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
++  save_LIBS="$LDFLAGS"
++  LIBS="$LIBS `glib-config --libs gmodule`"
+   AC_TRY_RUN([
+ #include <gmodule.h>
+ 
+@@ -126,7 +126,7 @@
+ {
+   return g_module_supported() == 0;
+ }],ac_cv_gmodule=yes,ac_cv_gmodule=no,ac_cv_gmodule=yes)
+-  LDFLAGS="$save_LDFLAGS"])
++  LDFLAGS="$save_LIBS"])
+ if test $ac_cv_gmodule = no; then
+   AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps,
+ like panel, will not run properly.])
+@@ -346,6 +346,7 @@
+  )
+ fi
+ )
++AC_SUBST(DB_LIB)
+ 
+ dnl look for db headers
+ if test "$prefer_db" = "yes"; then
+@@ -403,7 +404,7 @@
+ dnl These are for building the appropriate lib*
+ dnl
+ LIBGNOME_LIBS="$ESD_LIBS $AUDIOFILE_LIBS $DB_LIB $GLIB_LIBS $DL_LIB"
+-LIBGNOMEUI_LIBS="$LIBGNOME_LIBS $GDK_IMLIB_LIBS $GTK_LIBS"
++LIBGNOMEUI_LIBS="$LIBGNOME_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $SM_LIBS"
+ LIBGTKXMHTML_LIBS="$XPM_LIBS $JPEG_LIBS $PNG_LIBS $Z_LIBS $GTK_LIBS"
+ LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
+ SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
+--- gnome-libs-1.4.2/libgnomeui/Makefile.am.orig	2006-08-27 01:04:18.303262000 +0200
++++ gnome-libs-1.4.2/libgnomeui/Makefile.am	2006-08-27 01:37:45.400697750 +0200
+@@ -268,7 +268,7 @@
+ 	$(man_MANS)
+ 
+ libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
+-libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
++libgnomeui_la_LIBADD = $(top_builddir)/libgnome/libgnome.la $(LIBART_LIBS) $(LIBGNOMEUI_LIBS)
+ 
+ gnome_segv_LDADD =	\
+ 	libgnomeui.la 					\
+--- gnome-libs-1.4.2/macros/gnome-x-checks.m4.orig	1999-08-19 02:50:32.000000000 +0200
++++ gnome-libs-1.4.2/macros/gnome-x-checks.m4	2006-08-27 01:57:29.014669000 +0200
+@@ -49,6 +49,7 @@
+ dnl	AC_MSG_RESULT("$dev_gtk")
+ 
+ 	GNOME_HAVE_SM=true
++	SM_LIBS=
+ 	case "$GTK_LIBS" in
+ 	 *-lSM*)
+ 	    dnl Already found it.
+@@ -56,10 +57,11 @@
+ 	 *)
+ 	    dnl Assume that if we have -lSM then we also have -lICE.
+ 	    AC_CHECK_LIB(SM, SmcSaveYourselfDone,
+-	        [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false,
++	        [SM_LIBS="-lSM -lICE"],GNOME_HAVE_SM=false,
+ 		$x_libs -lICE)
+ 	    ;;
+ 	esac
++	AC_SUBST(SM_LIBS)
+ 
+ 	if test "$GNOME_HAVE_SM" = true; then
+ 	   AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false)
+--- gnome-libs-1.4.2/zvt/Makefile.am.orig	2006-08-27 01:38:41.960232000 +0200
++++ gnome-libs-1.4.2/zvt/Makefile.am	2006-08-27 02:01:00.939913500 +0200
+@@ -22,6 +22,7 @@
+ 	zvtterm.c
+ 
+ libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir)
++libzvt_la_LIBADD = $(UTIL_LIBS) $(GTK_LIBS) $(GDK_IMLIB_LIBS)
+ 
+ libzvtinclude_HEADERS =		\
+ 	lists.h			\
+--- gnome-libs-1.4.2/libgnorba/Makefile.am.orig	2006-08-27 02:22:42.937283000 +0200
++++ gnome-libs-1.4.2/libgnorba/Makefile.am	2006-08-27 02:56:24.127599750 +0200
+@@ -80,7 +80,8 @@
+ 	Table.h
+ 
+ libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
+-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
++libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) $(top_builddir)/libgnomeui/libgnomeui.la -lm
++libgnorbagtk_la_LIBADD = $(ORBIT_LIBS) $(X_LIBS) -lX11
+ 
+ loadshlib_SOURCES = loadshlib.c
+ 
================================================================