diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2017-02-25 01:36:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 01:36:01 (GMT) |
| commit | e3497ea8b9304fa79d3d36d952175e6fb7fa426e (patch) | |
| tree | 4016c02e92575311709ca62b2c61a14e233e5961 /src | |
| parent | 3b98d6df0f3242ac1231a8cb630c7484bed84dac (diff) | |
| parent | c054f4134ba674a20a8239da7663bb4f871f88d3 (diff) | |
| download | mxe-e3497ea8b9304fa79d3d36d952175e6fb7fa426e.zip mxe-e3497ea8b9304fa79d3d36d952175e6fb7fa426e.tar.gz mxe-e3497ea8b9304fa79d3d36d952175e6fb7fa426e.tar.bz2 | |
Merge pull request #1682 from pavelvat/update-libsoup
update libsoup
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsoup-1-fixes.patch | 65 | ||||
| -rw-r--r-- | src/libsoup.mk | 15 |
2 files changed, 39 insertions, 41 deletions
diff --git a/src/libsoup-1-fixes.patch b/src/libsoup-1-fixes.patch index f9f08eb..c65b7d6 100644 --- a/src/libsoup-1-fixes.patch +++ b/src/libsoup-1-fixes.patch @@ -1,9 +1,31 @@ This file is part of MXE. See LICENSE.md for licensing information. -diff -Naur libsoup-2.54.0.1.orig/autogen.sh libsoup-2.54.0.1/autogen.sh ---- libsoup-2.54.0.1.orig/autogen.sh 2016-03-23 15:19:17.000000000 +0300 -+++ libsoup-2.54.0.1/autogen.sh 2016-04-09 18:29:05.799748895 +0300 -@@ -19,13 +19,6 @@ +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Pavel Vatagin <pavelvat@gmail.com> +Date: Sat, 18 Feb 2017 20:26:34 +0300 +Subject: [PATCH] fix build + + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +-SUBDIRS = libsoup po tests examples docs build/win32 ++SUBDIRS = libsoup tests docs build/win32 + + EXTRA_DIST = \ + data/effective_tld_names.dat \ +diff --git a/autogen.sh b/autogen.sh +index 1111111..2222222 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -19,13 +19,6 @@ if test -z $INTLTOOLIZE; then exit 1 fi @@ -17,10 +39,11 @@ diff -Naur libsoup-2.54.0.1.orig/autogen.sh libsoup-2.54.0.1/autogen.sh intltoolize --automake --copy autoreconf --force --install --verbose -diff -Naur libsoup-2.54.0.1.orig/docs/reference/Makefile.am libsoup-2.54.0.1/docs/reference/Makefile.am ---- libsoup-2.54.0.1.orig/docs/reference/Makefile.am 2016-03-23 15:19:17.000000000 +0300 -+++ libsoup-2.54.0.1/docs/reference/Makefile.am 2016-04-09 18:30:33.644569273 +0300 -@@ -77,7 +77,6 @@ +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 1111111..2222222 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -77,7 +77,6 @@ GTKDOC_LIBS = \ $(GLIB_LIBS) # include common portion ... @@ -28,29 +51,3 @@ diff -Naur libsoup-2.54.0.1.orig/docs/reference/Makefile.am libsoup-2.54.0.1/doc # kludges $(srcdir)/tmpl/*.sgml: -diff -Naur libsoup-2.54.0.1.orig/Makefile.am libsoup-2.54.0.1/Makefile.am ---- libsoup-2.54.0.1.orig/Makefile.am 2016-03-23 15:19:17.000000000 +0300 -+++ libsoup-2.54.0.1/Makefile.am 2016-04-09 22:41:40.604386782 +0300 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = libsoup po tests examples docs build/win32 -+SUBDIRS = libsoup tests docs build/win32 - - EXTRA_DIST = \ - data/effective_tld_names.dat \ -diff -Naur libsoup-2.54.0.1.orig/tests/test-utils.c libsoup-2.54.0.1/tests/test-utils.c ---- libsoup-2.54.0.1.orig/tests/test-utils.c 2016-03-23 15:19:17.000000000 +0300 -+++ libsoup-2.54.0.1/tests/test-utils.c 2016-04-09 18:31:51.741646290 +0300 -@@ -215,10 +215,6 @@ - return; - apache_running = FALSE; - -- if (pid) { -- while (kill (pid, 0) == 0) -- g_usleep (100); -- } - } - - #endif /* HAVE_APACHE */ diff --git a/src/libsoup.mk b/src/libsoup.mk index 0e1248c..efb35dc 100644 --- a/src/libsoup.mk +++ b/src/libsoup.mk @@ -2,10 +2,11 @@ PKG := libsoup $(PKG)_WEBSITE := https://github.com/GNOME/libsoup -$(PKG)_IGNORE := libsoup-pre% -$(PKG)_VERSION := 2.54.0.1 +$(PKG)_DESCR := HTTP client/server library for GNOME +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.57.1 $(PKG)_APIVER := 2.4 -$(PKG)_CHECKSUM := b466c68e6575ca5ed170da60cc316c562a96db5dba5345a6043f740201afa8f4 +$(PKG)_CHECKSUM := 675c3bc11c2a6347625ca5215720d41c84fd8e9498dd664cda8a635fd5105a26 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/GNOME/$(PKG)/archive/$($(PKG)_VERSION).tar.gz @@ -16,16 +17,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && \ + cd '$(SOURCE_DIR)' && \ NOCONFIGURE=1 \ ACLOCAL_FLAGS=-I'$(PREFIX)/$(TARGET)/share/aclocal' \ ./autogen.sh - cd '$(1)' && ./configure \ + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)'/configure \ $(MXE_CONFIGURE_OPTS) \ --disable-vala \ --without-gssapi - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) + $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(TARGET)-gcc \ -W -Wall -Werror -ansi \ |