From 3f2961e7d2311c106d92a999bfe8b6af01c0f9bb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 4 May 2018 15:32:34 +0300 Subject: libfm: update to 1.3.0.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/libfm/libfm-extra_1.2.5.bb | 23 ------- meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb | 23 +++++++ ...-library-path-to-avoid-host-contamination.patch | 23 +++++++ ...Enclose-text-in-programlisting-into-CDATA.patch | 76 ---------------------- meta/recipes-support/libfm/libfm_1.2.5.bb | 54 --------------- meta/recipes-support/libfm/libfm_1.3.0.2.bb | 54 +++++++++++++++ 6 files changed, 100 insertions(+), 153 deletions(-) delete mode 100644 meta/recipes-support/libfm/libfm-extra_1.2.5.bb create mode 100644 meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb create mode 100644 meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch delete mode 100644 meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch delete mode 100644 meta/recipes-support/libfm/libfm_1.2.5.bb create mode 100644 meta/recipes-support/libfm/libfm_1.3.0.2.bb (limited to 'meta/recipes-support/libfm') diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/meta/recipes-support/libfm/libfm-extra_1.2.5.bb deleted file mode 100644 index c0fd83ef34..0000000000 --- a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for file management" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" - -SECTION = "x11/libs" -DEPENDS = "glib-2.0-native glib-2.0 intltool-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ - file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ - " - -SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" -SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" - -S = "${WORKDIR}/libfm-${PV}" - -EXTRA_OECONF = "--with-extra-only --with-gtk=no" - -inherit autotools pkgconfig gtk-doc gettext - -do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb new file mode 100644 index 0000000000..734d010d31 --- /dev/null +++ b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" + +SECTION = "x11/libs" +DEPENDS = "glib-2.0-native glib-2.0 intltool-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ + file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ + " + +SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" +SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" + +S = "${WORKDIR}/libfm-${PV}" + +EXTRA_OECONF = "--with-extra-only --with-gtk=no" + +inherit autotools pkgconfig gtk-doc gettext + +do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch new file mode 100644 index 0000000000..f4c89127fc --- /dev/null +++ b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch @@ -0,0 +1,23 @@ +From 07260295e031e845e38ba874fa6ab500790c4aaf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 2 May 2018 16:48:47 +0300 +Subject: [PATCH] Do not add library path to avoid host contamination + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/modules/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index e61f4e0..01c15bd 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -11,7 +11,6 @@ AM_CPPFLAGS = \ + # tell libtool we compile module not library + AM_LDFLAGS = \ + -no-undefined -module -avoid-version -shared -export-dynamic \ +- -L$(libdir) \ + $(GIO_LIBS) + + # the module should be linked only with libfm, not libfm-gtk or whatever diff --git a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch deleted file mode 100644 index 40e53291e1..0000000000 --- a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko -Date: Sun, 26 Nov 2017 22:30:15 +0200 -Subject: [PATCH 2/2] Enclose text in into ---- - src/base/fm-module.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/base/fm-module.c b/src/base/fm-module.c -index d364b2d..2e8c978 100644 ---- a/src/base/fm-module.c -+++ b/src/base/fm-module.c -@@ -44,7 +44,7 @@ - * of that type should include: - * - * Sample of fm-dummy.h -- * -+ * - * - * #define FM_MODULE_dummy_VERSION 1 -@@ -54,7 +54,7 @@ - * } FmDummyInit; - * - * extern FmDummyInit fm_module_init_dummy; -- * -+ * ]]> - * - * The FM_MODULE_dummy_VERSION is a number which should be increased each - * time something in FmDummyInit structure is changed. The FmDummyInit -@@ -65,7 +65,7 @@ - * module handling in your code: - * - * Sample of fm-dummy-widget.c -- * -+ * get_new("test sample"); - * return result; - * } -- * -+ * ]]> - * - * - * Third thing application should do is to register module type on the -@@ -108,7 +108,7 @@ - * interface (see the fm-dummy.h header example above): - * - * Sample of module dummy/test -- * -+ * -+ * ]]> - * - * The fm_module_init_dummy should be exactly the same structure that is - * defined in the header file above. --- -2.15.1 - diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb deleted file mode 100644 index 596408353f..0000000000 --- a/meta/recipes-support/libfm/libfm_1.2.5.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Library for file management" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ - file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ - file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ - file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" - - -SECTION = "x11/libs" -DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ - file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ - file://0001-Enclose-text-in-programlisting-into-CDATA.patch \ - " - -SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" -SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" - -inherit autotools pkgconfig gtk-doc gettext distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -EXTRA_OECONF = "--with-gtk=3" - -do_configure[dirs] =+ "${S}/m4" - -PACKAGES =+ "libfm-gtk" -PACKAGES += "${PN}-mime" -FILES_libfm-gtk = " \ - ${libdir}/libfm-gtk*so.* \ - ${libdir}/libfm/modules/gtk* \ - ${bindir}/libfm-pref-apps \ - ${bindir}/lxshortcut \ - ${datadir}/applications/libfm-pref-apps.desktop \ - ${datadir}/applications/lxshortcut.desktop \ - ${datadir}/libfm/images/folder.png \ - ${datadir}/libfm/images/unknown.png \ - ${datadir}/libfm/ui/*.ui \ -" -FILES_${PN}-mime = "${datadir}/mime/" - -do_install_append () { - # remove files which are part of libfm-extra - rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h - rm -f ${D}${includedir}/libfm-1.0/fm-version.h - rm -f ${D}${includedir}/libfm-1.0/fm-extra.h - rm -f ${D}${includedir}/libfm - rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc - rm -f ${D}${libdir}/libfm-extra.so* - rm -f ${D}${libdir}/libfm-extra.a - rm -f ${D}${libdir}/libfm-extra.la -} diff --git a/meta/recipes-support/libfm/libfm_1.3.0.2.bb b/meta/recipes-support/libfm/libfm_1.3.0.2.bb new file mode 100644 index 0000000000..62d6a51e87 --- /dev/null +++ b/meta/recipes-support/libfm/libfm_1.3.0.2.bb @@ -0,0 +1,54 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ + file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" + + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ + file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ + file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ + " + +SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" +SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" + +inherit autotools pkgconfig gtk-doc gettext distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +EXTRA_OECONF = "--with-gtk=3" + +do_configure[dirs] =+ "${S}/m4" + +PACKAGES =+ "libfm-gtk" +PACKAGES += "${PN}-mime" +FILES_libfm-gtk = " \ + ${libdir}/libfm-gtk*so.* \ + ${libdir}/libfm/modules/gtk* \ + ${bindir}/libfm-pref-apps \ + ${bindir}/lxshortcut \ + ${datadir}/applications/libfm-pref-apps.desktop \ + ${datadir}/applications/lxshortcut.desktop \ + ${datadir}/libfm/images/folder.png \ + ${datadir}/libfm/images/unknown.png \ + ${datadir}/libfm/ui/*.ui \ +" +FILES_${PN}-mime = "${datadir}/mime/" + +do_install_append () { + # remove files which are part of libfm-extra + rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h + rm -f ${D}${includedir}/libfm-1.0/fm-version.h + rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${includedir}/libfm + rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc + rm -f ${D}${libdir}/libfm-extra.so* + rm -f ${D}${libdir}/libfm-extra.a + rm -f ${D}${libdir}/libfm-extra.la +} -- cgit 1.2.3-korg