From 134f84df4bbbfc8935baddc98147ed6743911372 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 6 Dec 2019 01:08:54 +0100 Subject: libgsf: upgrade 1.14.45 -> 1.14.46 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * there have been no traces that gconf is still necessary ' while at it cleanup recipe Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 --------------------- ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 +++++++++++++++++++++ meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb | 27 ------ meta-gnome/recipes-gnome/libgsf/libgsf_1.14.46.bb | 23 +++++ 4 files changed, 126 insertions(+), 130 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch create mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch delete mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb create mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.46.bb diff --git a/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch b/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch deleted file mode 100644 index bc0090e17b..0000000000 --- a/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 16d2c2e74350fda5505982fb150e72af7aee7454 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 19 Feb 2016 16:23:56 +0200 -Subject: [PATCH] configure.ac: drop a copy-paste of introspection.m4 macros - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - configure.ac | 78 +----------------------------------------------------------- - 1 file changed, 1 insertion(+), 77 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 54f7663..3038535 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,83 +77,7 @@ libgsf_reqs=" - " - - PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs) --# GObject Introspection --GIR_REQ=1.0.0 --AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=no]) -- --AC_MSG_CHECKING([for gobject-introspection]) -- --dnl presence/version checking --AS_CASE([$enable_introspection], --[no], [ -- found_introspection="no (disabled, use --enable-introspection to enable)" --], --[yes],[ -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) --], --[auto],[ -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) --dnl Canonicalize enable_introspection --enable_introspection=$found_introspection --], --[ -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) --]) -- --AC_MSG_RESULT([$found_introspection]) -- --if test "x$found_introspection" = "xyes"; then -- dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR -- dnl if you wish. If you override the latter, you might want to set -- dnl GI_TYPELIB_PATH to include the same directory. For example -- dnl -- dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0 -- dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH -- dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0 -- dnl -- dnl Note, that unlike binaries produced with libgsf, nothing tells -- dnl python where to find libgsf, so you might also need to set -- dnl LD_LIBRARY_PATH. -- -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- if test "x$INTROSPECTION_GIRDIR" = x; then -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- fi -- if test "x$INTROSPECTION_TYPELIBDIR" = x; then -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- fi -- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection --else -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- INTROSPECTION_CFLAGS= -- INTROSPECTION_LIBS= -- INTROSPECTION_MAKEFILE= --fi --AC_SUBST(INTROSPECTION_SCANNER) --AC_SUBST(INTROSPECTION_COMPILER) --AC_SUBST(INTROSPECTION_GENERATE) --AC_SUBST(INTROSPECTION_GIRDIR) --AC_SUBST(INTROSPECTION_TYPELIBDIR) --AC_SUBST(INTROSPECTION_CFLAGS) --AC_SUBST(INTROSPECTION_LIBS) --AC_SUBST(INTROSPECTION_MAKEFILE) -- --AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+GOBJECT_INTROSPECTION_CHECK([1.46.0]) - dnl we need to change the install directories for distcheck - AC_ARG_WITH([gir-dir], - AS_HELP_STRING( --- -2.7.0 - diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch new file mode 100644 index 0000000000..bc0090e17b --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch @@ -0,0 +1,103 @@ +From 16d2c2e74350fda5505982fb150e72af7aee7454 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 19 Feb 2016 16:23:56 +0200 +Subject: [PATCH] configure.ac: drop a copy-paste of introspection.m4 macros + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + configure.ac | 78 +----------------------------------------------------------- + 1 file changed, 1 insertion(+), 77 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 54f7663..3038535 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,83 +77,7 @@ libgsf_reqs=" + " + + PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs) +-# GObject Introspection +-GIR_REQ=1.0.0 +-AC_ARG_ENABLE(introspection, +- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], +- [Enable introspection for this build]),, +- [enable_introspection=no]) +- +-AC_MSG_CHECKING([for gobject-introspection]) +- +-dnl presence/version checking +-AS_CASE([$enable_introspection], +-[no], [ +- found_introspection="no (disabled, use --enable-introspection to enable)" +-], +-[yes],[ +- PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +-], +-[auto],[ +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) +-dnl Canonicalize enable_introspection +-enable_introspection=$found_introspection +-], +-[ +- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +-]) +- +-AC_MSG_RESULT([$found_introspection]) +- +-if test "x$found_introspection" = "xyes"; then +- dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR +- dnl if you wish. If you override the latter, you might want to set +- dnl GI_TYPELIB_PATH to include the same directory. For example +- dnl +- dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0 +- dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH +- dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0 +- dnl +- dnl Note, that unlike binaries produced with libgsf, nothing tells +- dnl python where to find libgsf, so you might also need to set +- dnl LD_LIBRARY_PATH. +- +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- if test "x$INTROSPECTION_GIRDIR" = x; then +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- fi +- if test "x$INTROSPECTION_TYPELIBDIR" = x; then +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- fi +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +-else +- INTROSPECTION_SCANNER= +- INTROSPECTION_COMPILER= +- INTROSPECTION_GENERATE= +- INTROSPECTION_GIRDIR= +- INTROSPECTION_TYPELIBDIR= +- INTROSPECTION_CFLAGS= +- INTROSPECTION_LIBS= +- INTROSPECTION_MAKEFILE= +-fi +-AC_SUBST(INTROSPECTION_SCANNER) +-AC_SUBST(INTROSPECTION_COMPILER) +-AC_SUBST(INTROSPECTION_GENERATE) +-AC_SUBST(INTROSPECTION_GIRDIR) +-AC_SUBST(INTROSPECTION_TYPELIBDIR) +-AC_SUBST(INTROSPECTION_CFLAGS) +-AC_SUBST(INTROSPECTION_LIBS) +-AC_SUBST(INTROSPECTION_MAKEFILE) +- +-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ++GOBJECT_INTROSPECTION_CHECK([1.46.0]) + dnl we need to change the install directories for distcheck + AC_ARG_WITH([gir-dir], + AS_HELP_STRING( +-- +2.7.0 + diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb deleted file mode 100644 index ac36ceb046..0000000000 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "GNOME Structured File Library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ - file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" - -SECTION = "libs" - -DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native" - -inherit autotools pkgconfig gnomebase gobject-introspection - -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" - -SRC_URI[archive.md5sum] = "e45cc8aa9c49516d540b7d7307f755f1" -SRC_URI[archive.sha256sum] = "5cbc2c0f1dc44d202fa0c6e3a51e9f17b0c2deb8711ba650432bfde3180b69fa" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" - -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --with-bz2 \ -" - -RDEPENDS_${PN} = "gconf" - -FILES_${PN} += "${datadir}/thumbnailers" diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.46.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.46.bb new file mode 100644 index 0000000000..049320afca --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.46.bb @@ -0,0 +1,23 @@ +SUMMARY = "GNOME Structured File Library" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ + file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" + +SECTION = "libs" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native" + +inherit gnomebase gobject-introspection gettext gtk-doc + +SRC_URI[archive.md5sum] = "5bc6d1d6394f0ed5a58e8f2e5e4ead7f" +SRC_URI[archive.sha256sum] = "ea36959b1421fc8e72caa222f30ec3234d0ed95990e2bf28943a85f33eadad2d" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" + +EXTRA_OECONF = "\ + --with-bz2 \ +" + +FILES_${PN} += "${datadir}/thumbnailers" -- cgit v1.2.3-54-g00ecf