Date: Friday, November 24, 2017 @ 11:05:14
Author: heftig
Revision: 310778
archrelease: copy trunk to extra-x86_64
Added:
gmime/repos/extra-x86_64/0001-Avoid-non-UTF-8-code.patch
(from rev 310777, gmime/trunk/0001-Avoid-non-UTF-8-code.patch)
gmime/repos/extra-x86_64/PKGBUILD
(from rev 310777, gmime/trunk/PKGBUILD)
Deleted:
gmime/repos/extra-x86_64/PKGBUILD
---------------------------------+
0001-Avoid-non-UTF-8-code.patch | 110 ++++++++++++++++++++++++++++++++++++++
PKGBUILD | 103 ++++++++++++++++++-----------------
2 files changed, 163 insertions(+), 50 deletions(-)
Copied: gmime/repos/extra-x86_64/0001-Avoid-non-UTF-8-code.patch (from rev
310777, gmime/trunk/0001-Avoid-non-UTF-8-code.patch)
===================================================================
--- 0001-Avoid-non-UTF-8-code.patch (rev 0)
+++ 0001-Avoid-non-UTF-8-code.patch 2017-11-24 11:05:14 UTC (rev 310778)
@@ -0,0 +1,110 @@
+From 864f03034d9af34386cd854d105c9bddbc06ab3a Mon Sep 17 00:00:00 2001
+Message-Id:
<864f03034d9af34386cd854d105c9bddbc06ab3a.1511519809.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Fri, 24 Nov 2017 11:36:33 +0100
+Subject: [PATCH] Avoid non-UTF-8 code
+
+---
+ gmime/gmime-filter-charset.c | 4 ++--
+ gmime/gmime-iconv-utils.c | 4 ++--
+ tests/test-iconv.c | 48 ++++++++++++++++++++++----------------------
+ 3 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/gmime/gmime-filter-charset.c b/gmime/gmime-filter-charset.c
+index 052268e15c519af0..023823cf8a1251e9 100644
+--- a/gmime/gmime-filter-charset.c
++++ b/gmime/gmime-filter-charset.c
+@@ -243,8 +243,8 @@ filter_complete (GMimeFilter *filter, char *in, size_t
len, size_t prespace,
+ inleft--;
+ } else if (errno == EINVAL) {
+ /*
+- * EINVAL An incomplete multibyte sequence
has been encoun�
+- * tered in the input.
++ * EINVAL An incomplete multibyte sequence
has been
++ * encountered in the input.
+ *
+ * We assume that this can only happen if we've
run out of
+ * bytes for a multibyte sequence, if not we're
in trouble.
+diff --git a/gmime/gmime-iconv-utils.c b/gmime/gmime-iconv-utils.c
+index 94ddf36e2554493e..a6a874e8218c08f6 100644
+--- a/gmime/gmime-iconv-utils.c
++++ b/gmime/gmime-iconv-utils.c
+@@ -132,8 +132,8 @@ g_mime_iconv_strndup (iconv_t cd, const char *str, size_t
n)
+ converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf,
&outleft);
+ if (converted != (size_t) -1 || errno == EINVAL) {
+ /*
+- * EINVAL An incomplete multibyte sequence has been
encoun�
+- * tered in the input.
++ * EINVAL An incomplete multibyte sequence has been
++ * encountered in the input.
+ *
+ * We'll just have to ignore it...
+ */
+diff --git a/tests/test-iconv.c b/tests/test-iconv.c
+index c1eaab821963f703..8f04f918c8a73925 100644
+--- a/tests/test-iconv.c
++++ b/tests/test-iconv.c
+@@ -111,36 +111,36 @@ struct {
+ const char *charset;
+ } tests[] = {
+ { "Ətraflı", "utf-8" }, /* az */
+- { "������ ������", "windows-cp1251" }, /* bg */
+- { "C�njuge", "iso-8859-1" }, /* ca */
+- { "Avanceret s�gning", "iso-8859-1" }, /* da */
+- { "L�schen", "iso-8859-1" }, /* de */
++ { "\xc4\xee\xe1\xe0\xe2\xe8 \xd3\xf1\xeb\xf3\xe3\xe0", "windows-cp1251"
}, /* bg */
++ { "C\xf2njuge", "iso-8859-1" }, /* ca */
++ { "Avanceret s\xf8gning", "iso-8859-1" }, /* da */
++ { "L\xf6schen", "iso-8859-1" }, /* de */
+ { "some text", "iso-8859-1" }, /* en */
+- { "p�iv��", "iso-8859-15" }, /* fi */
+- { "Modifi�", "iso-8859-1" }, /* fr */
+- { "Tid�al", "iso-8859-1" }, /* ga */
+- { "F�brica", "iso-8859-1" }, /* gl */
+- { "Szem-B�lyh�v�-A ", "iso-8859-2" }, /* hu */
+- { "Non c'� corrispondenza", "iso-8859-1" }, /* it */
+- { "$(B>e5i8!:w(B", "euc-jp" }, /* ja */
+- { "$(C0m1^(B $(C0K;v(B", "euc-kr" }, /* ko */
+- { "I�sami paie�ka", "iso-8859-13" }, /* lt */
+- { "Papla�in�t� Mekl��ana", "iso-8859-13" }, /* lv */
+- { "Kopi�ren", "iso-8859-15" }, /* nl */
+- { "�ydelagd S�k", "iso-8859-1" }, /* nn */
+- { "Avansert s�k", "iso-8859-1" }, /* no */
+- { "-B�r�d�a-A ksi-B��ki-A adresowej", "iso-8859-2" }, /* pl */
+- { "C-B�utare-A avansat-B�-A ", "iso-8859-2" }, /* ro */
+- { "-L�����������-A -L�����-A ", "koi8-r" }, /* ru */
++ { "p\xe4iv\xe4\xe4", "iso-8859-15" }, /* fi */
++ { "Modifi\xe9", "iso-8859-1" }, /* fr */
++ { "Tid\xe9al", "iso-8859-1" }, /* ga */
++ { "F\xe1brica", "iso-8859-1" }, /* gl */
++ { "Szem\x1b-B\xe9lyh\xedv\xf3\x1b-A ", "iso-8859-2" }, /* hu
*/
++ { "Non c'\xe9 corrispondenza", "iso-8859-1" }, /* it */
++ { "\x1b$(B>e5i8!:w\x1b(B", "euc-jp" }, /* ja */
++ { "\x1b$(C0m1^\x1b(B \x1b$(C0K;v\x1b(B", "euc-kr" },
/* ko */
++ { "I\xf0sami paie\xf0ka", "iso-8859-13" }, /* lt */
++ { "Papla\xf0in\xe2t\xe2 Mekl\xe7\xf0ana", "iso-8859-13" }, /* lv */
++ { "Kopi\xebren", "iso-8859-15" }, /* nl */
++ { "\xd8ydelagd S\xf8k", "iso-8859-1" }, /* nn */
++ { "Avansert s\xf8k", "iso-8859-1" }, /* no */
++ { "\x1b-B\xacr\xf3d\xb3a\x1b-A ksi\x1b-B\xb1\xbfki\x1b-A adresowej",
"iso-8859-2" }, /* pl */
++ { "C\x1b-B\xe3utare\x1b-A avansat\x1b-B\xe3\x1b-A ", "iso-8859-2" },
/* ro */
++ { "\x1b-L\xc0\xd0\xe1\xe8\xd8\xe0\xd5\xdd\xdd\xeb\xd9\x1b-A
\x1b-L\xdf\xde\xd8\xe1\xda\x1b-A ", "koi8-r" }, /* ru */
+ { "Pokročilé hľadanie", "utf-8" }, /* sk */
+ { "Ga želite", "utf-8" }, /* sl */
+- { "den �nd�?", "iso-8859-1" }, /* sv */
+- { "Geli-M�mi�-A Arama", "iso-8859-9" }, /* tr */
+- { "������������� �����", "koi8-u" }, /* uk */
++ { "den \xe4nd\xe5?", "iso-8859-1" }, /* sv */
++ { "Geli\x1b-M\xfemi\xfe\x1b-A Arama", "iso-8859-9" }, /* tr */
++ { "\xf5\xc4\xcf\xd3\xcb\xcf\xce\xc1\xcc\xc5\xce\xc9\xca
\xd0\xcf\xdb\xd5\xcb", "koi8-u" }, /* uk */
+
+ #if 0
+ /* this is expected to fail */
+- { "��ɚ�尋�(I>(B", "utf-8" }, /* zh_TW */
++ { "\xe9\x92\xc9\x9a\x8e\xe5\xb0\x8b\xe6\x1b(I>\x1b(B", "utf-8" },
/* zh_TW */
+ #endif
+ };
+
+--
+2.15.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-24 11:04:26 UTC (rev 310777)
+++ PKGBUILD 2017-11-24 11:05:14 UTC (rev 310778)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Ben <[email protected]>
-
-pkgname=gmime
-pkgver=2.6.23+4+g91dcee38
-pkgrel=1
-pkgdesc="Glorious MIME Utility Library"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://spruce.sourceforge.net/gmime/";
-depends=(glib2 gpgme zlib)
-makedepends=(gtk-sharp-2 gobject-introspection gtk-doc git vala docbook-utils)
-_commit=91dcee38ea301463fb9c6bc936f08b9fd1c0969f # gmime-2-6
-source=("git+https://git.gnome.org/browse/gmime#commit=$_commit";)
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- # get rid of that .wapi errors in fakeroot
- export MONO_SHARED_DIR="$srcdir/weird"
- mkdir -p "$MONO_SHARED_DIR"
-
- cd "$pkgname"
-
- ./configure --prefix=/usr \
- --program-prefix=$pkgname \
- --enable-gtk-doc \
- --enable-mono \
- --enable-smime \
- --disable-static
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname"
- make DESTDIR="$pkgdir" install
-}
Copied: gmime/repos/extra-x86_64/PKGBUILD (from rev 310777,
gmime/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-11-24 11:05:14 UTC (rev 310778)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Ben <[email protected]>
+
+pkgname=gmime
+pkgver=2.6.23+4+g91dcee38
+pkgrel=2
+pkgdesc="A C/C++ MIME creation and parser library with support for S/MIME,
PGP, and Unix mbox spools"
+arch=(x86_64)
+license=(GPL)
+url="https://github.com/jstedfast/gmime";
+depends=(glib2 gpgme zlib)
+makedepends=(gtk-sharp-2 gobject-introspection gtk-doc git vala docbook-utils)
+_commit=91dcee38ea301463fb9c6bc936f08b9fd1c0969f # gmime-2-6
+source=("git+https://github.com/jstedfast/gmime#commit=$_commit";
+ 0001-Avoid-non-UTF-8-code.patch)
+sha256sums=('SKIP'
+ '516e339e92e419f5744abfd9b7608816115cca103727755994356b0984edcb10')
+
+pkgver() {
+ cd gmime
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd gmime
+ patch -Np1 -i ../0001-Avoid-non-UTF-8-code.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ # get rid of the .wapi errors in fakeroot
+ mkdir weird
+ export MONO_SHARED_DIR="$PWD/weird"
+
+ cd gmime
+
+ ./configure --prefix=/usr \
+ --program-prefix=$pkgname \
+ --enable-gtk-doc \
+ --enable-mono \
+ --enable-smime \
+ --disable-static
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd gmime
+ make DESTDIR="$pkgdir" install
+}
