From b98c234bf7907ff4e956f131023437d01e57c910 Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Thu, 23 Sep 2010 21:24:40 +0000 Subject: imlib_1.9.15, qiv_1.9: move to obsolete. Motivation for removal: ERROR: QA Issue with staging: imlib.pc failed sanity test (tmpdir) in path /mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/lib/pkgconfig This 3 year old qiv recipe is the only in tree user of imlib1. Newer versions of qiv which use imlib2 are available from http://spiegl.de/qiv/ Signed-off-by: Graham Gower Signed-off-by: Khem Raj --- recipes/imlib/files/configure.patch | 31 ---------------------------- recipes/imlib/imlib_1.9.15.bb | 23 --------------------- recipes/obsolete/imlib/files/configure.patch | 31 ++++++++++++++++++++++++++++ recipes/obsolete/imlib/imlib_1.9.15.bb | 23 +++++++++++++++++++++ recipes/obsolete/qiv/files/makefile.patch | 22 ++++++++++++++++++++ recipes/obsolete/qiv/qiv_1.9.bb | 23 +++++++++++++++++++++ recipes/qiv/files/makefile.patch | 22 -------------------- recipes/qiv/qiv_1.9.bb | 23 --------------------- 8 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 recipes/imlib/files/configure.patch delete mode 100644 recipes/imlib/imlib_1.9.15.bb create mode 100644 recipes/obsolete/imlib/files/configure.patch create mode 100644 recipes/obsolete/imlib/imlib_1.9.15.bb create mode 100644 recipes/obsolete/qiv/files/makefile.patch create mode 100644 recipes/obsolete/qiv/qiv_1.9.bb delete mode 100644 recipes/qiv/files/makefile.patch delete mode 100644 recipes/qiv/qiv_1.9.bb (limited to 'recipes') diff --git a/recipes/imlib/files/configure.patch b/recipes/imlib/files/configure.patch deleted file mode 100644 index 90879c15ee..0000000000 --- a/recipes/imlib/files/configure.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /tmp/configure.in 2006-09-02 12:44:16.000000000 +0200 -+++ imlib-1.9.15/configure.in 2006-09-02 12:44:22.975780000 +0200 -@@ -43,19 +43,6 @@ - oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -- AC_TRY_RUN([ --#include --#include --main () --{ -- if (g_module_supported ()) -- exit (0); -- else -- exit (1); --} --], dynworks=true) -- LIBS="$oLIBS" -- CFLAGS="$oCFLAGS" - fi - - dnl Now we check to see if our libtool supports shared lib deps -@@ -141,7 +128,7 @@ - fi - AC_SUBST(GX_LIBS) - --CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" -+CPPFLAGS="$CPPFLAGS" - - SUPPORT_LIBS="" - diff --git a/recipes/imlib/imlib_1.9.15.bb b/recipes/imlib/imlib_1.9.15.bb deleted file mode 100644 index ee624d0ed9..0000000000 --- a/recipes/imlib/imlib_1.9.15.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Image loading library" -LICENSE = "GPLv2" -DEPENDS = "gtk+-1.2 jpeg tiff libpng libungif" - -inherit gnome binconfig - -SRC_URI += "file://configure.patch" - -EXTRA_OECONF = " --enable-modules \ - --disable-gtktest \ - ac_cv_dynworks=true \ - " - -do_stage() { - install -m 644 Imlib/*.h ${STAGING_INCDIR} - install -m 644 gdk_imlib/*.h ${STAGING_INCDIR} - oe_libinstall -a -so -C Imlib libImlib ${STAGING_LIBDIR} - oe_libinstall -a -so -C gdk_imlib libgdk_imlib ${STAGING_LIBDIR} -} - - -SRC_URI[archive.md5sum] = "7db987e6c52e4daf70d7d0f471238eae" -SRC_URI[archive.sha256sum] = "4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0" diff --git a/recipes/obsolete/imlib/files/configure.patch b/recipes/obsolete/imlib/files/configure.patch new file mode 100644 index 0000000000..90879c15ee --- /dev/null +++ b/recipes/obsolete/imlib/files/configure.patch @@ -0,0 +1,31 @@ +--- /tmp/configure.in 2006-09-02 12:44:16.000000000 +0200 ++++ imlib-1.9.15/configure.in 2006-09-02 12:44:22.975780000 +0200 +@@ -43,19 +43,6 @@ + oCFLAGS="$CFLAGS" + LIBS="$LIBS `glib-config --libs gmodule`" + CFLAGS="$CFLAGS `glib-config --cflags gmodule`" +- AC_TRY_RUN([ +-#include +-#include +-main () +-{ +- if (g_module_supported ()) +- exit (0); +- else +- exit (1); +-} +-], dynworks=true) +- LIBS="$oLIBS" +- CFLAGS="$oCFLAGS" + fi + + dnl Now we check to see if our libtool supports shared lib deps +@@ -141,7 +128,7 @@ + fi + AC_SUBST(GX_LIBS) + +-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" ++CPPFLAGS="$CPPFLAGS" + + SUPPORT_LIBS="" + diff --git a/recipes/obsolete/imlib/imlib_1.9.15.bb b/recipes/obsolete/imlib/imlib_1.9.15.bb new file mode 100644 index 0000000000..ee624d0ed9 --- /dev/null +++ b/recipes/obsolete/imlib/imlib_1.9.15.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Image loading library" +LICENSE = "GPLv2" +DEPENDS = "gtk+-1.2 jpeg tiff libpng libungif" + +inherit gnome binconfig + +SRC_URI += "file://configure.patch" + +EXTRA_OECONF = " --enable-modules \ + --disable-gtktest \ + ac_cv_dynworks=true \ + " + +do_stage() { + install -m 644 Imlib/*.h ${STAGING_INCDIR} + install -m 644 gdk_imlib/*.h ${STAGING_INCDIR} + oe_libinstall -a -so -C Imlib libImlib ${STAGING_LIBDIR} + oe_libinstall -a -so -C gdk_imlib libgdk_imlib ${STAGING_LIBDIR} +} + + +SRC_URI[archive.md5sum] = "7db987e6c52e4daf70d7d0f471238eae" +SRC_URI[archive.sha256sum] = "4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0" diff --git a/recipes/obsolete/qiv/files/makefile.patch b/recipes/obsolete/qiv/files/makefile.patch new file mode 100644 index 0000000000..42707be9b9 --- /dev/null +++ b/recipes/obsolete/qiv/files/makefile.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile 2006-09-02 13:04:25.000000000 +0200 ++++ qiv-1.9/Makefile 2006-09-02 13:05:05.255780000 +0200 +@@ -4,7 +4,7 @@ + ###################################################################### + + # Directory where qiv will be installed under. +-PREFIX = /usr/local ++PREFIX = /usr/ + + # Font to use for statusbar in fullscreen mode + STATUSBAR_FONT = "fixed" +@@ -53,10 +53,6 @@ + # Do not edit below here! + ###################################################################### + +-CC = gcc +-CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ +- -fcaller-saves -ffast-math -fno-strength-reduce \ +- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN + + INCLUDES = `imlib-config --cflags-gdk` + LIBS = `imlib-config --libs-gdk` diff --git a/recipes/obsolete/qiv/qiv_1.9.bb b/recipes/obsolete/qiv/qiv_1.9.bb new file mode 100644 index 0000000000..a1b63c6c61 --- /dev/null +++ b/recipes/obsolete/qiv/qiv_1.9.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Qiv is a very small and pretty fast gdk/Imlib image viewer." +LICENSE = "GPLv2" +SECTION = "x11/graphics" +DEPENDS = "gtk+-1.2 imlib" +PR = "r1" + +SRC_URI = "http://www.klografx.net/qiv/download/qiv-1.9-src.tgz \ + file://makefile.patch \ + " +inherit pkgconfig binconfig + +CFLAGS += " -lSM -lICE -lXdmcp" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir}/man1/ + + install -s -m 0755 qiv ${D}${bindir}/qiv + install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 +} + +SRC_URI[md5sum] = "b368e00543b2b1d9a87b37fd5ba60c57" +SRC_URI[sha256sum] = "7ffeb0b90892d71eff4f26227962f5b306d52a55539f1cb2a72993c8252ca518" diff --git a/recipes/qiv/files/makefile.patch b/recipes/qiv/files/makefile.patch deleted file mode 100644 index 42707be9b9..0000000000 --- a/recipes/qiv/files/makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile 2006-09-02 13:04:25.000000000 +0200 -+++ qiv-1.9/Makefile 2006-09-02 13:05:05.255780000 +0200 -@@ -4,7 +4,7 @@ - ###################################################################### - - # Directory where qiv will be installed under. --PREFIX = /usr/local -+PREFIX = /usr/ - - # Font to use for statusbar in fullscreen mode - STATUSBAR_FONT = "fixed" -@@ -53,10 +53,6 @@ - # Do not edit below here! - ###################################################################### - --CC = gcc --CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ -- -fcaller-saves -ffast-math -fno-strength-reduce \ -- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN - - INCLUDES = `imlib-config --cflags-gdk` - LIBS = `imlib-config --libs-gdk` diff --git a/recipes/qiv/qiv_1.9.bb b/recipes/qiv/qiv_1.9.bb deleted file mode 100644 index a1b63c6c61..0000000000 --- a/recipes/qiv/qiv_1.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Qiv is a very small and pretty fast gdk/Imlib image viewer." -LICENSE = "GPLv2" -SECTION = "x11/graphics" -DEPENDS = "gtk+-1.2 imlib" -PR = "r1" - -SRC_URI = "http://www.klografx.net/qiv/download/qiv-1.9-src.tgz \ - file://makefile.patch \ - " -inherit pkgconfig binconfig - -CFLAGS += " -lSM -lICE -lXdmcp" - -do_install() { - install -d ${D}${bindir} - install -d ${D}${mandir}/man1/ - - install -s -m 0755 qiv ${D}${bindir}/qiv - install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 -} - -SRC_URI[md5sum] = "b368e00543b2b1d9a87b37fd5ba60c57" -SRC_URI[sha256sum] = "7ffeb0b90892d71eff4f26227962f5b306d52a55539f1cb2a72993c8252ca518" -- cgit 1.2.3-korg