From ce4a24d6d81a707c84e59c6d05a8dd15e8b8830e Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 16 Feb 2012 22:26:48 +0000 Subject: [PATCH] Update to libxklavier-5.2.1. --- x11/gnome/libxklavier/Makefile | 5 ++--- x11/gnome/libxklavier/distinfo | 10 +++++----- .../patches/patch-libxklavier_Makefile_in | 18 ------------------ 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 x11/gnome/libxklavier/patches/patch-libxklavier_Makefile_in diff --git a/x11/gnome/libxklavier/Makefile b/x11/gnome/libxklavier/Makefile index 9614f25e8d8..4224869cad2 100644 --- a/x11/gnome/libxklavier/Makefile +++ b/x11/gnome/libxklavier/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.40 2012/01/19 15:37:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.41 2012/02/16 22:26:48 ajacoutot Exp $ COMMENT= utility library for XKB GNOME_PROJECT= libxklavier -GNOME_VERSION= 5.2 -REVISION= 1 +GNOME_VERSION= 5.2.1 SHARED_LIBS += xklavier 17.0 # .17.0 diff --git a/x11/gnome/libxklavier/distinfo b/x11/gnome/libxklavier/distinfo index 86596371142..3b010f04cdd 100644 --- a/x11/gnome/libxklavier/distinfo +++ b/x11/gnome/libxklavier/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/libxklavier-5.2.tar.xz) = srxoK9gFQ/FOHtDlrTd/wQ== -RMD160 (gnome/libxklavier-5.2.tar.xz) = xCInqa1cXVLJHgvLJeBeZhQHOi0= -SHA1 (gnome/libxklavier-5.2.tar.xz) = gptk5jo9TURjVU9PnnWgBZ2qU5Y= -SHA256 (gnome/libxklavier-5.2.tar.xz) = fB8EqAA14DzsmS4WuJvHCKMrNXjW4TM0PSy1Y4XSXf4= -SIZE (gnome/libxklavier-5.2.tar.xz) = 312864 +MD5 (gnome/libxklavier-5.2.1.tar.xz) = s+cY7hVtDYiD38P/O7hneQ== +RMD160 (gnome/libxklavier-5.2.1.tar.xz) = 7OviVSCsKPzkq0FPjTcZddh0G34= +SHA1 (gnome/libxklavier-5.2.1.tar.xz) = wyKQ4lpg0Q5YX8/IC1kMYCiuD6s= +SHA256 (gnome/libxklavier-5.2.1.tar.xz) = p6HKiuST+2UuNFams6CwdRREcWGqtB/u2WuWjy0zi14= +SIZE (gnome/libxklavier-5.2.1.tar.xz) = 312944 diff --git a/x11/gnome/libxklavier/patches/patch-libxklavier_Makefile_in b/x11/gnome/libxklavier/patches/patch-libxklavier_Makefile_in deleted file mode 100644 index a92cc77e413..00000000000 --- a/x11/gnome/libxklavier/patches/patch-libxklavier_Makefile_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-libxklavier_Makefile_in,v 1.3 2012/01/19 15:37:08 ajacoutot Exp $ - -From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 16 Jan 2012 15:00:18 +0000 -Subject: Use local include files for building GIR - ---- libxklavier/Makefile.in.orig Thu Jan 19 16:15:43 2012 -+++ libxklavier/Makefile.in Thu Jan 19 16:16:10 2012 -@@ -343,7 +343,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - # avoid introspecting private headers - @HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) - @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 --@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) -+@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) - @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_LIBS = libxklavier.la - @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) - @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0