diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-03-23 11:20:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-03-23 11:20:20 (GMT) |
| commit | ec79408f71e36fab716f943760a5cdbead6c2834 (patch) | |
| tree | daae682c4768315067477f810164997be02b2c91 | |
| parent | 284e91c8141087e3fe20b6325d966972baabb5c2 (diff) | |
| parent | 9ad28fd5c00d5aaf646793a4aa85ffcdfebebb5b (diff) | |
| download | mxe-ec79408f71e36fab716f943760a5cdbead6c2834.zip mxe-ec79408f71e36fab716f943760a5cdbead6c2834.tar.gz mxe-ec79408f71e36fab716f943760a5cdbead6c2834.tar.bz2 | |
Merge branch 'master' of github.com:mxe/mxe
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | src/gcc.mk | 2 | ||||
| -rw-r--r-- | src/vmime-1-fixes.patch | 60 | ||||
| -rw-r--r-- | src/vmime.mk | 2 |
4 files changed, 9 insertions, 59 deletions
@@ -1150,7 +1150,7 @@ aptitude -t squeeze-backports install cmake yasm</pre> </tr> <tr> <td id="gcc-package">gcc</td> - <td id="gcc-version">4.7.2</td> + <td id="gcc-version">4.8.0</td> <td id="gcc-website"><a href="http://gcc.gnu.org/">GCC</a></td> </tr> <tr> @@ -2146,7 +2146,7 @@ aptitude -t squeeze-backports install cmake yasm</pre> </tr> <tr> <td id="vmime-package">vmime</td> - <td id="vmime-version">7550835</td> + <td id="vmime-version">86925f1</td> <td id="vmime-website"><a href="http://www.vmime.org/">VMime</a></td> </tr> <tr> @@ -3,7 +3,7 @@ PKG := gcc $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a464ba0f26eef24c29bcd1e7489421117fb9ee35 +$(PKG)_CHECKSUM := b4ee6e9bdebc65223f95067d0cc1a634b59dad72 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch index 27ff5d3..5f0edaf 100644 --- a/src/vmime-1-fixes.patch +++ b/src/vmime-1-fixes.patch @@ -1,17 +1,17 @@ This file is part of MXE. See index.html for further information. -From d7c84c62640dce890a1f9669f3ad3aa28e42379a Mon Sep 17 00:00:00 2001 +From 07af5dbeac4e9038c60a0de6adfa3125840cb70e Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 1 Mar 2013 13:27:47 +0100 -Subject: [PATCH 1/3] fix duplicate info in .pc files +Subject: [PATCH] fix duplicate info in .pc files diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67c4a9d..711ce53 100644 +index 3570d32..8200f01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -517,8 +517,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) +@@ -539,8 +539,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) ) ENDIF() @@ -20,7 +20,7 @@ index 67c4a9d..711ce53 100644 SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl") ENDIF() -@@ -574,8 +572,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) +@@ -596,8 +594,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) ) ENDIF() @@ -32,53 +32,3 @@ index 67c4a9d..711ce53 100644 -- 1.8.1.4 - -From 4e65257321c15af69a4374d54a868c7f271a14f7 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Fri, 1 Mar 2013 13:44:43 +0100 -Subject: [PATCH 2/3] bin is no lib - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 711ce53..357d793 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,9 +335,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "") - IF(${UNIX}) - SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) - ENDIF(${UNIX}) --IF(${WIN32}) -- SET(libdir ${CMAKE_INSTALL_PREFIX}/bin) --ENDIF(${WIN32}) - - - ############################################################################## --- -1.8.1.4 - - -From 70df0e04b235f9d68377bb5258646b076a8bf81c Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 7 Mar 2013 00:00:13 +0100 -Subject: [PATCH 3/3] libdir for mingw too - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 357d793..e4266af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -332,9 +332,9 @@ SET(VMIME_PKGCONFIG_LIBS "") - SET(VMIME_PKGCONFIG_CFLAGS "") - SET(VMIME_PKGCONFIG_REQUIRES "") - --IF(${UNIX}) -+IF (UNIX OR MINGW) - SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) --ENDIF(${UNIX}) -+ENDIF(UNIX OR MINGW) - - - ############################################################################## --- -1.8.1.4 - diff --git a/src/vmime.mk b/src/vmime.mk index eaf686e..6da7b8b 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,7 +3,7 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 6ff08d451249536d3e43724cd23ce29de3c56ecd +$(PKG)_CHECKSUM := 3ebc7def72e05efcb3cd4c8338ad6fc2c5f8d815 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$(PKG)_FILE |