Skip to contentSkip to conversation

xhost: update to 1.0.8

PATCH In review Armin Kuster 3 participants 15 messages Mar 10, 2019 – Mar 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/12 xhost: update to 1.0.8

---
 meta/recipes-graphics/xorg-app/{xhost_1.0.7.bb => xhost_1.0.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xhost_1.0.7.bb => xhost_1.0.8.bb} (83%)
meta/recipes-graphics/xorg-app/xhost_1.0.8.bb renamed from meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +2 -2
similarity index 83%
rename from meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
rename to meta/recipes-graphics/xorg-app/xhost_1.0.8.bb
index 77490f5..26bec3f 100644
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
 DEPENDS += "libxmu libxau"
 PE = "1"
 
-SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516"
-SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a"
+SRC_URI[md5sum] = "a48c72954ae6665e0616f6653636da8c"
+SRC_URI[sha256sum] = "a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/12 libxkbcommon: update to 0.8.4

---
 .../xorg-lib/{libxkbcommon_0.8.3.bb => libxkbcommon_0.8.4.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.8.3.bb => libxkbcommon_0.8.4.bb} (83%)
meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.3.bb +2 -2
similarity index 83%
rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.3.bb
rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb
index ff0f069..8fcae12 100644
@@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native"
 
 SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "8225a206e00c4146d2e06f5e688b28e7"
-SRC_URI[sha256sum] = "b855c629849a97ab9835a4ad99d6b749a636f70d38a03f070c6ef72024825540"
+SRC_URI[md5sum] = "3c4409058dfd203f641a563358e0187d"
+SRC_URI[sha256sum] = "60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b"
 
 UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
 
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/12 libfontenc: update to 1.1.4

In reply to Armin Kuster
---
 .../xorg-lib/{libfontenc_1.1.3.bb => libfontenc_1.1.4.bb}           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libfontenc_1.1.3.bb => libfontenc_1.1.4.bb} (72%)
meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb renamed from meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb +3 -3
similarity index 72%
rename from meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
rename to meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb
index 34d5fc4..1fc74b1 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
 DEPENDS += "zlib xorgproto font-util"
 PE = "1"
 
-BBCLASSEXTEND = "native"
+SRC_URI[md5sum] = "6447db6a689fb530c218f0f8328c3abc"
+SRC_URI[sha256sum] = "2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079"
 
-SRC_URI[md5sum] = "0920924c3a9ebc1265517bdd2f9fde50"
-SRC_URI[sha256sum] = "70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21"
+BBCLASSEXTEND = "native"
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/12 xvinfo: update to 1.1.4

In reply to Armin Kuster
---
 meta/recipes-graphics/xorg-app/{xvinfo_1.1.3.bb => xvinfo_1.1.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xvinfo_1.1.3.bb => xvinfo_1.1.4.bb} (71%)
meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb renamed from meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb +2 -2
similarity index 71%
rename from meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
rename to meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb
index 2965ef7..a913ae1 100644
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68"
 DEPENDS += " libxv"
 PE = "1"
 
-SRC_URI[md5sum] = "558360176b718dee3c39bc0648c0d10c"
-SRC_URI[sha256sum] = "9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb"
+SRC_URI[md5sum] = "b13afec137b9b331814a9824ab03ec80"
+SRC_URI[sha256sum] = "0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f"
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/12 xmodmap: update to 1.0.10

In reply to Armin Kuster
---
 .../xorg-app/{xmodmap_1.0.9.bb => xmodmap_1.0.10.bb}                 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xmodmap_1.0.9.bb => xmodmap_1.0.10.bb} (78%)
meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb renamed from meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb +2 -3
similarity index 78%
rename from meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
rename to meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb
index 2deac6a..7dedb03 100644
@@ -12,6 +12,5 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621"
 
 PE = "1"
-
-SRC_URI[md5sum] = "723f02d3a5f98450554556205f0a9497"
-SRC_URI[sha256sum] = "b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478"
+SRC_URI[md5sum] = "51f1d30a525e9903280ffeea2744b1f6"
+SRC_URI[sha256sum] = "473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c"
Signature · 1 line
2.7.4
#5 lore raw

PATCH 6/12 xinit: update to 1.4.1

In reply to Armin Kuster
---
 meta/recipes-graphics/xorg-app/{xinit_1.4.0.bb => xinit_1.4.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xinit_1.4.0.bb => xinit_1.4.1.bb} (79%)
meta/recipes-graphics/xorg-app/xinit_1.4.1.bb renamed from meta/recipes-graphics/xorg-app/xinit_1.4.0.bb +2 -2
similarity index 79%
rename from meta/recipes-graphics/xorg-app/xinit_1.4.0.bb
rename to meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
index dc2a06b..5626ebb 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68"
 
 PE = "1"
 
-SRC_URI[md5sum] = "2da154b2f80ca9637b1a17b13af0880c"
-SRC_URI[sha256sum] = "230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef"
+SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37"
+SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9"
 
 EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
 
Signature · 1 line
2.7.4
#6 lore raw

PATCH 7/12 xev: update to 1.2.3

In reply to Armin Kuster

refactor diet-x11 patch

LIC_FILES_CHKSUM changed to do merging of copyright/license notices
https://gitlab.freedesktop.org/xorg/app/mkfontscale/commit/8609ad731b9c9c670a815c915055ae416d2396d8

---
 meta/recipes-graphics/xorg-app/xev/diet-x11.patch  | 79 ++++++++++++----------
 .../xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}        |  4 +-
 2 files changed, 46 insertions(+), 37 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb} (77%)
meta/recipes-graphics/xorg-app/xev/diet-x11.patch +44 -35
index 6130959..b4415e3 100644
@@ -4,79 +4,88 @@ Upstream-Status: Inappropriate [disable feature]
  xev.c |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-Index: xev-1.2.0/xev.c
+Index: xev-1.2.3/xev.c
 ===================================================================
---- xev-1.2.0.orig/xev.c
-+++ xev-1.2.0/xev.c
-@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp)
-     nbytes = XLookupString (e, str, 256, &ks, NULL);
+--- xev-1.2.3.orig/xev.c
++++ xev-1.2.3/xev.c
+@@ -125,7 +125,7 @@ do_KeyPress(XEvent *eventp)
+     nbytes = XLookupString(e, str, 256, &ks, NULL);
  
      /* not supposed to call XmbLookupString on a key release event */
 -    if (e->type == KeyPress && xic) {
 +    /*if (e->type == KeyPress && xic) {
          do {
-             nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
+             nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status);
              buf[nmbbytes] = '\0';
-@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp)
-                 buf = realloc (buf, bsize);
+@@ -135,7 +135,7 @@ do_KeyPress(XEvent *eventp)
+                 buf = realloc(buf, bsize);
              }
          } while (status == XBufferOverflow);
 -    }
 +    }*/
  
      if (ks == NoSymbol)
- 	ksname = "NoSymbol";
-@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp)
+         ksname = "NoSymbol";
+@@ -168,7 +168,7 @@ do_KeyPress(XEvent *eventp)
      }
  
      /* not supposed to call XmbLookupString on a key release event */
 -    if (e->type == KeyPress && xic) {
-+    /*if (e->type == KeyPress && xic) {
-         printf ("    XmbLookupString gives %d bytes: ", nmbbytes);
++    /* if (e->type == KeyPress && xic) {
+         printf("    XmbLookupString gives %d bytes: ", nmbbytes);
          if (nmbbytes > 0) {
-            dump (buf, nmbbytes);
-@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp)
-         } else {
-     	   printf ("\n");
+             dump(buf, nmbbytes);
+@@ -177,7 +177,7 @@ do_KeyPress(XEvent *eventp)
+         else {
+             printf("\n");
          }
 -    }
 +    } */
  
-     printf ("    XFilterEvent returns: %s\n",
- 	    XFilterEvent (eventp, e->window) ? "True" : "False");
-@@ -1015,7 +1015,7 @@ main (int argc, char **argv)
-         fprintf (stderr, "%s:  XSetLocaleModifiers failed\n", ProgramName);
+     printf("    XFilterEvent returns: %s\n",
+            XFilterEvent(eventp, e->window) ? "True" : "False");
+@@ -1141,7 +1141,7 @@ parse_event_mask(const char *s, long eve
+             if (s)
+                 return True;
+         }
+-    }
++	}*/
+ 
+     if (s != NULL)
+         fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
+@@ -1288,7 +1288,7 @@ main(int argc, char **argv)
+         fprintf(stderr, "%s:  XSetLocaleModifiers failed\n", ProgramName);
      }
  
--    xim = XOpenIM (dpy, NULL, NULL, NULL);
-+    /*xim = XOpenIM (dpy, NULL, NULL, NULL);
+-    xim = XOpenIM(dpy, NULL, NULL, NULL);
++    /*xim = XOpenIM(dpy, NULL, NULL, NULL);
      if (xim == NULL) {
-         fprintf (stderr, "%s:  XOpenIM failed\n", ProgramName);
+         fprintf(stderr, "%s:  XOpenIM failed\n", ProgramName);
      }
-@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
+@@ -1317,7 +1317,7 @@ main(int argc, char **argv)
              }
-             XFree (xim_styles);
+             XFree(xim_styles);
          }
 -    }
-+	}*/
++    }*/
  
-     screen = DefaultScreen (dpy);
+     screen = DefaultScreen(dpy);
  
-@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
- 	printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
+@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
+         printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
      }
  
 -    if (xim && xim_style) {
 +    /*if (xim && xim_style) {
-         xic = XCreateIC (xim,
-                          XNInputStyle, xim_style,
-                          XNClientWindow, w,
-@@ -1119,7 +1119,7 @@ main (int argc, char **argv)
+         xic = XCreateIC(xim,
+                         XNInputStyle, xim_style,
+                         XNClientWindow, w, XNFocusWindow, w, NULL);
+@@ -1381,7 +1381,7 @@ main(int argc, char **argv)
          if (xic == NULL) {
-             fprintf (stderr, "XCreateIC failed\n");
+             fprintf(stderr, "XCreateIC failed\n");
          }
 -    }
 +    }*/
  
-     have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base);
+     have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base);
      if (have_rr) {
meta/recipes-graphics/xorg-app/xev_1.2.3.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb +2 -2
similarity index 77%
rename from meta/recipes-graphics/xorg-app/xev_1.2.2.bb
rename to meta/recipes-graphics/xorg-app/xev_1.2.3.bb
index 0705b7f..6a69e74 100644
@@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto"
 
 SRC_URI += "file://diet-x11.patch"
 
-SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e"
-SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f"
+SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
+SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"
Signature · 1 line
2.7.4
#7 lore raw

Re: [PATCH 07/12] xev: update to 1.2.3

Looks like this is failing with musl:

https://errors.yoctoproject.org/Errors/Details/232435/

Quoted 175 lines · Armin Kuster

refactor diet-x11 patch

LIC_FILES_CHKSUM changed to do merging of copyright/license notices
https://gitlab.freedesktop.org/xorg/app/mkfontscale/commit/8609ad731b9c9c670a815c915055ae416d2396d8

---
 meta/recipes-graphics/xorg-app/xev/diet-x11.patch  | 79
++++++++++++----------
 .../xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}        |  4 +-
 2 files changed, 46 insertions(+), 37 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}

(77%)

meta/recipes-graphics/xorg-app/xev/diet-x11.patch +43 -35
index 6130959..b4415e3 100644
@@ -4,79 +4,88 @@ Upstream-Status: Inappropriate [disable feature]
  xev.c |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-Index: xev-1.2.0/xev.c
+Index: xev-1.2.3/xev.c
 ===================================================================
---- xev-1.2.0.orig/xev.c
-+++ xev-1.2.0/xev.c
-@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp)
-     nbytes = XLookupString (e, str, 256, &ks, NULL);
+--- xev-1.2.3.orig/xev.c
++++ xev-1.2.3/xev.c
+@@ -125,7 +125,7 @@ do_KeyPress(XEvent *eventp)
+     nbytes = XLookupString(e, str, 256, &ks, NULL);
 
      /* not supposed to call XmbLookupString on a key release event
 */
 -    if (e->type == KeyPress && xic) {
 +    /*if (e->type == KeyPress && xic) {
          do {
-             nmbbytes = XmbLookupString (xic, e, buf, bsize - 1,
 &ks, &status);
+             nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks,
 &status);
              buf[nmbbytes] = '\0';
-@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp)
-                 buf = realloc (buf, bsize);
+@@ -135,7 +135,7 @@ do_KeyPress(XEvent *eventp)
+                 buf = realloc(buf, bsize);
              }
          } while (status == XBufferOverflow);
 -    }
 +    }*/
 
      if (ks == NoSymbol)
- 	ksname = "NoSymbol";
-@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp)
+         ksname = "NoSymbol";
+@@ -168,7 +168,7 @@ do_KeyPress(XEvent *eventp)
      }
 
      /* not supposed to call XmbLookupString on a key release event
 */
 -    if (e->type == KeyPress && xic) {
-+    /*if (e->type == KeyPress && xic) {
-         printf ("    XmbLookupString gives %d bytes: ", nmbbytes);
++    /* if (e->type == KeyPress && xic) {
+         printf("    XmbLookupString gives %d bytes: ", nmbbytes);
          if (nmbbytes > 0) {
-            dump (buf, nmbbytes);
-@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp)
-         } else {
-     	   printf ("\n");
+             dump(buf, nmbbytes);
+@@ -177,7 +177,7 @@ do_KeyPress(XEvent *eventp)
+         else {
+             printf("\n");
          }
 -    }
 +    } */
 
-     printf ("    XFilterEvent returns: %s\n",
- 	    XFilterEvent (eventp, e->window) ? "True" : "False");
-@@ -1015,7 +1015,7 @@ main (int argc, char **argv)
-         fprintf (stderr, "%s:  XSetLocaleModifiers failed\n",
 ProgramName);
+     printf("    XFilterEvent returns: %s\n",
+            XFilterEvent(eventp, e->window) ? "True" : "False");
+@@ -1141,7 +1141,7 @@ parse_event_mask(const char *s, long eve
+             if (s)
+                 return True;
+         }
+-    }
++	}*/
+ 
+     if (s != NULL)
+         fprintf(stderr, "%s: unrecognized event mask '%s'\n",
 ProgramName, s);
+@@ -1288,7 +1288,7 @@ main(int argc, char **argv)
+         fprintf(stderr, "%s:  XSetLocaleModifiers failed\n",
 ProgramName);
      }
 
--    xim = XOpenIM (dpy, NULL, NULL, NULL);
-+    /*xim = XOpenIM (dpy, NULL, NULL, NULL);
+-    xim = XOpenIM(dpy, NULL, NULL, NULL);
++    /*xim = XOpenIM(dpy, NULL, NULL, NULL);
      if (xim == NULL) {
-         fprintf (stderr, "%s:  XOpenIM failed\n", ProgramName);
+         fprintf(stderr, "%s:  XOpenIM failed\n", ProgramName);
      }
-@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
+@@ -1317,7 +1317,7 @@ main(int argc, char **argv)
              }
-             XFree (xim_styles);
+             XFree(xim_styles);
          }
 -    }
-+	}*/
++    }*/
 
-     screen = DefaultScreen (dpy);
+     screen = DefaultScreen(dpy);
 
-@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
- 	printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w,
 subw);
+@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
+         printf("Outer window is 0x%lx, inner window is 0x%lx\n", w,
 subw);
      }
 
 -    if (xim && xim_style) {
 +    /*if (xim && xim_style) {
-         xic = XCreateIC (xim,
-                          XNInputStyle, xim_style,
-                          XNClientWindow, w,
-@@ -1119,7 +1119,7 @@ main (int argc, char **argv)
+         xic = XCreateIC(xim,
+                         XNInputStyle, xim_style,
+                         XNClientWindow, w, XNFocusWindow, w, NULL);
+@@ -1381,7 +1381,7 @@ main(int argc, char **argv)
          if (xic == NULL) {
-             fprintf (stderr, "XCreateIC failed\n");
+             fprintf(stderr, "XCreateIC failed\n");
          }
 -    }
 +    }*/
 
-     have_rr = XRRQueryExtension (dpy, &rr_event_base,

&rr_error_base);
+ have_rr = XRRQueryExtension(dpy, &rr_event_base,

&rr_error_base);
      if (have_rr) {
meta/recipes-graphics/xorg-app/xev_1.2.3.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb +0 -2
similarity index 77%
rename from meta/recipes-graphics/xorg-app/xev_1.2.2.bb
rename to meta/recipes-graphics/xorg-app/xev_1.2.3.bb
index 0705b7f..6a69e74 100644
@@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto"
 
 SRC_URI += "file://diet-x11.patch"
 
-SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e"
-SRC_URI[sha256sum] =

"d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f"

meta/recipes-graphics/xorg-app/xev_1.2.3.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb +2 -0
+SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
+SRC_URI[sha256sum] =

"66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"

Signature · 1 line
2.7.4
author
#8 lore raw

Re: [PATCH 07/12] xev: update to 1.2.3

Quoted 1 line · Anuj

Looks like this is failing with musl:

Of course, anything will fall over with a little musl applied against it ; )

Quoted 2 lines

https://errors.yoctoproject.org/Errors/Details/232435/

thanks,
armin

Quoted 177 lines · Armin Kuster
Quoted 175 lines

refactor diet-x11 patch

LIC_FILES_CHKSUM changed to do merging of copyright/license notices
https://gitlab.freedesktop.org/xorg/app/mkfontscale/commit/8609ad731b9c9c670a815c915055ae416d2396d8

---
 meta/recipes-graphics/xorg-app/xev/diet-x11.patch  | 79
++++++++++++----------
 .../xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}        |  4 +-
 2 files changed, 46 insertions(+), 37 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}

(77%)

meta/recipes-graphics/xorg-app/xev/diet-x11.patch +43 -35
index 6130959..b4415e3 100644
@@ -4,79 +4,88 @@ Upstream-Status: Inappropriate [disable feature]
  xev.c |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-Index: xev-1.2.0/xev.c
+Index: xev-1.2.3/xev.c
 ===================================================================
---- xev-1.2.0.orig/xev.c
-+++ xev-1.2.0/xev.c
-@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp)
-     nbytes = XLookupString (e, str, 256, &ks, NULL);
+--- xev-1.2.3.orig/xev.c
++++ xev-1.2.3/xev.c
+@@ -125,7 +125,7 @@ do_KeyPress(XEvent *eventp)
+     nbytes = XLookupString(e, str, 256, &ks, NULL);
 
      /* not supposed to call XmbLookupString on a key release event
 */
 -    if (e->type == KeyPress && xic) {
 +    /*if (e->type == KeyPress && xic) {
          do {
-             nmbbytes = XmbLookupString (xic, e, buf, bsize - 1,
 &ks, &status);
+             nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks,
 &status);
              buf[nmbbytes] = '\0';
-@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp)
-                 buf = realloc (buf, bsize);
+@@ -135,7 +135,7 @@ do_KeyPress(XEvent *eventp)
+                 buf = realloc(buf, bsize);
              }
          } while (status == XBufferOverflow);
 -    }
 +    }*/
 
      if (ks == NoSymbol)
- 	ksname = "NoSymbol";
-@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp)
+         ksname = "NoSymbol";
+@@ -168,7 +168,7 @@ do_KeyPress(XEvent *eventp)
      }
 
      /* not supposed to call XmbLookupString on a key release event
 */
 -    if (e->type == KeyPress && xic) {
-+    /*if (e->type == KeyPress && xic) {
-         printf ("    XmbLookupString gives %d bytes: ", nmbbytes);
++    /* if (e->type == KeyPress && xic) {
+         printf("    XmbLookupString gives %d bytes: ", nmbbytes);
          if (nmbbytes > 0) {
-            dump (buf, nmbbytes);
-@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp)
-         } else {
-     	   printf ("\n");
+             dump(buf, nmbbytes);
+@@ -177,7 +177,7 @@ do_KeyPress(XEvent *eventp)
+         else {
+             printf("\n");
          }
 -    }
 +    } */
 
-     printf ("    XFilterEvent returns: %s\n",
- 	    XFilterEvent (eventp, e->window) ? "True" : "False");
-@@ -1015,7 +1015,7 @@ main (int argc, char **argv)
-         fprintf (stderr, "%s:  XSetLocaleModifiers failed\n",
 ProgramName);
+     printf("    XFilterEvent returns: %s\n",
+            XFilterEvent(eventp, e->window) ? "True" : "False");
+@@ -1141,7 +1141,7 @@ parse_event_mask(const char *s, long eve
+             if (s)
+                 return True;
+         }
+-    }
++	}*/
+ 
+     if (s != NULL)
+         fprintf(stderr, "%s: unrecognized event mask '%s'\n",
 ProgramName, s);
+@@ -1288,7 +1288,7 @@ main(int argc, char **argv)
+         fprintf(stderr, "%s:  XSetLocaleModifiers failed\n",
 ProgramName);
      }
 
--    xim = XOpenIM (dpy, NULL, NULL, NULL);
-+    /*xim = XOpenIM (dpy, NULL, NULL, NULL);
+-    xim = XOpenIM(dpy, NULL, NULL, NULL);
++    /*xim = XOpenIM(dpy, NULL, NULL, NULL);
      if (xim == NULL) {
-         fprintf (stderr, "%s:  XOpenIM failed\n", ProgramName);
+         fprintf(stderr, "%s:  XOpenIM failed\n", ProgramName);
      }
-@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
+@@ -1317,7 +1317,7 @@ main(int argc, char **argv)
              }
-             XFree (xim_styles);
+             XFree(xim_styles);
          }
 -    }
-+	}*/
++    }*/
 
-     screen = DefaultScreen (dpy);
+     screen = DefaultScreen(dpy);
 
-@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
- 	printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w,
 subw);
+@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
+         printf("Outer window is 0x%lx, inner window is 0x%lx\n", w,
 subw);
      }
 
 -    if (xim && xim_style) {
 +    /*if (xim && xim_style) {
-         xic = XCreateIC (xim,
-                          XNInputStyle, xim_style,
-                          XNClientWindow, w,
-@@ -1119,7 +1119,7 @@ main (int argc, char **argv)
+         xic = XCreateIC(xim,
+                         XNInputStyle, xim_style,
+                         XNClientWindow, w, XNFocusWindow, w, NULL);
+@@ -1381,7 +1381,7 @@ main(int argc, char **argv)
          if (xic == NULL) {
-             fprintf (stderr, "XCreateIC failed\n");
+             fprintf(stderr, "XCreateIC failed\n");
          }
 -    }
 +    }*/
 
-     have_rr = XRRQueryExtension (dpy, &rr_event_base,

&rr_error_base);
+ have_rr = XRRQueryExtension(dpy, &rr_event_base,

&rr_error_base);
      if (have_rr) {
meta/recipes-graphics/xorg-app/xev_1.2.3.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb +0 -2
similarity index 77%
rename from meta/recipes-graphics/xorg-app/xev_1.2.2.bb
rename to meta/recipes-graphics/xorg-app/xev_1.2.3.bb
index 0705b7f..6a69e74 100644
@@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto"
 
 SRC_URI += "file://diet-x11.patch"
 
-SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e"
-SRC_URI[sha256sum] =

"d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f"

meta/recipes-graphics/xorg-app/xev_1.2.3.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb +2 -0
+SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
+SRC_URI[sha256sum] =

"66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"

Signature · 1 line
2.7.4
#9 lore raw

PATCH 8/12 kexec-tools: update 2.0.19

In reply to Armin Kuster
---
 .../kexec/{kexec-tools_2.0.18.bb => kexec-tools_2.0.19.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.18.bb => kexec-tools_2.0.19.bb} (95%)
meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.18.bb +2 -2
similarity index 95%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.18.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
index b06c343..f65cd9f 100644
@@ -20,8 +20,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
            file://0001-Disable-PIE-during-link.patch \
            "
 
-SRC_URI[md5sum] = "43845327af54b002aaebd5b8076c7bd7"
-SRC_URI[sha256sum] = "594ac13ea437c70b0d5f0eaf5075b93422b05c23c2a5e21991d2442bbd202d86"
+SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f"
+SRC_URI[sha256sum] = "913c8dee918e5855a4ba60d609371390978144b4c8d15d6446ca0057b7bc5e58"
 
 inherit autotools update-rc.d systemd
 
Signature · 1 line
2.7.4
#10 lore raw

PATCH 9/12 nss: update to 3.42.1

In reply to Armin Kuster

remove nss-fix-SHA_HTONL-bug-for-arm-32be.patch now included

---
 .../nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch   | 34 ----------------------
 .../nss/{nss_3.41.bb => nss_3.42.1.bb}             |  5 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
 rename meta/recipes-support/nss/{nss_3.41.bb => nss_3.42.1.bb} (97%)
meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch deleted +0 -34
deleted file mode 100644
index bb1c6e3..0000000
@@ -1,34 +0,0 @@
-Subject: [PATCH] Fix SHA_HTONL bug for arm 32be.
-
-In arm 32be, there is no need to reverse the host value.
-
-Upstream-Status: Pending
-
-Signed-off-by: Zheng Ruoqin <[email protected]>
----
- lib/freebl/sha_fast.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h
-index 4f37d13..8072eda 100644
---- a/nss/lib/freebl/sha_fast.h
-+++ b/nss/lib/freebl/sha_fast.h
-@@ -99,6 +99,7 @@ swap4b(PRUint32 value)
-       defined(__ARM_ARCH_7__) ||   \
-       defined(__ARM_ARCH_7A__) ||  \
-       defined(__ARM_ARCH_7R__)))
-+#if defined(IS_LITTLE_ENDIAN)  
- static __inline__ PRUint32
- swap4b(PRUint32 value)
- {
-@@ -109,6 +110,7 @@ swap4b(PRUint32 value)
-     return ret;
- }
- #define SHA_HTONL(x) swap4b(x)
-+#endif
- 
- #endif /* x86 family */
- 
--- 
-2.7.4
-
meta/recipes-support/nss/nss_3.42.1.bb renamed from meta/recipes-support/nss/nss_3.41.bb +2 -3
similarity index 97%
rename from meta/recipes-support/nss/nss_3.41.bb
rename to meta/recipes-support/nss/nss_3.42.1.bb
index 5ab22b1..b6bbd80 100644
@@ -28,11 +28,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
            file://blank-cert9.db \
            file://blank-key4.db \
            file://system-pkcs11.txt \
-           file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
            "
 
-SRC_URI[md5sum] = "eec62a289387a7ce2fd9cca1f76600f3"
-SRC_URI[sha256sum] = "ab2e18f5d0dd0079c0005396f9beb9a41e9a1bbc7e6c1d0a99affcef0471712d"
+SRC_URI[md5sum] = "1f6cc6c702379478a3a72298caaef0a7"
+SRC_URI[sha256sum] = "087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
Signature · 1 line
2.7.4
#11 lore raw

PATCH 10/12 nspr: update 4.21

In reply to Armin Kuster
---
 meta/recipes-support/nspr/{nspr_4.20.bb => nspr_4.21.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/nspr/{nspr_4.20.bb => nspr_4.21.bb} (96%)
meta/recipes-support/nspr/nspr_4.21.bb renamed from meta/recipes-support/nspr/nspr_4.20.bb +2 -2
similarity index 96%
rename from meta/recipes-support/nspr/nspr_4.20.bb
rename to meta/recipes-support/nspr/nspr_4.21.bb
index 98ca909..25563e5 100644
@@ -24,8 +24,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
 UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
 
-SRC_URI[md5sum] = "1c198c7e73f6b0e2bb9153a644ba246b"
-SRC_URI[sha256sum] = "2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e"
+SRC_URI[md5sum] = "b865586f19912a50acc3755d8a45dbaa"
+SRC_URI[sha256sum] = "15ea32c7b100217b6e3193bc03e77f485d9bf7504051443ba9ce86d1c17c6b5a"
 
 CVE_PRODUCT = "netscape_portable_runtime"
 
Signature · 1 line
2.7.4
#12 lore raw

PATCH 11/12 gnutls: update 3.6.6

In reply to Armin Kuster

WARNING: gnutls-3.6.6-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --without-libunistring-prefix [unknown-configure-option]

drop --without-libunistring-prefix

---
 meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.6.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.6.bb} (91%)
meta/recipes-support/gnutls/gnutls_3.6.6.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.5.bb +2 -3
similarity index 91%
rename from meta/recipes-support/gnutls/gnutls_3.6.5.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.6.bb
index dfc3507..3cad896 100644
@@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
            file://arm_eabi.patch \
 "
 
-SRC_URI[md5sum] = "3474849e1bbd4d16403b82ab2579000b"
-SRC_URI[sha256sum] = "073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35"
+SRC_URI[md5sum] = "30c5b63686edcd260d87d8fb8a06977f"
+SRC_URI[sha256sum] = "bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
 
@@ -44,7 +44,6 @@ EXTRA_OECONF = " \
     --enable-local-libopts \
     --enable-openssl-compatibility \
     --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
-    --without-libunistring-prefix \
 "
 
 LDFLAGS_append_libc-musl = " -largp"
Signature · 1 line
2.7.4
#13 lore raw

Re: [PATCH 11/12] gnutls: update 3.6.6

Quoted 30 lines · Armin Kuster

WARNING: gnutls-3.6.6-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --without-libunistring-prefix [unknown-configure-option]

drop --without-libunistring-prefix

---
 meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.6.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.6.bb} (91%)
meta/recipes-support/gnutls/gnutls_3.6.6.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.5.bb +2 -2
similarity index 91%
rename from meta/recipes-support/gnutls/gnutls_3.6.5.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.6.bb
index dfc3507..3cad896 100644
@@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
            file://arm_eabi.patch \
 "
 
-SRC_URI[md5sum] = "3474849e1bbd4d16403b82ab2579000b"
-SRC_URI[sha256sum] = "073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35"
+SRC_URI[md5sum] = "30c5b63686edcd260d87d8fb8a06977f"
+SRC_URI[sha256sum] = "bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
 

meta/recipes-support/gnutls/gnutls_3.6.6.bb EXTRA_OECONF = " \ · line 47

Quoted 4 lines
meta/recipes-support/gnutls/gnutls_3.6.6.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.5.bb +0 -1
@@ -44,7 +44,6 @@ EXTRA_OECONF = " \
     --enable-local-libopts \
     --enable-openssl-compatibility \
     --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
-    --without-libunistring-prefix \

this was regressing when attempted to be removed last time see
https://git.openembedded.org/openembedded-core/commit/?id=d8d32b5a58eea161711e3539c4530682de551ede

Does it work when libunstring is installed on build host now ?

Quoted 11 lines
meta/recipes-support/gnutls/gnutls_3.6.6.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.5.bb +0 -1
 "
 
 LDFLAGS_append_libc-musl = " -largp"
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#14 lore raw

PATCH 12/12 xprop: update to 1.2.4

In reply to Armin Kuster
---
 meta/recipes-graphics/xorg-app/{xprop_1.2.3.bb => xprop_1.2.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xprop_1.2.3.bb => xprop_1.2.4.bb} (78%)
meta/recipes-graphics/xorg-app/xprop_1.2.4.bb renamed from meta/recipes-graphics/xorg-app/xprop_1.2.3.bb +2 -2
similarity index 78%
rename from meta/recipes-graphics/xorg-app/xprop_1.2.3.bb
rename to meta/recipes-graphics/xorg-app/xprop_1.2.4.bb
index ca58d47..3280813 100644
@@ -14,5 +14,5 @@ DEPENDS += "libxmu"
 
 PE = "1"
 
-SRC_URI[md5sum] = "4becb3ddc4674d741487189e4ce3d0b6"
-SRC_URI[sha256sum] = "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b"
+SRC_URI[md5sum] = "cc369c28383a5d7144e7197ee7d30bfa"
+SRC_URI[sha256sum] = "8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753"
Signature · 1 line
2.7.4