diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-21 10:47:09 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-21 10:47:09 +0000 |
| commit | d01cfe7cc36edc50e639f6b4964dd8064bc60817 (patch) | |
| tree | 6db15086d42e2a70a238d7ba5ded4624f0bdf98b /packages | |
| parent | 8292e638ccc07f088a4b88deb1daca1e33342f7a (diff) | |
| parent | b56ed4fb7777d38ba9e9db867f37fda6c6865b3b (diff) | |
merge of '83d79b5cd4fd20054c665e25366f4ee45f3b681f'
and 'df3150bb10ef98bd118330fe8a496b4c29f4a861'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/fstests/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/fstests/files/compile-fix.patch | 73 | ||||
| -rw-r--r-- | packages/fstests/fstests.bb | 3 |
3 files changed, 1 insertions, 75 deletions
diff --git a/packages/fstests/files/.mtn2git_empty b/packages/fstests/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/fstests/files/.mtn2git_empty +++ /dev/null diff --git a/packages/fstests/files/compile-fix.patch b/packages/fstests/files/compile-fix.patch deleted file mode 100644 index 83b3a1cfaf..0000000000 --- a/packages/fstests/files/compile-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: tests/Makefile.am -=================================================================== ---- tests.orig/Makefile.am -+++ tests/Makefile.am -@@ -18,13 +18,13 @@ test_fb_SOURCES = test-fb.c - - # fullscreen blit to gtk drawing area via gtk pixbufs - test_gdk_SOURCES = test-gdk.c --test_gdk_LDADD = @GTK_LIBS@ --test_gdk_CFLAGS = @GTK_CFLAGS@ -+test_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # fullscreen blit to gtk drawing area via gtk pixbufs in an idle handler - test_gdk_idle_SOURCES = test-gdk-idle.c --test_gdk_idle_LDADD = @GTK_LIBS@ --test_gdk_idle_CFLAGS = @GTK_CFLAGS@ -+test_gdk_idle_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gdk_idle_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # fullscreen blit to x window via shm - test_x_SOURCES = test-x.c -@@ -43,8 +43,8 @@ test_freetype_cached_CFLAGS = @FREETYPE_ - - # draw strings via xft - test_xft_SOURCES = test-xft.c --test_xft_LDADD = @XLIBS_LIBS@ --test_xft_CFLAGS = @XLIBS_CFLAGS@ -+test_xft_LDADD = @XLIBS_LIBS@ @PANGO_LIBS@ -+test_xft_CFLAGS = @XLIBS_CFLAGS@ @PANGO_CFLAGS@ - - # draws pango strings with just x - test_pango_SOURCES = test-pango.c -@@ -55,29 +55,29 @@ test_pango_CFLAGS = @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkWindow with pango_xft_render - test_pango_gdk_SOURCES = test-pango-gdk.c --test_pango_gdk_LDADD = @GTK_LIBS@ --test_pango_gdk_CFLAGS = @GTK_CFLAGS@ -+test_pango_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkDrawingArea with pango_xft_render - test_pango_gtk_SOURCES = test-pango-gtk.c --test_pango_gtk_LDADD = @GTK_LIBS@ --test_pango_gtk_CFLAGS = @GTK_CFLAGS@ -+test_pango_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkWindow with gdk_draw_glyphs - # can probably go - # test_gtk_SOURCES = test-gtk.c --# test_gtk_LDADD = @GTK_LIBS@ --# test_gtk_CFLAGS = @GTK_CFLAGS@ -+# test_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+# test_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - - test_pango_layout_SOURCES = test-pango-layout.c --test_pango_layout_LDADD = @GTK_LIBS@ --test_pango_layout_CFLAGS = @GTK_CFLAGS@ -+test_pango_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # As above PangoLayout onto a GtkWindow with gdk_draw_layout XXX TOGO ? - test_gtk_layout_SOURCES = test-gtk-layout.c --test_gtk_layout_LDADD = @GTK_LIBS@ --test_gtk_layout_CFLAGS = @GTK_CFLAGS@ -+test_gtk_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gtk_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - - diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb index 5af7c94028..f4ec5ca919 100644 --- a/packages/fstests/fstests.bb +++ b/packages/fstests/fstests.bb @@ -8,8 +8,7 @@ PR = "r1" inherit autotools SRC_URI = \ - "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \ - file://compile-fix.patch;patch=0" + "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http" S = "${WORKDIR}/fstests/tests" |