mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 00:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcroco: drop recipe

Browse Source 
libcroco has been deprecated and was archived by the gnome-project

https://gitlab.gnome.org/Archive/libcroco

(From OE-Core rev: d53c1aca794ce256b057d63a9a8eaae5bf71fae5)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Volk
2023-10-29 17:48:49 +01:00
committed by Richard Purdie
parent 57e3f6ff28
commit 3681db6bb3
5 changed files with 3 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

319
meta/recipes-core/gettext/gettext/use-pkgconfig.patch
View File

@@ -15,14 +15,9 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
---
gettext-tools/gnulib-m4/libxml.m4 | 105 +----------------
.../gnulib-local/lib/term-styled-ostream.oo.c | 12 +-
libtextstyle/gnulib-local/m4/libcroco.m4 | 98 +++-------------
libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++---------------
libtextstyle/gnulib-m4/libcroco.m4 | 98 +++-------------
libtextstyle/gnulib-m4/libglib.m4 | 106 +++---------------
libtextstyle/lib/term-styled-ostream.c | 12 +-
libtextstyle/lib/term-styled-ostream.oo.c | 12 +-
8 files changed, 79 insertions(+), 470 deletions(-)
3 files changed, 79 insertions(+), 470 deletions(-)
diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
index 0340490..0355388 100644
@@ -147,149 +142,6 @@ index 0340490..0355388 100644
fi
])
AC_SUBST([LIBXML])
diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
index 2ff978f..5ffb17a 100644
--- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
@@ -22,15 +22,15 @@
#include <stdlib.h>
-#include <cr-om-parser.h>
-#include <cr-sel-eng.h>
-#include <cr-style.h>
-#include <cr-rgb.h>
+#include <libcroco/cr-om-parser.h>
+#include <libcroco/cr-sel-eng.h>
+#include <libcroco/cr-style.h>
+#include <libcroco/cr-rgb.h>
/* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
#ifndef __CR_FONTS_H__
-# include <cr-fonts.h>
+# include <libcroco/cr-fonts.h>
#endif
-#include <cr-string.h>
+#include <libcroco/cr-string.h>
#include "term-ostream.h"
#include "mem-hash-map.h"
diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4
index 39e72b1..042915a 100644
--- a/libtextstyle/gnulib-local/m4/libcroco.m4
+++ b/libtextstyle/gnulib-local/m4/libcroco.m4
@@ -6,97 +6,29 @@ dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
-dnl gl_LIBCROCO
-dnl gives the user the option to decide whether to use the included or
-dnl an external libcroco.
-dnl gl_LIBCROCO(FORCE-INCLUDED)
-dnl forces the use of the included or an external libcroco.
AC_DEFUN([gl_LIBCROCO],
[
- ifelse([$1], [yes], , [
- dnl libcroco depends on libglib.
- AC_REQUIRE([gl_LIBGLIB])
- ])
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ dnl libcroco depends on libglib.
+ AC_REQUIRE([gl_LIBGLIB])
- ifelse([$1], , [
- AC_MSG_CHECKING([whether included libcroco is requested])
- AC_ARG_WITH([included-libcroco],
- [ --with-included-libcroco use the libcroco included here],
- [gl_cv_libcroco_force_included=$withval],
- [gl_cv_libcroco_force_included=no])
- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
- ], [gl_cv_libcroco_force_included=$1])
+ AC_MSG_CHECKING([whether included libcroco is requested])
+ AC_ARG_WITH([included-libcroco],
+ [ --with-included-libcroco use the libcroco included here],
+ [gl_cv_libcroco_force_included=$withval],
+ [gl_cv_libcroco_force_included=no])
+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
LIBCROCO=
LTLIBCROCO=
INCCROCO=
- ifelse([$1], [yes], , [
- if test "$gl_cv_libcroco_use_included" != yes; then
- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
- dnl use the included one.
- AC_CACHE_VAL([gl_cv_libcroco], [
- gl_cv_libcroco=no
- gl_cv_LIBCROCO=
- gl_cv_LTLIBCROCO=
- gl_cv_INCCROCO=
- gl_save_LIBS="$LIBS"
- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
- dnl INCCROCO_0_6 accordingly.
- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
- dnl cross-compiling or when the C compiler in use is different from the
- dnl one that built the library.
- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- ])
- if test "$gl_cv_libcroco" != yes; then
- gl_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- gl_cv_INCCROCO="$INCCROCO_0_6"
- ])
- if test "$gl_cv_libcroco" != yes; then
- dnl Often the include files are installed in
- dnl /usr/include/libcroco-0.6/libcroco.
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
- if test -d "$libcroco_include_dir"; then
- gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- gl_cv_INCCROCO="-I$libcroco_include_dir"
- fi
- ])
- fi
- CPPFLAGS="$gl_save_CPPFLAGS"
- fi
- LIBS="$gl_save_LIBS"
- ])
- AC_MSG_CHECKING([for libcroco])
- AC_MSG_RESULT([$gl_cv_libcroco])
- if test $gl_cv_libcroco = yes; then
- LIBCROCO="$gl_cv_LIBCROCO"
- LTLIBCROCO="$gl_cv_LTLIBCROCO"
- INCCROCO="$gl_cv_INCCROCO"
- else
- gl_cv_libcroco_use_included=yes
- fi
- fi
- ])
+ if test "$gl_cv_libcroco_use_included" != yes; then
+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
+ LIBCROCO=$CROCO_LIBS
+ LTLIBCROCO=$CROCO_LIBS
+ INCCROCO=$CROCO_CFLAGS
+ fi
AC_SUBST([LIBCROCO])
AC_SUBST([LTLIBCROCO])
AC_SUBST([INCCROCO])
diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
index 7ee5029..bb1e5e4 100644
--- a/libtextstyle/gnulib-local/m4/libglib.m4
@@ -414,123 +266,6 @@ index 7ee5029..bb1e5e4 100644
AC_SUBST([LIBGLIB])
AC_SUBST([LTLIBGLIB])
AC_SUBST([INCGLIB])
diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4
index 39e72b1..042915a 100644
--- a/libtextstyle/gnulib-m4/libcroco.m4
+++ b/libtextstyle/gnulib-m4/libcroco.m4
@@ -6,97 +6,29 @@ dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
-dnl gl_LIBCROCO
-dnl gives the user the option to decide whether to use the included or
-dnl an external libcroco.
-dnl gl_LIBCROCO(FORCE-INCLUDED)
-dnl forces the use of the included or an external libcroco.
AC_DEFUN([gl_LIBCROCO],
[
- ifelse([$1], [yes], , [
- dnl libcroco depends on libglib.
- AC_REQUIRE([gl_LIBGLIB])
- ])
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ dnl libcroco depends on libglib.
+ AC_REQUIRE([gl_LIBGLIB])
- ifelse([$1], , [
- AC_MSG_CHECKING([whether included libcroco is requested])
- AC_ARG_WITH([included-libcroco],
- [ --with-included-libcroco use the libcroco included here],
- [gl_cv_libcroco_force_included=$withval],
- [gl_cv_libcroco_force_included=no])
- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
- ], [gl_cv_libcroco_force_included=$1])
+ AC_MSG_CHECKING([whether included libcroco is requested])
+ AC_ARG_WITH([included-libcroco],
+ [ --with-included-libcroco use the libcroco included here],
+ [gl_cv_libcroco_force_included=$withval],
+ [gl_cv_libcroco_force_included=no])
+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
LIBCROCO=
LTLIBCROCO=
INCCROCO=
- ifelse([$1], [yes], , [
- if test "$gl_cv_libcroco_use_included" != yes; then
- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
- dnl use the included one.
- AC_CACHE_VAL([gl_cv_libcroco], [
- gl_cv_libcroco=no
- gl_cv_LIBCROCO=
- gl_cv_LTLIBCROCO=
- gl_cv_INCCROCO=
- gl_save_LIBS="$LIBS"
- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
- dnl INCCROCO_0_6 accordingly.
- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
- dnl cross-compiling or when the C compiler in use is different from the
- dnl one that built the library.
- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- ])
- if test "$gl_cv_libcroco" != yes; then
- gl_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- gl_cv_INCCROCO="$INCCROCO_0_6"
- ])
- if test "$gl_cv_libcroco" != yes; then
- dnl Often the include files are installed in
- dnl /usr/include/libcroco-0.6/libcroco.
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]],
- [[const char *version = LIBCROCO_VERSION; return !version;]])],
- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
- if test -d "$libcroco_include_dir"; then
- gl_cv_libcroco=yes
- gl_cv_LIBCROCO="$LIBCROCO_0_6"
- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
- gl_cv_INCCROCO="-I$libcroco_include_dir"
- fi
- ])
- fi
- CPPFLAGS="$gl_save_CPPFLAGS"
- fi
- LIBS="$gl_save_LIBS"
- ])
- AC_MSG_CHECKING([for libcroco])
- AC_MSG_RESULT([$gl_cv_libcroco])
- if test $gl_cv_libcroco = yes; then
- LIBCROCO="$gl_cv_LIBCROCO"
- LTLIBCROCO="$gl_cv_LTLIBCROCO"
- INCCROCO="$gl_cv_INCCROCO"
- else
- gl_cv_libcroco_use_included=yes
- fi
- fi
- ])
+ if test "$gl_cv_libcroco_use_included" != yes; then
+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
+ LIBCROCO=$CROCO_LIBS
+ LTLIBCROCO=$CROCO_LIBS
+ INCCROCO=$CROCO_CFLAGS
+ fi
AC_SUBST([LIBCROCO])
AC_SUBST([LTLIBCROCO])
AC_SUBST([INCCROCO])
diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
index 7ee5029..bb1e5e4 100644
--- a/libtextstyle/gnulib-m4/libglib.m4
@@ -655,55 +390,3 @@ index 7ee5029..bb1e5e4 100644
AC_SUBST([LIBGLIB])
AC_SUBST([LTLIBGLIB])
AC_SUBST([INCGLIB])
diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c
index 5484800..16793fa 100644
--- a/libtextstyle/lib/term-styled-ostream.c
+++ b/libtextstyle/lib/term-styled-ostream.c
@@ -28,15 +28,15 @@
#include <stdlib.h>
-#include <cr-om-parser.h>
-#include <cr-sel-eng.h>
-#include <cr-style.h>
-#include <cr-rgb.h>
+#include <libcroco/cr-om-parser.h>
+#include <libcroco/cr-sel-eng.h>
+#include <libcroco/cr-style.h>
+#include <libcroco/cr-rgb.h>
/* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
#ifndef __CR_FONTS_H__
-# include <cr-fonts.h>
+# include <libcroco/cr-fonts.h>
#endif
-#include <cr-string.h>
+#include <libcroco/cr-string.h>
#include "term-ostream.h"
#include "mem-hash-map.h"
diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c
index 2ff978f..5ffb17a 100644
--- a/libtextstyle/lib/term-styled-ostream.oo.c
+++ b/libtextstyle/lib/term-styled-ostream.oo.c
@@ -22,15 +22,15 @@
#include <stdlib.h>
-#include <cr-om-parser.h>
-#include <cr-sel-eng.h>
-#include <cr-style.h>
-#include <cr-rgb.h>
+#include <libcroco/cr-om-parser.h>
+#include <libcroco/cr-sel-eng.h>
+#include <libcroco/cr-style.h>
+#include <libcroco/cr-rgb.h>
/* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
#ifndef __CR_FONTS_H__
-# include <cr-fonts.h>
+# include <libcroco/cr-fonts.h>
#endif
-#include <cr-string.h>
+#include <libcroco/cr-string.h>
#include "term-ostream.h"
#include "mem-hash-map.h"

6
meta/recipes-core/gettext/gettext_0.22.bb
View File

@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
# without libxml in PACKAGECONFIG vendor copy of the lib will be used
LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', '& MIT', d)}"
LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', 'file://libtextstyle/lib/libxml/COPYING;md5=2044417e2e5006b65a8b9067b683fcf1', d)}"
# without croco in PACKAGECONFIG vendor copy of the lib will be used
LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'croco', '', 'file://libtextstyle/lib/libcroco/libcroco.h;md5=424013a9ed5401aa58cf83f3188c6865;beginline=10;endline=28', d)}"
# without glib in PACKAGECONFIG vendor copy of the lib will be used
LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'glib', '', 'file://libtextstyle/lib/glib/ghash.c;md5=e3159f5ac38dfe77af5cc0ee104dab2d;beginline=10;endline=27', d)}"
@@ -44,6 +42,7 @@ EXTRA_OECONF += "--without-lispdir \
--without-emacs \
--without-cvs \
--without-git \
--without-included-libcroco \
--cache-file=${B}/config.cache \
"
EXTRA_OECONF:append:class-target = " \
@@ -54,11 +53,10 @@ EXTRA_OECONF:append:class-target = " \
gt_cv_locale_de=de_DE.ISO-8859-1 \
"
PACKAGECONFIG ??= "croco glib libxml"
PACKAGECONFIG ??= "glib libxml"
PACKAGECONFIG:class-native = ""
PACKAGECONFIG:class-nativesdk = ""
PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco"
PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
# Need paths here to avoid host contamination but this can cause RPATH warnings