From 544faba6c95f3c45b8107ecb119fd195058608fe Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 4 Aug 2015 22:05:12 +0200 Subject: gparted: update to 0.23.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a patch better than mine was applied mainline Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- ...c-use-pkg-config-to-check-for-version-of-.patch | 68 ---------------------- .../recipes-extended/gparted/gparted_0.20.0.bb | 21 ------- .../recipes-extended/gparted/gparted_0.23.0.bb | 18 ++++++ 3 files changed, 18 insertions(+), 89 deletions(-) delete mode 100644 meta-gnome/recipes-extended/gparted/gparted/0001-configure.ac-use-pkg-config-to-check-for-version-of-.patch delete mode 100644 meta-gnome/recipes-extended/gparted/gparted_0.20.0.bb create mode 100644 meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb (limited to 'meta-gnome/recipes-extended') diff --git a/meta-gnome/recipes-extended/gparted/gparted/0001-configure.ac-use-pkg-config-to-check-for-version-of-.patch b/meta-gnome/recipes-extended/gparted/gparted/0001-configure.ac-use-pkg-config-to-check-for-version-of-.patch deleted file mode 100644 index 1c99ff5129..0000000000 --- a/meta-gnome/recipes-extended/gparted/gparted/0001-configure.ac-use-pkg-config-to-check-for-version-of-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a39d205ec3c6db6fe98aa2c7f8352db767557f60 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 12 Nov 2014 11:26:19 +0100 -Subject: [PATCH] configure.ac: use pkg-config to check for version of gparted -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -running test programs causes headaches when cross-compiling - -Upstream-Status: submitted [1] - -[1] https://bugzilla.gnome.org/show_bug.cgi?id=740004 - -Signed-off-by: Andreas Müller ---- - configure.ac | 34 ++++++---------------------------- - 1 file changed, 6 insertions(+), 28 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 37025b0..17bb686 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,35 +48,13 @@ LIBPARTED_REQUIRED_VERSION='1.7.1' - AC_MSG_CHECKING([for libparted >= $LIBPARTED_REQUIRED_VERSION]) - LIBPARTED_REQUIRED_INT=`echo "$LIBPARTED_REQUIRED_VERSION" | - $AWK -F. '{print $1 * 10000 + $2 * 100 + $3}'` --AC_RUN_IFELSE( -- [AC_LANG_SOURCE( -- [[ --#include --#include --#include -- --int main() --{ -- const char *version = ped_get_version(); -- if (version == NULL) -- { -- fprintf(stderr, "ERROR: ped_get_version() returned NULL\n"); -- return EXIT_FAILURE; -- } -- printf("%s\n", version); -- return EXIT_SUCCESS; --} -- ]] -- )], -- dnl Run test program again to cache libparted version. -- [LIBPARTED_FOUND_VERSION=`./conftest$EXEEXT` -- LIBPARTED_FOUND_INT=`echo "$LIBPARTED_FOUND_VERSION" | -- $AWK -F. '{print $1 * 10000 + $2 * 100 + $3}'` -- test "$LIBPARTED_FOUND_INT" -ge "$LIBPARTED_REQUIRED_INT" || -+ -+LIBPARTED_FOUND_VERSION="`pkg-config libparted --modversion`" -+LIBPARTED_FOUND_INT=`echo "$LIBPARTED_FOUND_VERSION" | -+ $AWK -F. '{print $1 * 10000 + $2 * 100 + $3}'` -+ -+test "$LIBPARTED_FOUND_INT" -ge "$LIBPARTED_REQUIRED_INT" || - AC_MSG_ERROR([*** libparted too old. Require libparted >= $LIBPARTED_REQUIRED_VERSION but only found libparted $LIBPARTED_FOUND_VERSION.]) -- ], -- [AC_MSG_ERROR([*** Error querying libparted version. Check config.log for details.])] --) - - - dnl Check for libparted >= 2.2 for improved informing the kernel to --- -1.8.3.1 - diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.20.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.20.0.bb deleted file mode 100644 index 30eac8e55a..0000000000 --- a/meta-gnome/recipes-extended/gparted/gparted_0.20.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A partition editor to graphically manage disk partitions " -HOMEPAGE = "http://gparted.org/index.php" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit autotools pkgconfig - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \ - file://0001-configure.ac-use-pkg-config-to-check-for-version-of-.patch \ -" -SRC_URI[md5sum] = "d9df57f9d4b4dbd148644774f8bbccfb" -SRC_URI[sha256sum] = "9b34d73d4519352a7e7344c8403ef61253be1b4db3ff332c397b0b1eb5c1ddc2" - -DEPENDS = "glib-2.0 gtkmm parted" - -EXTRA_OECONF = "--disable-scrollkeeper --disable-doc" - -FILES_${PN} += "${datadir}/icons ${datadir}/appdata" - -RDEPENDS_${PN} = "dosfstools mtools e2fsprogs" diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb new file mode 100644 index 0000000000..070543910a --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "A partition editor to graphically manage disk partitions " +HOMEPAGE = "http://gparted.org/index.php" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "5901dca33ced32213cccb13a2713dea8" +SRC_URI[sha256sum] = "7fd1dddf29814c2982f55ab765b8918561e1b5dabf792012c66b4d3ba25da754" + +DEPENDS = "glib-2.0 gtkmm parted" + +EXTRA_OECONF = "--disable-scrollkeeper --disable-doc" + +FILES_${PN} += "${datadir}/icons ${datadir}/appdata" + +RDEPENDS_${PN} = "dosfstools mtools e2fsprogs" -- cgit 1.2.3-korg