From patchwork Mon May 13 21:02:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 43527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2309EC25B5F for ; Mon, 13 May 2024 21:02:30 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.5033.1715634142532871950 for ; Mon, 13 May 2024 14:02:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hLRHi3Pn; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1ecc23e6c9dso31454005ad.2 for ; Mon, 13 May 2024 14:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715634142; x=1716238942; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tcb8JQ1Ftvee7sSDintfkyOPlxa7VXFQ4uPomq8/Cs8=; b=hLRHi3PnKNXKI1zKeTC7Iq3m7IrrxmBavMpHBTmLql5o3i5glgKFwNKliWoO4/WJJo LRZ/tnQjYKR7WjydZ/do4WLUOEqHqeJDSV+DbBw/ZFiRgl7VGmXV2AjV3Bb/R+e+x47v R1Aj+uoE7tdiHtBwolMrdl5uv5dU6o4PUI6HsXg9t51aav7mSDK4kSTk431NaL93ze/g ZYofHLwxYsFdCUEvswv2J0cABMYUNkpycjgmg2fqukx7wi4U1y+nCseMwVgPB10bZVkf CiFdOCHPz+BloG+SLUfbRsfZlvnosPZruy6unrNqfnRgsU2dQZ/8oZ6MR6Wk4IyNCavT 5E8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715634142; x=1716238942; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tcb8JQ1Ftvee7sSDintfkyOPlxa7VXFQ4uPomq8/Cs8=; b=UOEUI0qC/KO7KwLEhG5lh5XTg43vjEViw+02P+Mo/UVr/SeF72V6o50242CPFeh5o0 b4KKnev9qB8gILSuCJFuiCTMm1WT7UCf+Zt6e8DL5fJl7LdPzqJvZzE5Ip6jCMT+SOiS YJmX0kcn2RXcaqeFLxBiVQUOcnbtbygr0hhKHTIymNutKPfBQGTqNTvF7lxwYzgaBHuM uRu7Q2JP2BqXuO4KKkGEMvN3bsvAtSUzaRJmgk7Y0aQD/Zr+5EW4f+phTMdAArV0i2UZ 2F7vkol9iqPjlsxfsafrf+q37SLy5ZuV3HdgQAPOOssIq+ov53ld/qWUyoOoyDmhM2v+ C0Nw== X-Gm-Message-State: AOJu0YymIUvoa4YmU9Y/D18S2sHb9M4TOQ9oBJ3KCDvCvPS9hO5TLytu GT4JOBjdlLeInltu7QFkE9lZFMRCOs9smkq+HTVQlbdcwvLnW4iXrvX5sTcEoQM= X-Google-Smtp-Source: AGHT+IFSmn3ttqxpUz0wjhiJJX3ZWd4TTnxVHLMZ8oVd4KWExYTEkA7Ny98DopDpFye2UIEwa344/w== X-Received: by 2002:a17:902:ea0d:b0:1e4:32b9:c39d with SMTP id d9443c01a7336-1ef43d0a0b1mr135881575ad.13.1715634141403; Mon, 13 May 2024 14:02:21 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::6fff]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0bf316f7sm83678735ad.164.2024.05.13.14.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 14:02:21 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Martin Jansa Subject: [meta-oe][PATCH] orrery: Drop recipe Date: Mon, 13 May 2024 14:02:18 -0700 Message-ID: <20240513210218.3194402-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 May 2024 21:02:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110344 This recipe does not compile with gcc-14, looking at its history this package comes from maemo5 days, There are no direct dependents in meta-openembedded so I am proposing to remove it. Last commit to this repo was made 12+ years ago. Signed-off-by: Khem Raj Cc: Martin Jansa --- .../packagegroups/packagegroup-meta-oe.bb | 1 - ...instead-of-overriding-in-Makefile.am.patch | 28 -------- .../0001-orrery-Fix-sprintf-format.patch | 28 -------- .../orrery/orrery/orrery.png | Bin 19475 -> 0 bytes .../orrery/orrery/use.GdkPixbuf.patch | 61 ------------------ .../recipes-navigation/orrery/orrery_2.7.bb | 37 ----------- 6 files changed, 155 deletions(-) delete mode 100644 meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch delete mode 100644 meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch delete mode 100644 meta-oe/recipes-navigation/orrery/orrery/orrery.png delete mode 100644 meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch delete mode 100644 meta-oe/recipes-navigation/orrery/orrery_2.7.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 7544a9fbfa..c5f8dce979 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -688,7 +688,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ RDEPENDS:packagegroup-meta-oe-navigation ="\ geos \ ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ geoclue \ libspatialite \ proj \ diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch deleted file mode 100644 index 829ace09b5..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 26 May 2023 10:32:53 -0700 -Subject: [PATCH] Append cflags instead of overriding in Makefile.am - -Fixes -WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b64449f..23637b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --CFLAGS = -g -O3 -Wall -+CFLAGS += -g -O3 -Wall - - bin_PROGRAMS = orrery - orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h --- -2.40.1 - diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch deleted file mode 100644 index 3d5828011a..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 21:12:17 -0700 -Subject: [PATCH] orrery: Fix sprintf format - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - orrery.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/orrery.c b/orrery.c -index e3a1f6d..1b31a9f 100644 ---- a/orrery.c -+++ b/orrery.c -@@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) - displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, - 12, scratchString); - for (day = 0; day < 7; day++) { -- sprintf(scratchString, dayName[day]); -+ sprintf(scratchString, "%s", dayName[day]); - gdk_draw_string(pixmap, smallFont, blueGC, - CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - - gdk_string_width(smallFont, scratchString)/2, --- -2.13.2 - diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png deleted file mode 100644 index d9865b70ce777d6e4b4c437f73095d2329e222ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19475 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 ScFe&`q`Fg0$0Ox~7W_XxaP++Z diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch deleted file mode 100644 index 2abb320d83..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream-Status: Pending - -From: Benjamin Deering -Subject: orrery crashing X -Date: Thursday, September 2, 2010 - 5:25 pm -Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 - -diff -uNr orrery.orig//orrery.c orrery/orrery.c ---- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 -+++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 -@@ -1238,12 +1238,44 @@ - } - currentEntry = currentEntry->forwardPointer; - } -- if (nDarkGreyPoints > 0) -- gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); -- if (nGreyPoints > 0) -- gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); -- if (nWhitePoints > 0) -- gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); -+ GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, -+ pixmap, -+ gdk_colormap_get_system() -+ , 0, 0, 0, 0, displayWidth, displayHeight); -+ g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); -+ guchar* p; -+ int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); -+ guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); -+ int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); -+ GdkGCValues starGCval; -+ GdkColor starColor; -+ int pointNum; -+ gdk_gc_get_values(darkGreyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { -+ p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(greyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { -+ p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(whiteGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { -+ p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, -+ 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; - } - - void makeTimeString(char *string) diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb deleted file mode 100644 index 96a7018de2..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Astronomical application which displays the night sky" -HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" -SECTION = "x11/scientific" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" -DEPENDS = "gtk+" - -inherit features_check autotools-brokensep pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ - file://orrery.png \ - file://use.GdkPixbuf.patch \ - file://0001-orrery-Fix-sprintf-format.patch \ - file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ - " - -SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" -SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" - -S = "${WORKDIR}/${BPN}" - -do_configure:prepend() { - # fix DSO issue with binutils-2.22 - sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am -} -do_install:append() { - install -d ${D}${datadir}/orrery - cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery - chown -R root:root ${D}${datadir}/orrery - install -d ${D}${datadir}/icons - install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons - rm -rf ${D}${datadir}/orrery/Makefile* -} - -FILES:${PN} += "${datadir}/icons/orrery.png"