[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 95ea13fd8f26d6e217ec1658e267ea2987b7bc91

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 95ea13fd8f26d6e217ec1658e267ea2987b7bc91

[git]

[-- Attachment #1: Type: text/plain, Size: 6190 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  95ea13fd8f26d6e217ec1658e267ea2987b7bc91 (commit)
       via  42bfdbd46605b1c5d4b27b5336d44ac4b938a7d1 (commit)
      from  5ef1ee8e8a1472ad83f5c29c3aa9d8df0b22e648 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95ea13fd8f26d6e217ec1658e267ea2987b7bc91
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Sep 5 14:27:22 2016 +0200

    libffi: Update to 3.2.1
    
    This is an update to the latest stable version of libffi.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 42bfdbd46605b1c5d4b27b5336d44ac4b938a7d1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Sep 23 11:03:40 2016 +0200

    intltool: Update to 0.51.0
    
    This is an update to the latest available major version.
    
    * Changed URL to project home page.
    * Changed download URL for the source code.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 intltool/intltool.nm                               | 11 ++++---
 libffi/libffi.nm                                   | 18 ++++++++++--
 .../patches/libffi-3.0.13-fix-include-path.patch   | 34 ----------------------
 3 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 libffi/patches/libffi-3.0.13-fix-include-path.patch

Difference in files:
diff --git a/intltool/intltool.nm b/intltool/intltool.nm
index fde1b3a..1f0311c 100644
--- a/intltool/intltool.nm
+++ b/intltool/intltool.nm
@@ -4,23 +4,22 @@
 ###############################################################################
 
 name       = intltool
-version    = 0.40.6
+version    = 0.51.0
 release    = 1
 arch       = noarch
 
 groups     = Localization/Tools
-url        = http://www.gnome.org/
+url        = https://launchpad.net/intltool
 license    = GPLv2 with exceptions
 summary    = Utility for internationalizing various kinds of data files.
 
 description
-	This tool automatically extracts translatable strings from oaf, glade, \
-	bonobo ui, nautilus theme, .desktop, and other data files and puts \
+	This tool automatically extracts translatable strings from oaf, glade,
+	bonobo ui, nautilus theme, .desktop, and other data files and puts
 	them in the po files.
 end
 
-source_dl  = http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/
-sources    = %{thisapp}.tar.bz2
+source_dl  = http://edge.launchpad.net/intltool/trunk/%{version}/+download/
 
 build
 	requires
diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index db6ba4f..6990611 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libffi
-version    = 3.0.13
+version    = 3.2.1
 release    = 1
 
 groups     = System/Libraries
@@ -13,13 +13,25 @@ license    = BSD
 summary    = A portable foreign function interface library.
 
 description
-	The libffi library provides a portable, high level programming \
-	interface to various calling conventions. This allows a programmer to \
+	The libffi library provides a portable, high level programming
+	interface to various calling conventions. This allows a programmer to
 	call any function specified by a call interface description at run time.
 end
 
 source_dl  = ftp://sourceware.org/pub/libffi/
 
+build
+	prepare_cmds
+		# Fix include directories.
+		sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
+			-i include/Makefile.in
+
+		sed -e '/^includedir/ s/=.*$/=@includedir@/' \
+			-e 's/^Cflags: -I${includedir}/Cflags:/' \
+			-i libffi.pc.in
+	end
+end
+
 packages
 	package %{name}
 
diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/patches/libffi-3.0.13-fix-include-path.patch
deleted file mode 100644
index 4502333..0000000
--- a/libffi/patches/libffi-3.0.13-fix-include-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
---- libffi-3.0.13/include/Makefile.am.fixpath	2013-05-25 22:11:25.983889342 -0400
-+++ libffi-3.0.13/include/Makefile.am	2013-05-25 22:12:12.337890037 -0400
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
-diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
---- libffi-3.0.13/include/Makefile.in.fixpath	2013-05-25 22:12:56.259890696 -0400
-+++ libffi-3.0.13/include/Makefile.in	2013-05-25 22:13:12.101890934 -0400
-@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
- 
-diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
---- libffi-3.0.13/libffi.pc.in.fixpath	2013-05-25 22:14:21.037891968 -0400
-+++ libffi-3.0.13/libffi.pc.in	2013-05-25 22:14:31.652892128 -0400
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces


hooks/post-receive
--
IPFire 3.x development tree