summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2008-08-18 22:51:58 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2008-08-18 22:51:58 +0000
commit4f03407ab61ad8b0913e8be2da8eb5eac8da82a6 (patch)
tree7ee86bc1f91543761b5031be17e95a5e99941dd5
parent2e265b8e89e31205deef1100b341234e7d6ea4c4 (diff)
gnash-minimal: Include $\(INTLLIBS\) in LDADD for gui/fb.
-rw-r--r--packages/gnash/files/libintl.patch13
-rw-r--r--packages/gnash/gnash-minimal_0.8.2.bb1
-rw-r--r--packages/gnash/gnash-minimal_0.8.3.bb4
-rw-r--r--packages/gnash/gnash-minimal_cvs.bb2
4 files changed, 17 insertions, 3 deletions
diff --git a/packages/gnash/files/libintl.patch b/packages/gnash/files/libintl.patch
new file mode 100644
index 0000000000..22e1acb65b
--- /dev/null
+++ b/packages/gnash/files/libintl.patch
@@ -0,0 +1,13 @@
+Index: gnash-0.8.3/gui/am-frag/fb.am
+===================================================================
+--- gnash-0.8.3.orig/gui/am-frag/fb.am 2008-08-19 00:37:45.000000000 +0200
++++ gnash-0.8.3/gui/am-frag/fb.am 2008-08-19 00:38:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+ fb_gnash_SOURCES +=
+ fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+- $(GNASH_LIBS) $(AGG_LIBS)
++ $(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS)
+ endif # BUILD_AGG_RENDERER
+ endif # BUILD_FB_GUI
+
diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb
index bcfb88c42f..b5a9ca35a9 100644
--- a/packages/gnash/gnash-minimal_0.8.2.bb
+++ b/packages/gnash/gnash-minimal_0.8.2.bb
@@ -1,2 +1,3 @@
require gnash-minimal.inc
+PR = "r1"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index b5bcf29683..55748151c5 100644
--- a/packages/gnash/gnash-minimal_0.8.3.bb
+++ b/packages/gnash/gnash-minimal_0.8.3.bb
@@ -1,12 +1,12 @@
require gnash-minimal.inc
-PR = "r6"
+PR = "r7"
EXTRA_OECONF += " --without-included-ltdl \
--with-ltdl-include=${STAGING_INCDIR} \
--with-ltdl-lib=${STAGING_LIBDIR} \
"
-SRC_URI += "file://libtool-2.2.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index de0e6f9db9..73a7e8f9b2 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,6 +1,6 @@
require gnash-minimal.inc
-PV = "0.8.2+cvs${SRCDATE}"
+PV = "0.8.3+cvs${SRCDATE}"
SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
S = ${WORKDIR}/gnash