public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. de0ca5b0d9c8e74ed2cce66980414c6f6e4b9f4c
@ 2013-09-24 23:18 git
  0 siblings, 0 replies; only message in thread
From: git @ 2013-09-24 23:18 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 7210 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  de0ca5b0d9c8e74ed2cce66980414c6f6e4b9f4c (commit)
       via  9d63271422260a6d6ee24a638719b44619c129ef (commit)
       via  f94d8b9d1d0c064de15820aa3d556ef57b3519fe (commit)
      from  b3c1fffa24b3ba0109b6ac3880d0740444b287d8 (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 de0ca5b0d9c8e74ed2cce66980414c6f6e4b9f4c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 25 00:17:26 2013 +0100

    libpng: Update to 1.6.6 (compat version 1.5.17).
    
    Also resolves build problem on ARM platforms.

commit 9d63271422260a6d6ee24a638719b44619c129ef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 25 00:17:09 2013 +0100

    m4: Update to 1.4.17.

commit f94d8b9d1d0c064de15820aa3d556ef57b3519fe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 25 00:16:17 2013 +0100

    guile: Add compat package (version 1.8.8).

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

Summary of changes:
 guile/guile.nm                             | 37 ++++++++++++++++++++++++++----
 libpng/libpng.nm                           | 10 ++++----
 m4/m4.nm                                   |  4 ++--
 m4/patches/m4-1.4.16-gnulib-gets.patch     | 13 -----------
 m4/patches/m4-1.4.16-readlink-einval.patch | 12 ----------
 5 files changed, 41 insertions(+), 35 deletions(-)
 delete mode 100644 m4/patches/m4-1.4.16-gnulib-gets.patch
 delete mode 100644 m4/patches/m4-1.4.16-readlink-einval.patch

Difference in files:
diff --git a/guile/guile.nm b/guile/guile.nm
index b666ddd..4834692 100644
--- a/guile/guile.nm
+++ b/guile/guile.nm
@@ -5,7 +5,9 @@
 
 name       = guile
 version    = 2.0.9
-release    = 1
+release    = 2
+
+compat_ver = 1.8.8
 
 groups     = Development/Tools
 url        = http://www.gnu.org/software/guile/
@@ -13,13 +15,14 @@ license    = GPLv2+ and LGPLv2+ and GFDL and OFSFDL
 summary    = A GNU implementation of Scheme for application extensibility.
 
 description
-	GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library \
-	implementation of the Scheme programming language, written in C. GUILE \
-	provides a machine-independent execution platform that can be linked in \
+	GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
+	implementation of the Scheme programming language, written in C. GUILE
+	provides a machine-independent execution platform that can be linked in
 	as a library during the building of extensible programs.
 end
 
 source_dl  = ftp://ftp.gnu.org/gnu/guile/
+sources   += %{name}-%{compat_ver}.tar.gz
 
 build
 	requires
@@ -36,14 +39,40 @@ build
 		--disable-static \
 		--disable-error-on-warning
 
+	build_cmds
+		pushd %{DIR_SRC}/%{name}-%{compat_ver}
+		./configure %{configure_options}
+		make %{PARALLELISMFLAGS}
+		popd
+	end
+
 	test
 		make check
+
+		#pushd %{DIR_SRC}/%{name}-%{compat_ver}
+		#make check
+		#popd
+	end
+
+	install_cmds
+		pushd %{DIR_SRC}/%{name}-%{compat_ver}
+		install -m 755 libguile/.libs/libguile.so.17.4.0 %{BUILDROOT}%{libdir}
+		ln -svf libguile.so.17.4.0 %{BUILDROOT}%{libdir}/libguile.so.17
+		popd
 	end
 end
 
 packages
 	package %{name}
 
+	package %{name}-compat
+		summary = Compat libraries of %{thisapp}.
+
+		files
+			%{libdir}/libguile.so.17*
+		end
+	end
+
 	package %{name}-devel
 		template DEVEL
 
diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 652b982..d8952c0 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -4,10 +4,10 @@
 ###############################################################################
 
 name       = libpng
-version    = 1.6.5
+version    = 1.6.6
 release    = 1
 
-compat_ver = 1.5.15
+compat_ver = 1.5.17
 
 groups     = System/Libraries
 url        = http://www.libpng.org/pub/png/
@@ -23,9 +23,11 @@ description
 end
 
 source_dl  = http://downloads.sourceforge.net/project/libpng/libpng16/%{version}/
+source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng16/%{version}/
 
 # Source URL for comat package.
 source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{compat_ver}/
+source_dl +=  http://downloads.sourceforge.net/project/libpng/history/libpng15/%{compat_ver}/
 
 sources    = %{thisapp}.tar.xz
 
@@ -49,8 +51,8 @@ build
 	# Install compat package.
 	install_cmds
 		cd %{DIR_SRC}/%{name}-%{compat_ver}
-		install -m 755 .libs/libpng15.so.15.15.0 %{BUILDROOT}%{libdir}
-		ln -svf libpng15.so.15.15.0 %{BUILDROOT}%{libdir}/libpng15.so.15
+		install -m 755 .libs/libpng15.so.15.17.0 %{BUILDROOT}%{libdir}
+		ln -svf libpng15.so.15.17.0 %{BUILDROOT}%{libdir}/libpng15.so.15
 	end
 end
 
diff --git a/m4/m4.nm b/m4/m4.nm
index f1e3b59..2997dcf 100644
--- a/m4/m4.nm
+++ b/m4/m4.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = m4
-version    = 1.4.16
-release    = 3
+version    = 1.4.17
+release    = 1
 
 groups     = Applications/Text
 url        = http://www.gnu.org/software/m4/
diff --git a/m4/patches/m4-1.4.16-gnulib-gets.patch b/m4/patches/m4-1.4.16-gnulib-gets.patch
deleted file mode 100644
index 51df5b0..0000000
--- a/m4/patches/m4-1.4.16-gnulib-gets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up m4-1.4.16/lib/stdio.in.h.orig m4-1.4.16/lib/stdio.in.h
---- m4-1.4.16/lib/stdio.in.h.orig	2012-05-30 13:55:51.092600199 +0200
-+++ m4-1.4.16/lib/stdio.in.h	2012-05-30 13:56:25.763794100 +0200
-@@ -162,7 +162,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/m4/patches/m4-1.4.16-readlink-einval.patch b/m4/patches/m4-1.4.16-readlink-einval.patch
deleted file mode 100644
index 6a98751..0000000
--- a/m4/patches/m4-1.4.16-readlink-einval.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
---- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
-+++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
-@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
-   ASSERT (errno == ENOENT);
-   errno = 0;
-   ASSERT (func ("", buf, sizeof buf) == -1);
--  ASSERT (errno == ENOENT);
-+  ASSERT (errno == ENOENT || errno == EINVAL);
-   errno = 0;
-   ASSERT (func (".", buf, sizeof buf) == -1);
-   ASSERT (errno == EINVAL);


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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-09-24 23:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-24 23:18 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. de0ca5b0d9c8e74ed2cce66980414c6f6e4b9f4c git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox