Skip to contentSkip to conversation

openzone: Upgrade to 1.2.4

PATCH In review Khem Raj 2 participants 7 messages Apr 6, 2025 – Apr 7, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 openzone: Upgrade to 1.2.4

1.2.3 tarballs are not available anywhere

---
 .../cursor-themes/openzone_1.2.3.bb           | 32 ----------------
 .../cursor-themes/openzone_1.2.4.bb           | 38 +++++++++++++++++++
 2 files changed, 38 insertions(+), 32 deletions(-)
 delete mode 100644 meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
 create mode 100644 meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb
meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb deleted +0 -32
deleted file mode 100644
index e47f8c5367..0000000000
@@ -1,32 +0,0 @@
-SUMMARY = "X11 Mouse Theme"
-HOMEPAGE = "http://xfce-look.org/content/show.php/OpenZone?content=111343"
-SECTION = "x11/wm"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a2f562fb8fb1e138b810d69521c4bcd7"
-
-inherit allarch gtk-icon-cache
-
-SRC_URI = "http://xfce-look.org/CONTENT/content-files/111343-OpenZone-${PV}.tar.xz"
-SRC_URI[sha256sum] = "dc20f97a49e1ff1becf7853ef5f137ed30a4c27490540e755021d78d339efd92"
-
-S = "${WORKDIR}/OpenZone"
-
-do_compile() {
-}
-
-do_install() {
-    install -d ${D}${datadir}/icons
-    for theme in `find -name '*.tar.xz'`; do
-        tar -Jxf ${theme} -C ${D}${datadir}/icons
-    done
-}
-
-python populate_packages:prepend () {
-    icondir = bb.data.expand('${datadir}/icons', d)
-    do_split_packages(d, icondir, '^(.*)', '%s', 'Open Zone cursors %s', allow_dirs=True)
-}
-
-FILES:${PN} += "${datadir}/icons"
-
-PACKAGES_DYNAMIC += "^openzone-.*"
-ALLOW_EMPTY:${PN} = "1"
meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb new file +38 -0
new file mode 100644
index 0000000000..4b2071eb3f
@@ -0,0 +1,38 @@
+SUMMARY = "X11 Mouse Theme"
+HOMEPAGE = "http://xfce-look.org/content/show.php/OpenZone?content=111343"
+SECTION = "x11/wm"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a4dd0d1066e1f1224b3bc4bbb206b754"
+
+inherit allarch gtk-icon-cache
+
+SRC_URI = "https://mirrors.dotsrc.org/mirrors/exherbo/111343-OpenZone-${PV}.tar.xz"
+SRC_URI[sha256sum] = "db6fa6d0798aceb56998ce81382fa2246c77911d56b3b06e6aadee4cf5b4816e"
+
+S = "${WORKDIR}/OpenZone"
+
+do_compile() {
+}
+
+do_install() {
+    install -d ${D}${datadir}/icons
+    for theme in `find -name '*.tar.xz'`; do
+        tar -Jxf ${theme} -C ${D}${datadir}/icons
+    done
+}
+
+python populate_packages:prepend () {
+    icondir = d.expand('${datadir}/icons/')
+    iconname = d.expand('${PN}-%s')
+    do_split_packages(d, icondir, '^(.*)',
+                      iconname,
+                      'Open Zone cursors %s',
+                      extra_depends='',
+                      prepend=True,
+                      aux_files_pattern=['${datadir}/icons/%s/*'])
+}
+
+FILES:${PN} += "${datadir}/icons"
+
+PACKAGES_DYNAMIC += "^${PN}-.*"
+ALLOW_EMPTY:${PN} = "1"
author
#1 lore raw

PATCH 2/5 icon-slicer: Fix hotspot y coordinates

---
 .../icon-slicer/files/hotspotfix.patch        | 27 +++++++++++++++++++
 .../icon-slicer/icon-slicer_0.3.bb            |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch new file +27 -0
new file mode 100644
index 0000000000..1f8730aba0
@@ -0,0 +1,27 @@
+Description: Fix hotspot y coordinate
+Author: Tim Swast <[email protected]>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+--- a/src/main.c
++++ b/src/main.c
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
++      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+       
+@@ -137,8 +137,8 @@
+ 		    {
+ 		      min_x = start_x + i;
+ 		      max_x = start_x + i + 1;
+-		      min_y = start_y + i;
+-		      max_y = start_y + i + 1;
++		      min_y = start_y + j;
++		      max_y = start_y + j + 1;
+ 
+ 		      found = TRUE;
+ 		    }
meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +4 -2
index 991133185f..8079f871d1 100644
@@ -1,10 +1,12 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gdk-pixbuf popt"
+DEPENDS = "gdk-pixbuf popt xcursorgen"
 
 SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BPN}-${PV}.tar.gz \
-           file://0001-Makefile.am-no-examples.patch"
+           file://0001-Makefile.am-no-examples.patch \
+           file://hotspotfix.patch \
+           "
 SRC_URI[sha256sum] = "05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d"
 
 inherit autotools pkgconfig
#2 lore raw

Re: [oe] [meta-oe][PATCH 2/5] icon-slicer: Fix hotspot y coordinates

xcursorgen is available only with x11 in DISTRO_FEATURES, so this should get

inherit features_check
REQUIRED_DISTRO_FEATURES = "x11"

as well, do you want me to send patch with this (and packagegroup-meta-oe adjustment)?

Quoted 69 lines · Khem Raj via lists.openembedded.org
---
 .../icon-slicer/files/hotspotfix.patch        | 27 +++++++++++++++++++
 .../icon-slicer/icon-slicer_0.3.bb            |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch new file +27 -0
new file mode 100644
index 0000000000..1f8730aba0
@@ -0,0 +1,27 @@
+Description: Fix hotspot y coordinate
+Author: Tim Swast <[email protected]>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+--- a/src/main.c
++++ b/src/main.c
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
++      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+
+@@ -137,8 +137,8 @@
+                   {
+                     min_x = start_x + i;
+                     max_x = start_x + i + 1;
+-                    min_y = start_y + i;
+-                    max_y = start_y + i + 1;
++                    min_y = start_y + j;
++                    max_y = start_y + j + 1;
+
+                     found = TRUE;
+                   }
meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +4 -3
index 991133185f..8079f871d1 100644
@@ -1,10 +1,12 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gdk-pixbuf popt"
+DEPENDS = "gdk-pixbuf popt xcursorgen"
 
 SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BPN}-${PV}.tar.gz \
-           file://0001-Makefile.am-no-examples.patch"
+           file://0001-Makefile.am-no-examples.patch \
+           file://hotspotfix.patch \
+           "
 SRC_URI[sha256sum] = "05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d"
 
 inherit autotools pkgconfig
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#116606): https://lists.openembedded.org/g/openembedded-devel/message/116606
Mute This Topic: https://lists.openembedded.org/mt/112112278/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#3 lore raw

Re: [oe] [meta-oe][PATCH 2/5] icon-slicer: Fix hotspot y coordinates

Quoted 5 lines · Martin Jansa

xcursorgen is available only with x11 in DISTRO_FEATURES, so this should get

inherit features_check
REQUIRED_DISTRO_FEATURES = "x11"

Right although I wonder about native version since that is what is used

Quoted 7 lines

as well, do you want me to send patch with this (and

packagegroup-meta-oe adjustment)?

Please do

Quoted 79 lines
Quoted 7 lines · Khem Raj via lists.openembedded.org
---
 .../icon-slicer/files/hotspotfix.patch        | 27 +++++++++++++++++++
 .../icon-slicer/icon-slicer_0.3.bb            |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644

meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch

Review

Quoted 33 lines

new file mode 100644
index 0000000000..1f8730aba0

meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch new file +27 -0
@@ -0,0 +1,27 @@
+Description: Fix hotspot y coordinate
+Author: Tim Swast <[email protected]>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+--- a/src/main.c
++++ b/src/main.c
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
++      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+
+@@ -137,8 +137,8 @@
+                   {
+                     min_x = start_x + i;
+                     max_x = start_x + i + 1;
+-                    min_y = start_y + i;
+-                    max_y = start_y + i + 1;
++                    min_y = start_y + j;
++                    max_y = start_y + j + 1;
+
+                     found = TRUE;
+                   }
(quoted diff) +0 -0

b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb

meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb line 6

Quoted 11 lines

index 991133185f..8079f871d1 100644

meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +1 -1
@@ -1,10 +1,12 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gdk-pixbuf popt"
+DEPENDS = "gdk-pixbuf popt xcursorgen"
 
 SRC_URI = "

http://freedesktop.org/software/${BPN}/releases/${BPN}-${PV}.tar.gz \

meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb

Quoted 5 lines
meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +3 -1
-           file://0001-Makefile.am-no-examples.patch"
+           file://0001-Makefile.am-no-examples.patch \
+           file://hotspotfix.patch \
+           "
 SRC_URI[sha256sum] =

"05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d"

Quoted 6 lines
meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +0 -1
 inherit autotools pkgconfig
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group. View/Reply Online (#116606):

https://lists.openembedded.org/g/openembedded-devel/message/116606

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/112112278/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

author
#4 lore raw

PATCH 3/5 ssmping: Use debian mirror for SRC_URI

In reply to Khem Raj

Original URI is not accessible anymore
Drop md5sum

---
 meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +1 -2
index 2d63119750..9b1413df2e 100644
@@ -4,10 +4,9 @@ SECTION = "net"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71"
 
-SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \
     file://0001-Makefile-tweak-install-dir.patch \
 "
-SRC_URI[md5sum] = "ad8e3d13f6d72918f73be7e7975d7fad"
 SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d"
 
 CFLAGS += "-D_GNU_SOURCE "
author
#5 lore raw

PATCH 4/5 system-config-keyboard: Drop recipe

In reply to Khem Raj

This package is dead and tarballs are also gone. 1.4.0 release was in 2013

---
 .../packagegroups/packagegroup-meta-oe.bb     |  1 -
 .../system-config-keyboard_1.4.0.bb           | 27 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +0 -1
index 70d05c44bc..ebb0f0f810 100644
@@ -876,7 +876,6 @@ RDEPENDS:packagegroup-meta-oe-support = "\
     stm32flash \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \
     syslog-ng \
-    system-config-keyboard \
     tbb \
     tokyocabinet \
     tree \
meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb deleted +0 -27
deleted file mode 100644
index 71578e71d6..0000000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "a graphical user interface that allows the user to \
-change the default keyboard of the system"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284"
-
-inherit python3-dir gettext
-DEPENDS += "intltool-native gettext-native"
-
-EXTRA_OEMAKE = " \
-    PYTHON='${STAGING_BINDIR_NATIVE}'/python-native/python \
-    PYTHON_SITELIB=${PYTHON_SITEPACKAGES_DIR} \
-"
-do_install() {
-    oe_runmake 'DESTDIR=${D}' install
-}
-
-do_install:append:class-native() {
-    rm -rf ${D}/usr
-}
-
-FILES:${PN} += " \
-   ${libdir}/python${PYTHON_BASEVERSION}/* \
-   ${datadir}/* \
-"
-BBCLASSEXTEND = "native"
author
#6 lore raw

PATCH 5/5 unicode-ucd: Updates due to license.txt updates

In reply to Khem Raj

This is downloaded and does not have version, so we have to update it whenever upstream update it. The copyright year is changed this time.

---
 meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +2 -2
index 026d4ffe02..302b86009a 100644
@@ -1,14 +1,14 @@
 SUMMARY = "Unicode Character Database"
 HOMEPAGE = "https://unicode.org/ucd/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=ea17640caddb659394df50e5db6efd69"
 
 SRC_URI = " \
     https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \
     https://www.unicode.org/license.txt;name=ucd-license \
 "
 SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600"
-SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519"
+SRC_URI[ucd-license.sha256sum] = "abf84f74dea2812799e1dbef7f0581adf7db244881e4febb8684f441568da0ad"
 
 inherit allarch