[arch-commits] Commit in m17n-lib/trunk (PKGBUILD locale.patch)
Gaetan Bisson
bisson at archlinux.org
Mon Oct 17 07:25:26 UTC 2011
Date: Monday, October 17, 2011 @ 03:25:25
Author: bisson
Revision: 140554
upstream update
Modified:
m17n-lib/trunk/PKGBUILD
Deleted:
m17n-lib/trunk/locale.patch
--------------+
PKGBUILD | 28 +++++++++++++---------------
locale.patch | 51 ---------------------------------------------------
2 files changed, 13 insertions(+), 66 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-17 07:25:12 UTC (rev 140553)
+++ PKGBUILD 2011-10-17 07:25:25 UTC (rev 140554)
@@ -1,29 +1,27 @@
# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
# Contributor: Camille Moncelier <pix at devlife.org>
pkgname=m17n-lib
-pkgver=1.6.2
-pkgrel=2
-pkgdesc='A multilingual text processing library (runtimes)'
+pkgver=1.6.3
+pkgrel=1
+pkgdesc='Multilingual text processing library (runtimes)'
arch=('i686' 'x86_64')
url='http://www.m17n.org/m17n-lib/'
license=('GPL')
-depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf>=0.9.11')
+depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
optdepends=('anthy: to use the anthy input method')
-options=('!libtool' '!makeflags')
-source=("http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz"
- 'locale.patch')
-sha1sums=('9b9ada79357dd56c90c64cd36845c5537c363d79'
- '55a09b9d8e6ea590d5c8f06d1397bfa0b00c1697')
+options=('!libtool' '!emptydirs')
+source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f')
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../locale.patch # cf. FS#20482
- ./configure --prefix=/usr
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-static=no
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
Deleted: locale.patch
===================================================================
--- locale.patch 2011-10-17 07:25:12 UTC (rev 140553)
+++ locale.patch 2011-10-17 07:25:25 UTC (rev 140554)
@@ -1,51 +0,0 @@
---- old/src/locale.c 2010/03/19 11:59:43 1.12
-+++ new/src/locale.c 2010/11/05 11:20:41 1.13
-@@ -86,34 +86,24 @@
- MLocale *mlocale_monetary, *mlocale_numeric, ;
- #endif
-
--/** Parse locale name NAME and return a newly created MLocale object.
-- If the locale is not supported by the system, return NULL. */
-+/** Parse locale name NAME and return a newly created MLocale object. */
-
- static MLocale *
- make_locale (const char *name)
- {
-- char *current, *new, *str;
-+ char *str;
- int len;
- MLocale *locale;
- char c;
-
-- str = setlocale (LC_CTYPE, NULL);
-- len = strlen (str) + 1;
-- current = alloca (len);
-- memcpy (current, str, len);
--
-- if (! (new = setlocale (LC_CTYPE, name)))
-- return NULL;
--
--
- M17N_OBJECT (locale, NULL, MERROR_LOCALE);
-- locale->name = msymbol (new);
-+ locale->name = msymbol (name);
- msymbol_put (locale->name, M_locale, (void *) locale);
- M17N_OBJECT_UNREF (locale);
-
-- len = strlen (new) + 1;
-+ len = strlen (name) + 1;
- str = alloca (len);
-- memcpy (str, new, len);
-+ memcpy (str, name, len);
-
- c = '\0';
- while (1)
-@@ -162,8 +152,6 @@
- }
- else
- locale->coding = Mcoding_us_ascii;
--
-- setlocale (LC_CTYPE, current);
- return locale;
- }
-
More information about the arch-commits
mailing list