CVS commit: pkgsrc/x11/libxklavier

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Wed Jan 23 15:34:31 UTC 2019

Modified Files:
        pkgsrc/x11/libxklavier: Makefile distinfo
        pkgsrc/x11/libxklavier/patches: patch-ac

Log Message:
Silence useless warning.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/libxklavier/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/libxklavier/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libxklavier/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libxklavier/Makefile
diff -u pkgsrc/x11/libxklavier/Makefile:1.44 pkgsrc/x11/libxklavier/Makefile:1.45
--- pkgsrc/x11/libxklavier/Makefile:1.44        Sun Oct 15 23:19:13 2017
+++ pkgsrc/x11/libxklavier/Makefile     Wed Jan 23 15:34:31 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2017/10/15 23:19:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.45 2019/01/23 15:34:31 youri Exp $
 
 DISTNAME=      libxklavier-5.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  http://pkgs.fedoraproject.org/repo/pkgs/libxklavier/libxklavier-5.4.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/libxklavier/distinfo
diff -u pkgsrc/x11/libxklavier/distinfo:1.26 pkgsrc/x11/libxklavier/distinfo:1.27
--- pkgsrc/x11/libxklavier/distinfo:1.26        Thu Mar 17 12:32:38 2016
+++ pkgsrc/x11/libxklavier/distinfo     Wed Jan 23 15:34:31 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2016/03/17 12:32:38 jperkin Exp $
+$NetBSD: distinfo,v 1.27 2019/01/23 15:34:31 youri Exp $
 
 SHA1 (libxklavier-5.4.tar.bz2) = 6bd04a332700ad43d518167beaafbf734e94bd35
 RMD160 (libxklavier-5.4.tar.bz2) = 0f150c12365264eb68608fac46fb6c7b39628d4e
 SHA512 (libxklavier-5.4.tar.bz2) = e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
 Size (libxklavier-5.4.tar.bz2) = 390428 bytes
 SHA1 (patch-ab) = 15f02943f7a34cb737a8e78264ade06a83b6a1b0
-SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
+SHA1 (patch-ac) = 52df8a9a1912ecdbdd1340e3ac553d07e26c4b84
 SHA1 (patch-libxklavier_libxklavier.public) = b9e6ea17d686c80e6eaa8fbdd3be7fd22d07d250

Index: pkgsrc/x11/libxklavier/patches/patch-ac
diff -u pkgsrc/x11/libxklavier/patches/patch-ac:1.6 pkgsrc/x11/libxklavier/patches/patch-ac:1.7
--- pkgsrc/x11/libxklavier/patches/patch-ac:1.6 Thu Apr 19 21:39:18 2007
+++ pkgsrc/x11/libxklavier/patches/patch-ac     Wed Jan 23 15:34:31 2019
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2007/04/19 21:39:18 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2019/01/23 15:34:31 youri Exp $
 
---- libxklavier/xklavier.c.orig        2007-02-23 21:56:59.000000000 +0000
+--- libxklavier/xklavier.c.orig        2013-02-20 01:10:50.000000000 +0000
 +++ libxklavier/xklavier.c
 @@ -18,6 +18,7 @@
   */
@@ -10,7 +10,19 @@ $NetBSD: patch-ac,v 1.6 2007/04/19 21:39
  #include <time.h>
  
  #include <X11/Xatom.h>
-@@ -492,8 +493,7 @@ xkl_engine_ensure_vtable_inited(XklEngin
+@@ -184,9 +185,11 @@ xkl_engine_start_listen(XklEngine * engi
+           (xkl_engine_priv(engine, features) &
+            XKLF_REQUIRES_MANUAL_LAYOUT_MANAGEMENT)
+ && (what & XKLL_MANAGE_LAYOUTS))
++              /* 
+               xkl_debug(0,
+                         "The backend does not require manual layout management - "
+                         "but it is provided by the application\n");
++              */
+ 
+       xkl_engine_resume_listen(engine);
+       xkl_engine_load_window_tree(engine);
+@@ -517,8 +520,7 @@ xkl_engine_ensure_vtable_inited(XklEngin
        if (xkl_engine_priv(engine, backend_id) == NULL) {
                xkl_debug(0, "ERROR: XKL VTable is NOT initialized.\n");
                /* force the crash! */