From e20b34bda9109827da6ff30687890020e7bedd90 Mon Sep 17 00:00:00 2001 From: piernov Date: Tue, 6 Mar 2012 12:11:56 +0000 Subject: libxklavier 5.2.1-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libxklavier/.md5sum.i686 | 3 +-- libxklavier/.md5sum.x86_64 | 3 +-- libxklavier/Pkgfile | 6 ++---- libxklavier/use-local-include-for-gir.patch | 23 ----------------------- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 libxklavier/use-local-include-for-gir.patch (limited to 'libxklavier') diff --git a/libxklavier/.md5sum.i686 b/libxklavier/.md5sum.i686 index 24fd8a6ff..131463966 100644 --- a/libxklavier/.md5sum.i686 +++ b/libxklavier/.md5sum.i686 @@ -1,2 +1 @@ -b2bc682bd80543f14e1ed0e5ad377fc1 libxklavier-5.2.tar.xz -d1cc0caeb10ea26e554ea277d679b1a0 use-local-include-for-gir.patch +b3e718ee156d0d8883dfc3ff3bb86779 libxklavier-5.2.1.tar.xz diff --git a/libxklavier/.md5sum.x86_64 b/libxklavier/.md5sum.x86_64 index 24fd8a6ff..131463966 100644 --- a/libxklavier/.md5sum.x86_64 +++ b/libxklavier/.md5sum.x86_64 @@ -1,2 +1 @@ -b2bc682bd80543f14e1ed0e5ad377fc1 libxklavier-5.2.tar.xz -d1cc0caeb10ea26e554ea277d679b1a0 use-local-include-for-gir.patch +b3e718ee156d0d8883dfc3ff3bb86779 libxklavier-5.2.1.tar.xz diff --git a/libxklavier/Pkgfile b/libxklavier/Pkgfile index 5e3cfc64b..37cff246f 100644 --- a/libxklavier/Pkgfile +++ b/libxklavier/Pkgfile @@ -6,14 +6,12 @@ # Run on: hicolor-icon-theme,iso-codes,libxml2,xorg-libx11,glib name=libxklavier -version=5.2 +version=5.2.1 release=1 -source=( http://ftp.gnome.org/pub/GNOME/sources/libxklavier/$version/$name-$version.tar.xz - use-local-include-for-gir.patch) +source=(http://ftp.gnome.org/pub/GNOME/sources/libxklavier/${version%.*}/$name-$version.tar.xz) build() { cd $name-$version - patch -p1 < ../use-local-include-for-gir.patch ./configure --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info diff --git a/libxklavier/use-local-include-for-gir.patch b/libxklavier/use-local-include-for-gir.patch deleted file mode 100644 index 50439efc5..000000000 --- a/libxklavier/use-local-include-for-gir.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - -Add -I argument for g-ir-scanner to use the include files from the local tree -instead of the ones installed in the system. ---- -diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am -index 6c8631a..c53ff6d 100644 ---- a/libxklavier/Makefile.am -+++ b/libxklavier/Makefile.am -@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC - - Xkl-1.0.gir: libxklavier.la - Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 --Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) -+Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) - Xkl_1_0_gir_LIBS = libxklavier.la - Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) - INTROSPECTION_GIRS += Xkl-1.0.gir --- -cgit v0.9.0.2-2-gbebe -- cgit v1.2.3-54-g00ecf