[pkgsrc/trunk]: pkgsrc/x11/libxklavier Update to 2.0:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/libxklavier Update to 2.0:
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:33:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/522fdd4e7ee0
branches:  trunk
changeset: 491228:522fdd4e7ee0
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Mar 22 16:05:13 2005 +0000

description:
Update to 2.0:

2.0     New stable release (for GNOME 2.10). Minor changes since 1.14:
        some optimization and cleanup.
1.14    Memory leaks nailed. Some minor restructuring. Bugfixing.
        A couple of XKL_*_DISABLE envvars introduced.
1.13    Some build process cleanup and fixes. One more "virtual function"
        introduced.
1.12    First version with real xmodmap support. Sure, bugs are possible.
        I did it again - broke API. Really hope no API changes in 1.1x
        series any more.
1.11    A lot of internal changes. VTable introduced (so now at some
        point there can be implemented xmodmap backend). Some bugs were
        fixed.
1.10    Some internal reorganization in the xklavier-config department.
        API/ABI are broken. All this stuff is going to be used in
        GNOME 2.9x. The environment variable XKL_DEBUG introduced in
        order to control the debug info more handy. Minor portability
        bug was fixed.

diffstat:

 x11/libxklavier/Makefile         |  10 +++++++---
 x11/libxklavier/buildlink3.mk    |   5 ++---
 x11/libxklavier/distinfo         |  13 ++++++-------
 x11/libxklavier/patches/patch-aa |  32 +++++++++++++++-----------------
 x11/libxklavier/patches/patch-ab |  21 ---------------------
 x11/libxklavier/patches/patch-ac |  21 ---------------------
 6 files changed, 30 insertions(+), 72 deletions(-)

diffs (151 lines):

diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/Makefile
--- a/x11/libxklavier/Makefile  Tue Mar 22 16:04:44 2005 +0000
+++ b/x11/libxklavier/Makefile  Tue Mar 22 16:05:13 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/22 16:05:13 jmmv Exp $
 #
 
-DISTNAME=      libxklavier-1.04
-PKGREVISION=   1
+DISTNAME=      libxklavier-2.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
@@ -19,6 +18,11 @@
 
 PKGCONFIG_OVERRIDE=    libxklavier.pc.in
 
+CONFIGURE_ARGS+=       --enable-xkb-support
+CONFIGURE_ARGS+=       --enable-xmm-support
+
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/buildlink3.mk
--- a/x11/libxklavier/buildlink3.mk     Tue Mar 22 16:04:44 2005 +0000
+++ b/x11/libxklavier/buildlink3.mk     Tue Mar 22 16:05:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/22 16:05:13 jmmv Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBXKLAVIER_BUILDLINK3_MK:=    ${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@
 BUILDLINK_PACKAGES+=   libxklavier
 
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxklavier+=                libxklavier>=1.00
-BUILDLINK_RECOMMENDED.libxklavier+=    libxklavier>=1.04nb1
+BUILDLINK_DEPENDS.libxklavier+=                libxklavier>=2.0
 BUILDLINK_PKGSRCDIR.libxklavier?=      ../../x11/libxklavier
 .endif # LIBXKLAVIER_BUILDLINK3_MK
 
diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/distinfo
--- a/x11/libxklavier/distinfo  Tue Mar 22 16:04:44 2005 +0000
+++ b/x11/libxklavier/distinfo  Tue Mar 22 16:05:13 2005 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/22 16:05:13 jmmv Exp $
 
-SHA1 (libxklavier-1.04.tar.gz) = 6b909ef1320255144034a8bcdbb7cdaa15db156e
-RMD160 (libxklavier-1.04.tar.gz) = af26888399a4936f73e432d4b61e457365ae6f65
-Size (libxklavier-1.04.tar.gz) = 422337 bytes
-SHA1 (patch-aa) = 7746a3876cde51cfb08c58bd173a18520eb62d77
-SHA1 (patch-ab) = 77e692a927f80c592ecd9caed989ac24fbe9048a
-SHA1 (patch-ac) = 6fc58f67e95e6c8ea8df1e42c29493be61b9f8c1
+SHA1 (libxklavier-2.0.tar.gz) = 2eae2b8013be972172374fb5cc71a4f368c41d76
+RMD160 (libxklavier-2.0.tar.gz) = a8f219a61f47ed1bb0f801d0e78512b4275e0082
+Size (libxklavier-2.0.tar.gz) = 435898 bytes
+SHA1 (patch-aa) = c545095d06dbacf9452d138fdef6fcf485457d11
+SHA1 (patch-ab) = 0da271f9ee8a9b7bfeffa8f12b9d66cec5635e2c
diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/patches/patch-aa
--- a/x11/libxklavier/patches/patch-aa  Tue Mar 22 16:04:44 2005 +0000
+++ b/x11/libxklavier/patches/patch-aa  Tue Mar 22 16:05:13 2005 +0000
@@ -1,19 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2004/10/02 15:44:15 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/22 16:05:13 jmmv Exp $
 
---- libxklavier/xklavier_config_xkb.c.orig     2004-10-02 16:45:49.000000000 +0200
-+++ libxklavier/xklavier_config_xkb.c
-@@ -184,10 +184,13 @@ Bool XklMultipleLayoutsSupported( void )
+--- configure.orig     2005-02-26 00:02:18.000000000 +0100
++++ configure
+@@ -20135,9 +20135,9 @@ fi
  
-   if ( supportState == UNCHECKED )
-   {
-+#ifdef XKB_HEADERS_PRESENT
-+    XkbRF_RulesPtr rulesPtr;
-+#endif
-     XklDebug( 100, "!!! Checking multiple layouts support\n" );
-     supportState = NON_SUPPORTED;
- #ifdef XKB_HEADERS_PRESENT
--    XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
-+    rulesPtr = _XklLoadRulesSet();
-     if ( rulesPtr )
-     {
-       XkbRF_VarDefsRec varDefs;
+ echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
+ echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
+-if test \( "$enable_xkb_support" == "yes" -a \
+-          "$xkb_headers_present" == "yes" \) -o \
+-        "$enable_xmm_support" == "yes" ; then
++if test \( "$enable_xkb_support" = "yes" -a \
++          "$xkb_headers_present" = "yes" \) -o \
++        "$enable_xmm_support" = "yes" ; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/patches/patch-ab
--- a/x11/libxklavier/patches/patch-ab  Tue Mar 22 16:04:44 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/03 11:22:58 jmmv Exp $
-
---- tests/test_config.c.orig   2004-10-01 21:52:02.000000000 +0200
-+++ tests/test_config.c
-@@ -46,6 +46,7 @@ int main( int argc, char * const argv[] 
-   const char* layouts = NULL;
-   const char* options = NULL;
-   int debugLevel = 0;
-+  Display* dpy;
- 
-   while (1)
-   {
-@@ -89,7 +90,7 @@ int main( int argc, char * const argv[] 
-     exit( 0 );
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
diff -r 1662a6db5954 -r 522fdd4e7ee0 x11/libxklavier/patches/patch-ac
--- a/x11/libxklavier/patches/patch-ac  Tue Mar 22 16:04:44 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/11/03 11:22:58 jmmv Exp $
-
---- tests/test_monitor.c.orig  2004-10-01 21:52:02.000000000 +0200
-+++ tests/test_monitor.c
-@@ -41,6 +41,7 @@ int main( int argc, char * argv[] )
- {
-   int c;
-   int debugLevel = 0;
-+  Display* dpy;
-   XkbEvent ev;
- 
-   while (1)
-@@ -63,7 +64,7 @@ int main( int argc, char * argv[] )
-     }
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/gnome-icon-theme Update to 2.10.0:
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/gtk2-engines Update to 2.6.2:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/gnome-icon-theme Update to 2.10.0:
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtk2-engines Update to 2.6.2:
Indexes:
Home | Main Index | Thread Index | Old Index