diff mbox series

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

Message ID 20250406072310.862374-2-raj.khem@gmail.com
State New
Headers show
Series [meta-xfce,1/5] openzone: Upgrade to 1.2.4 | expand

Commit Message

Khem Raj April 6, 2025, 7:23 a.m. UTC
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

Comments

Martin Jansa April 7, 2025, 9:44 a.m. UTC | #1
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)?

On Sun, Apr 6, 2025 at 9:23 AM Khem Raj via lists.openembedded.org
<raj.khem=gmail.com@lists.openembedded.org> wrote:
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../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
>
> diff --git a/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
> new file mode 100644
> index 0000000000..1f8730aba0
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
> @@ -0,0 +1,27 @@
> +Description: Fix hotspot y coordinate
> +Author: Tim Swast <tswast@gmail.com>
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +--- 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;
> +                   }
> diff --git a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> index 991133185f..8079f871d1 100644
> --- a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> +++ b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> @@ -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: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj April 7, 2025, 12:55 p.m. UTC | #2
On Mon, Apr 7, 2025 at 2:44 AM Martin Jansa <martin.jansa@gmail.com> wrote:

> 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

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


> packagegroup-meta-oe adjustment)?
>

Please do


> On Sun, Apr 6, 2025 at 9:23 AM Khem Raj via lists.openembedded.org
> <raj.khem=gmail.com@lists.openembedded.org> wrote:
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  .../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
> >
> > diff --git a/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
> b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
> > new file mode 100644
> > index 0000000000..1f8730aba0
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
> > @@ -0,0 +1,27 @@
> > +Description: Fix hotspot y coordinate
> > +Author: Tim Swast <tswast@gmail.com>
> > +
> > +Upstream-Status: Pending
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +--- 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;
> > +                   }
> > diff --git a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> > index 991133185f..8079f871d1 100644
> > --- a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> > +++ b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
> > @@ -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: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
new file mode 100644
index 0000000000..1f8730aba0
--- /dev/null
+++ b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
@@ -0,0 +1,27 @@ 
+Description: Fix hotspot y coordinate
+Author: Tim Swast <tswast@gmail.com>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- 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;
+ 		    }
diff --git a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
index 991133185f..8079f871d1 100644
--- a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
+++ b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
@@ -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