SOURCES: gnash-system-libltdl.patch - updated for 0.8.3

[qboosh]

Author: qboosh                       Date: Mon Jun 23 22:18:10 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.8.3

---- Files affected:
SOURCES:
   gnash-system-libltdl.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gnash-system-libltdl.patch
diff -u SOURCES/gnash-system-libltdl.patch:1.1 SOURCES/gnash-system-libltdl.patch:1.2
--- SOURCES/gnash-system-libltdl.patch:1.1	Tue Mar 11 08:14:17 2008
+++ SOURCES/gnash-system-libltdl.patch	Tue Jun 24 00:18:05 2008
@@ -1,6 +1,6 @@
---- gnash-0.8.2/libbase/Makefile.am.orig	2008-02-29 16:43:34.000000000 +0100
-+++ gnash-0.8.2/libbase/Makefile.am	2008-03-10 19:33:33.645842402 +0100
-@@ -21,15 +21,9 @@
+--- gnash-0.8.3/libbase/Makefile.am.orig	2008-05-15 17:38:39.000000000 +0200
++++ gnash-0.8.3/libbase/Makefile.am	2008-06-20 07:55:08.842163560 +0200
+@@ -20,12 +20,6 @@
  # this is where Gnash plugins get installed
  pluginsdir = $(prefix)/lib/gnash/plugins
  
@@ -10,14 +10,19 @@
 -LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
 -endif
 -
+ sysconf_DATA = gnashrc gnashpluginrc
+ 
+ edit = sed \
+@@ -43,7 +37,7 @@
+ 
  # If we are using an installable libltdl, then it needs to be built
  # before libgnash, as libgnash depends on it for extensions.
 -pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
-+pkglib_LTLIBRARIES = libgnashbase.la
++pkglib_LTLIBRARIES =  libgnashbase.la
  
  libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
- 	-I.. -I$(srcdir) \
-@@ -107,7 +101,6 @@
+ 	-DSYSCONFDIR=\"$(sysconfdir)\" \
+@@ -132,7 +126,6 @@
  	$(NULL)
  
  noinst_HEADERS = \
@@ -25,7 +30,7 @@
  	container.h \
  	dlmalloc.h \
  	extension.h \
-@@ -149,17 +142,6 @@
+@@ -174,17 +167,6 @@
  
  libgnashbase_la_LDFLAGS = -release $(VERSION)
  
@@ -34,7 +39,7 @@
 -noinst_LTLIBRARIES = libltdlc.la
 -libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
 -endif
--CLEANFILES = libltdl.la libltdlc.la
+-CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
 -
 -libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
 -libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
@@ -43,26 +48,9 @@
  # Rebuild with GCC 4.x Mudflap support
  mudflap:
  	@echo "Rebuilding with GCC Mudflap support"
---- gnash-0.8.2/libmedia/Makefile.am.orig	2008-02-29 16:43:34.000000000 +0100
-+++ gnash-0.8.2/libmedia/Makefile.am	2008-03-10 20:50:48.409962557 +0100
-@@ -21,15 +21,9 @@
- # this is where Gnash plugins get installed
- pluginsdir = $(prefix)/lib/gnash/plugins
- 
--if INSTALL_LTDL
--include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
--LIBLTDLLIB = libltdl.la
--LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
--endif
--
- # If we are using an installable libltdl, then it needs to be built
- # before libgnash, as libgnash depends on it for extensions.
--pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashmedia.la
-+pkglib_LTLIBRARIES = libgnashmedia.la
- 
- libgnashmedia_la_CPPFLAGS = \
- 	-I.. -I$(srcdir) \
-@@ -68,7 +62,6 @@
+--- gnash-0.8.3/libmedia/Makefile.am.orig	2008-05-15 17:38:39.000000000 +0200
++++ gnash-0.8.3/libmedia/Makefile.am	2008-06-20 07:50:58.311893357 +0200
+@@ -67,7 +67,6 @@
  	$(CURL_LIBS) \
  	$(OPENGL_LIBS) \
  	$(LIBLTDL) \
@@ -70,21 +58,3 @@
  	$(BOOST_LIBS) \
  	$(PTHREAD_LIBS) \
  	$(NULL)
-@@ -168,17 +161,6 @@
- 
- libgnashmedia_la_LDFLAGS = -release $(VERSION)
- 
--libltdlc_la_CPPFLAGS = $(LTDLINCL)
--if CONVENIENCE_LTDL
--noinst_LTLIBRARIES = libltdlc.la
--libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
--endif
--CLEANFILES = libltdl.la libltdlc.la
--
--libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
--libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
--libltdl_la_LIBADD = $(LIBADD_DL)
--
- # Rebuild with GCC 4.x Mudflap support
- mudflap:
- 	@echo "Rebuilding with GCC Mudflap support"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gnash-system-libltdl.patch?r1=1.1&r2=1.2&f=u