From fb0f4197df65a898228e878fae2a0b80ccbb1511 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 16 Nov 2013 19:32:50 -0600 Subject: libraries/libvmime-zarafa: Removed (unused) This was only used by zarafa, so it's no longer needed. Signed-off-by: Robby Workman --- libraries/libvmime-zarafa/README | 4 - .../libvmime-zarafa/libvmime-zarafa.SlackBuild | 116 ------------ libraries/libvmime-zarafa/libvmime-zarafa.info | 10 - libraries/libvmime-zarafa/name.patch | 206 --------------------- .../vmime-0.9.2-header-value-on-next-line.diff | 45 ----- .../patches/vmime-0.9.2-qp-in-buffers.diff | 16 -- .../patches/vmime-mixed-qp-in-parameter.diff | 28 --- libraries/libvmime-zarafa/slack-desc | 19 -- 8 files changed, 444 deletions(-) delete mode 100644 libraries/libvmime-zarafa/README delete mode 100644 libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild delete mode 100644 libraries/libvmime-zarafa/libvmime-zarafa.info delete mode 100644 libraries/libvmime-zarafa/name.patch delete mode 100644 libraries/libvmime-zarafa/patches/vmime-0.9.2-header-value-on-next-line.diff delete mode 100644 libraries/libvmime-zarafa/patches/vmime-0.9.2-qp-in-buffers.diff delete mode 100644 libraries/libvmime-zarafa/patches/vmime-mixed-qp-in-parameter.diff delete mode 100644 libraries/libvmime-zarafa/slack-desc (limited to 'libraries') diff --git a/libraries/libvmime-zarafa/README b/libraries/libvmime-zarafa/README deleted file mode 100644 index 07e341fcfb..0000000000 --- a/libraries/libvmime-zarafa/README +++ /dev/null @@ -1,4 +0,0 @@ -VMime is a free mail library for C++, an open-source solution for working -with MIME messages and Internet messaging services like IMAP, POP or SMTP. - -This script builds a specially patched version of libvmime for zarafa. diff --git a/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild b/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild deleted file mode 100644 index 16102861f7..0000000000 --- a/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for libvmime-zarafa: -# a library for working with MIME messages -# (with patches from zarafa) - -# Copyright 2009-2011 Niels Horn, Rio de Janeiro, RJ, Brazil -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# revision date 2011/09/16 - -PRGNAM=libvmime-zarafa -VERSION=${VERSION:-0.9.2_svn603} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -PRGSRC=libvmime -SRCVERSION=$(echo $VERSION | cut -f1 -d_) -TARVERSION=$(echo $VERSION | tr _ +) - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $TMP/$PRGSRC-$SRCVERSION $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -tar xvf $CWD/$PRGSRC-$TARVERSION.tar.bz2 -cd $PRGSRC-$SRCVERSION -chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -# Apply zarafa patches in order of release-date -patches="\ - mixed-qp-in-parameter \ - 0.9.2-header-value-on-next-line \ - 0.9.2-qp-in-buffers" -for patch in $patches; do - patch -p1 < $CWD/patches/vmime-$patch.diff -done - -# Patch to rename the library to "libvmime_zarafa" -patch -p1 < $CWD/name.patch - -EXTRA_CFLAGS=$SLKCFLAGS \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make docdir=/usr/doc/$PRGNAM-$VERSION -make install docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# correct program name. -# We're moving some files so that this special version of libvmime -# can coexist with the standard version, if needed. -mkdir -p $PKG/usr/include/vmime -mv $PKG/usr/include/vmime_zarafa/* $PKG/usr/include/vmime/ -mv $PKG/usr/include/vmime $PKG/usr/include/vmime_zarafa/ -sed -i "s|{includedir}/|{includedir}/vmime_zarafa|" \ - $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/vmime_zarafa.pc - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libvmime-zarafa/libvmime-zarafa.info b/libraries/libvmime-zarafa/libvmime-zarafa.info deleted file mode 100644 index 19b3090c17..0000000000 --- a/libraries/libvmime-zarafa/libvmime-zarafa.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libvmime-zarafa" -VERSION="0.9.2_svn603" -HOMEPAGE="http://www.vmime.org/" -DOWNLOAD="http://download.zarafa.com/community/final/7.1/7.1.0-36420/sourcecode/libvmime-0.9.2+svn603.tar.bz2" -MD5SUM="0ba65ad889488b2f851d7f028bfb6e9e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libgsasl" -MAINTAINER="Niels Horn" -EMAIL="niels.horn@gmail.com" diff --git a/libraries/libvmime-zarafa/name.patch b/libraries/libvmime-zarafa/name.patch deleted file mode 100644 index 84fafbe756..0000000000 --- a/libraries/libvmime-zarafa/name.patch +++ /dev/null @@ -1,206 +0,0 @@ -diff -Naur libvmime-0.9.2.orig/Makefile.in libvmime-0.9.2/Makefile.in ---- libvmime-0.9.2.orig/Makefile.in 2012-01-10 10:33:02.000000000 +0100 -+++ libvmime-0.9.2/Makefile.in 2012-09-26 05:00:51.899012736 +0200 -@@ -42,7 +42,7 @@ - DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ -- $(srcdir)/config.h.in $(srcdir)/vmime.pc.in -+ $(srcdir)/config.h.in $(srcdir)/vmime_zarafa.pc.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ -@@ -56,7 +56,7 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = vmime.pc -+CONFIG_CLEAN_FILES = vmime_zarafa.pc - CONFIG_CLEAN_VPATH_FILES = - SOURCES = - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -@@ -314,7 +314,7 @@ - - distclean-hdr: - -rm -f config.h stamp-h1 --vmime.pc: $(top_builddir)/config.status $(srcdir)/vmime.pc.in -+vmime_zarafa.pc: $(top_builddir)/config.status $(srcdir)/vmime_zarafa.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - - mostlyclean-libtool: -diff -Naur libvmime-0.9.2.orig/configure libvmime-0.9.2/configure ---- libvmime-0.9.2.orig/configure 2012-01-10 10:33:01.000000000 +0100 -+++ libvmime-0.9.2/configure 2012-09-26 04:55:30.835971484 +0200 -@@ -699,10 +699,10 @@ - MAKEFLAGS= - - # Identity of this package. --PACKAGE_NAME='VMime Library' --PACKAGE_TARNAME='vmime' -+PACKAGE_NAME='VMime Library for Zarafa' -+PACKAGE_TARNAME='vmime_zarafa' - PACKAGE_VERSION='0.9.2' --PACKAGE_STRING='VMime Library 0.9.2' -+PACKAGE_STRING='VMime Library 0.9.2 for Zarafa' - PACKAGE_BUGREPORT='vincent@vincent-richard.net' - PACKAGE_URL='' - -@@ -2939,13 +2939,13 @@ - - - # Library name --GENERIC_LIBRARY_NAME="vmime" -+GENERIC_LIBRARY_NAME="vmime_zarafa" - - --GENERIC_VERSIONED_LIBRARY_NAME="vmime" -+GENERIC_VERSIONED_LIBRARY_NAME="vmime_zarafa" - - --LIBRARY_NAME="libvmime" -+LIBRARY_NAME="libvmime_zarafa" - - - # Library version -@@ -3508,7 +3508,7 @@ - - - # Define the identity of the package. -- PACKAGE=vmime -+ PACKAGE=vmime_zarafa - VERSION=0.9.2 - - -@@ -21556,7 +21556,7 @@ - - LIBS=`echo $LIBS | sed -e 's|^ ||g' | sed -e 's| | |g'` - --ac_config_files="$ac_config_files vmime.pc Makefile src/Makefile vmime/Makefile" -+ac_config_files="$ac_config_files vmime_zarafa.pc Makefile src/Makefile vmime/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -22754,7 +22754,7 @@ - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; -- "vmime.pc") CONFIG_FILES="$CONFIG_FILES vmime.pc" ;; -+ "vmime_zarafa.pc") CONFIG_FILES="$CONFIG_FILES vmime_zarafa.pc" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "vmime/Makefile") CONFIG_FILES="$CONFIG_FILES vmime/Makefile" ;; -@@ -24301,7 +24301,7 @@ - - - // Name of package --#define VMIME_PACKAGE \"libvmime\" -+#define VMIME_PACKAGE \"libvmime_zarafa\" - - // Version number of package - #define VMIME_VERSION \"0.9.2\" -diff -Naur libvmime-0.9.2.orig/src/Makefile.in libvmime-0.9.2/src/Makefile.in ---- libvmime-0.9.2.orig/src/Makefile.in 2012-01-10 10:33:02.000000000 +0100 -+++ libvmime-0.9.2/src/Makefile.in 2012-09-26 04:41:07.134000010 +0200 -@@ -149,8 +149,8 @@ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) --libvmime_la_LIBADD = --am__libvmime_la_SOURCES_DIST = address.cpp addressList.cpp \ -+libvmime_zarafa_la_LIBADD = -+am__libvmime_zarafa_la_SOURCES_DIST = address.cpp addressList.cpp \ - attachmentHelper.cpp base.cpp body.cpp bodyPart.cpp \ - bodyPartAttachment.cpp charset.cpp charsetConverter.cpp \ - component.cpp constants.cpp contentDisposition.cpp \ -@@ -286,7 +286,7 @@ - @VMIME_BUILTIN_PLATFORM_POSIX_TRUE@ platforms_posix_posixFile.lo \ - @VMIME_BUILTIN_PLATFORM_POSIX_TRUE@ platforms_posix_posixHandler.lo \ - @VMIME_BUILTIN_PLATFORM_POSIX_TRUE@ platforms_posix_posixSocket.lo --am_libvmime_la_OBJECTS = address.lo addressList.lo attachmentHelper.lo \ -+am_libvmime_zarafa_la_OBJECTS = address.lo addressList.lo attachmentHelper.lo \ - base.lo body.lo bodyPart.lo bodyPartAttachment.lo charset.lo \ - charsetConverter.lo component.lo constants.lo \ - contentDisposition.lo contentDispositionField.lo \ -@@ -322,10 +322,10 @@ - $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_6) $(am__objects_7) \ - $(am__objects_8) $(am__objects_9) $(am__objects_10) --libvmime_la_OBJECTS = $(am_libvmime_la_OBJECTS) --libvmime_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+libvmime_zarafa_la_OBJECTS = $(am_libvmime_zarafa_la_OBJECTS) -+libvmime_zarafa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(libvmime_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(CXXFLAGS) $(libvmime_zarafa_la_LDFLAGS) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = - am__depfiles_maybe = -@@ -338,7 +338,7 @@ - CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(libvmime_la_SOURCES) -+SOURCES = $(libvmime_zarafa_la_SOURCES) - DIST_SOURCES = $(am__libvmime_la_SOURCES_DIST) - HEADERS = $(noinst_HEADERS) - ETAGS = etags -@@ -499,9 +499,9 @@ - AUTOMAKE_OPTIONS = no-dependencies foreign - INTERNALS = - INCLUDES = -I$(prefix)/include -I$(top_srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@ --lib_LTLIBRARIES = libvmime.la --libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@ --libvmime_la_SOURCES = address.cpp addressList.cpp attachmentHelper.cpp \ -+lib_LTLIBRARIES = libvmime_zarafa.la -+libvmime_zarafa_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@ -+libvmime_zarafa_la_SOURCES = address.cpp addressList.cpp attachmentHelper.cpp \ - base.cpp body.cpp bodyPart.cpp bodyPartAttachment.cpp \ - charset.cpp charsetConverter.cpp component.cpp constants.cpp \ - contentDisposition.cpp contentDispositionField.cpp \ -@@ -607,8 +607,8 @@ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libvmime.la: $(libvmime_la_OBJECTS) $(libvmime_la_DEPENDENCIES) -- $(libvmime_la_LINK) -rpath $(libdir) $(libvmime_la_OBJECTS) $(libvmime_la_LIBADD) $(LIBS) -+libvmime_zarafa.la: $(libvmime_zarafa_la_OBJECTS) $(libvmime_zarafa_la_DEPENDENCIES) -+ $(libvmime_zarafa_la_LINK) -rpath $(libdir) $(libvmime_zarafa_la_OBJECTS) $(libvmime_zarafa_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff -Naur libvmime-0.9.2.orig/vmime.pc.in libvmime-0.9.2/vmime.pc.in ---- libvmime-0.9.2.orig/vmime.pc.in 2012-01-10 10:32:57.000000000 +0100 -+++ libvmime-0.9.2/vmime.pc.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,14 +0,0 @@ --# File automatically generated by SConstruct ('scons autotools') --# DO NOT EDIT! -- --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: @GENERIC_LIBRARY_NAME@ --Description: VMime C++ Mail Library (http://www.vmime.org) --Version: @VERSION@ --Requires: @GSASL_REQUIRED@ --Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@ --Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@ -diff -Naur libvmime-0.9.2.orig/vmime_zarafa.pc.in libvmime-0.9.2/vmime_zarafa.pc.in ---- libvmime-0.9.2.orig/vmime_zarafa.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ libvmime-0.9.2/vmime_zarafa.pc.in 2012-01-10 10:32:57.000000000 +0100 -@@ -0,0 +1,14 @@ -+# File automatically generated by SConstruct ('scons autotools') -+# DO NOT EDIT! -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @GENERIC_LIBRARY_NAME@ -+Description: VMime C++ Mail Library (http://www.vmime.org) -+Version: @VERSION@ -+Requires: @GSASL_REQUIRED@ -+Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@ -+Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@ diff --git a/libraries/libvmime-zarafa/patches/vmime-0.9.2-header-value-on-next-line.diff b/libraries/libvmime-zarafa/patches/vmime-0.9.2-header-value-on-next-line.diff deleted file mode 100644 index eca769946b..0000000000 --- a/libraries/libvmime-zarafa/patches/vmime-0.9.2-header-value-on-next-line.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nurb libvmime-0.9.2.orig/src/headerField.cpp libvmime-0.9.2.patched/src/headerField.cpp ---- libvmime-0.9.2.orig/src/headerField.cpp 2010-05-20 05:33:45.000000000 -0700 -+++ libvmime-0.9.2.patched/src/headerField.cpp 2011-08-29 12:10:08.438497914 -0700 -@@ -157,14 +157,12 @@ - { - contentsEnd = pos; - pos += 2; -- break; - } - else if (c == '\n') - { - contentsEnd = pos; - ++pos; -- break; -- } -+ } else { - - while (pos < end) - { -@@ -186,24 +184,13 @@ - - ++pos; - } -+ } - - // Handle the case of folded lines - if (buffer[pos] == ' ' || buffer[pos] == '\t') - { - // This is a folding white-space: we keep it as is and - // we continue with contents parsing... -- -- // If the line contains only space characters, we assume it is -- // the end of the headers. This is not strictly standard-compliant -- // but, hey, we can't fail when parsing some malformed mails... -- while (pos < end && (buffer[pos] == ' ' || buffer[pos] == '\t')) -- ++pos; -- -- if ((pos < end && buffer[pos] == '\n') || -- (pos + 1 < end && buffer[pos] == '\r' && buffer[pos + 1] == '\n')) -- { -- break; -- } - } - else - { diff --git a/libraries/libvmime-zarafa/patches/vmime-0.9.2-qp-in-buffers.diff b/libraries/libvmime-zarafa/patches/vmime-0.9.2-qp-in-buffers.diff deleted file mode 100644 index 7634edd1bc..0000000000 --- a/libraries/libvmime-zarafa/patches/vmime-0.9.2-qp-in-buffers.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- svn/src/wordEncoder.cpp (revision 603) -+++ svn/src/wordEncoder.cpp (working copy) -@@ -239,6 +239,13 @@ - if (buffer.find_first_of("\n\r") != string::npos) - return true; - -+ // If the string contains a QP string, we need to encode this. -+ // Not a 100% check, but we'd only get more encoded strings. -+ std::string::size_type pos = buffer.find("=?"); -+ std::string::size_type end = buffer.find("?="); -+ if (pos != string::npos && end != string::npos && end > pos) -+ return true; -+ - return false; - } - diff --git a/libraries/libvmime-zarafa/patches/vmime-mixed-qp-in-parameter.diff b/libraries/libvmime-zarafa/patches/vmime-mixed-qp-in-parameter.diff deleted file mode 100644 index 78e6c70e49..0000000000 --- a/libraries/libvmime-zarafa/patches/vmime-mixed-qp-in-parameter.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: svn/src/parameter.cpp -=================================================================== ---- svn/src/parameter.cpp (revision 597) -+++ svn/src/parameter.cpp (working copy) -@@ -239,8 +239,21 @@ - { - value << t.getWholeBuffer(); - -- if (!foundCharsetChunk) -- ch = t.getWordAt(0)->getCharset(); -+ if (!foundCharsetChunk) { -+ // this is still wrong. each word can have it's -+ // own charset, and can be mixed (eg. iso-8859-1 -+ // and iso-2022-jp), but very unlikely. -+ // real fix is to have parameters store a -+ // vmime::text in stead of a vmime::word in -+ // m_value. but that changes the interface -+ for (size_t i = 0; i < t.getWordCount(); i++) { -+ if (t.getWordAt(i)->getCharset() != ch && ch == charsets::US_ASCII) { -+ ch = t.getWordAt(i)->getCharset(); -+ break; -+ } -+ } -+ -+ } - } - } - } diff --git a/libraries/libvmime-zarafa/slack-desc b/libraries/libvmime-zarafa/slack-desc deleted file mode 100644 index f44d4c67ad..0000000000 --- a/libraries/libvmime-zarafa/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libvmime-zarafa: libvmime-zarafa (library for working with MIME messages) -libvmime-zarafa: -libvmime-zarafa: VMime is a free mail library for C++, an open-source solution for -libvmime-zarafa: working with MIME messages and Internet messaging services like IMAP, -libvmime-zarafa: POP or SMTP. -libvmime-zarafa: -libvmime-zarafa: This is a specially patched version of the vmime library for -libvmime-zarafa: zarafa. -libvmime-zarafa: -libvmime-zarafa: http://www.vmime.org/ -libvmime-zarafa: -- cgit v1.2.3