diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-08-29 10:01:15 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-08-29 10:01:15 +0000 |
| commit | eced74653a5d350e15bc8aeebefc4104af240dda (patch) | |
| tree | 00d0ec18d65d6dac085a4c2ae07b0cc38197b548 | |
| parent | d2c2d7bd0e2d51e7e9d44da0d04185838d921e4f (diff) | |
| parent | eb616a13fa3af7aac33be630a0f08a81f158e8ab (diff) | |
merge of 5fb32ea6c40d2082dd4a97e96049da94197805bd
and 9aa86687e7b05c58ae96324abb450a588180f55e
| -rw-r--r-- | packages/gnome/libgnomecanvas_2.10.2.bb | 3 | ||||
| -rw-r--r-- | packages/gnome/libgnomecanvas_2.12.0.bb | 3 | ||||
| -rw-r--r-- | packages/imagemagick/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/imagemagick/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/imagemagick/files/PerlMagic_MakePatch | 13 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick_6.2.9.bb | 21 |
6 files changed, 38 insertions, 2 deletions
diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb index 36ee1aa67f..3c1b36ecd4 100644 --- a/packages/gnome/libgnomecanvas_2.10.2.bb +++ b/packages/gnome/libgnomecanvas_2.10.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r1" +PR = "r2" DESCRIPTION = "A powerful object-oriented display" inherit gnome @@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" EXTRA_OECONF = "--disable-gtk-doc" FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so" do_stage() { gnome_stage_includes diff --git a/packages/gnome/libgnomecanvas_2.12.0.bb b/packages/gnome/libgnomecanvas_2.12.0.bb index 36ee1aa67f..3c1b36ecd4 100644 --- a/packages/gnome/libgnomecanvas_2.12.0.bb +++ b/packages/gnome/libgnomecanvas_2.12.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r1" +PR = "r2" DESCRIPTION = "A powerful object-oriented display" inherit gnome @@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" EXTRA_OECONF = "--disable-gtk-doc" FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so" do_stage() { gnome_stage_includes diff --git a/packages/imagemagick/.mtn2git_empty b/packages/imagemagick/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/imagemagick/.mtn2git_empty diff --git a/packages/imagemagick/files/.mtn2git_empty b/packages/imagemagick/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/imagemagick/files/.mtn2git_empty diff --git a/packages/imagemagick/files/PerlMagic_MakePatch b/packages/imagemagick/files/PerlMagic_MakePatch new file mode 100644 index 0000000000..c87414529a --- /dev/null +++ b/packages/imagemagick/files/PerlMagic_MakePatch @@ -0,0 +1,13 @@ +Index: ImageMagick-6.2.5/PerlMagick/Makefile.PL.in +=================================================================== +--- ImageMagick-6.2.5.orig/PerlMagick/Makefile.PL.in 2005-04-21 00:27:36.000000000 +0800 ++++ ImageMagick-6.2.5/PerlMagick/Makefile.PL.in 2005-10-04 04:43:35.239036400 +0800 +@@ -72,6 +72,8 @@ + + # Use same compiler as ImageMagick + 'PERLMAINCC' => '@PERLMAINCC@', ++ 'AR' => '@AR@', ++ 'LD' => '@PERLMAINCC@', + + # Set Perl installation prefix to ImageMagick installation prefix + # 'PREFIX' => '@prefix@', diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb new file mode 100644 index 0000000000..cac16329c4 --- /dev/null +++ b/packages/imagemagick/imagemagick_6.2.9.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "console/utils" +DEPENDS = "tiff" +DESCRIPTION = "ImageMagick is an image convertion tools" + +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \ + file://PerlMagic_MakePatch;patch=1" + +S = "${WORKDIR}/ImageMagick-${PV}" + +inherit autotools + +EXTRA_OECONF="-without-x " + +LEAD_SONAME="libMagick.so.*" + +FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ + ${libdir}/ImageMagick-${PV}/config/ \ + ${datadir}/ImageMagick-${PV}" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" |