Attachment 875920 Details for Bug 1077702 – Build with system zipios++ instead of bundled one

[patch] Build with system zipios++ instead of bundled one

Build-with-system-zipios-instead-of-bundled-one.patch (text/plain), 5.51 KB, created by Ville Skyttä on 2014-03-18 12:48:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 12:48:45 UTC

Size: 5.51 KB

patch

obsolete

>From 2994d75590a5d7e8520543e5efa8084256871645 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 14:01:14 +0200
>Subject: [PATCH] Build with system zipios++ instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077702
>---
> enigma-1.01-system-zipios++.patch | 107 ++++++++++++++++++++++++++++++++++++++
> enigma.spec                       |  12 ++++-
> 2 files changed, 118 insertions(+), 1 deletion(-)
> create mode 100644 enigma-1.01-system-zipios++.patch
>
>diff --git a/enigma-1.01-system-zipios++.patch b/enigma-1.01-system-zipios++.patch
>new file mode 100644
>index 0000000..d2dcd92
>--- /dev/null
>+++ b/enigma-1.01-system-zipios++.patch
>@@ -0,0 +1,107 @@
>+diff --git a/configure b/configure
>+index 7f370b6..d08aef3 100755
>+--- a/configure
>++++ b/configure
>+@@ -753,8 +753,7 @@ CPP
>+ CXX
>+ CXXFLAGS
>+ CCC'
>+-ac_subdirs_all='lib-src/zipios++
>+-lib-src/enet'
>++ac_subdirs_all='lib-src/enet'
>+ 
>+ # Initialize some variables set by options.
>+ ac_init_help=
>+@@ -15277,8 +15276,6 @@ else
>+ echo "${ECHO_T}no" >&6; }
>+ fi
>+ 
>+-subdirs="$subdirs lib-src/zipios++"
>+-
>+ subdirs="$subdirs lib-src/enet"
>+ 
>+ 
>+diff --git a/configure.ac b/configure.ac
>+index db344fd..0bde84a 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -320,7 +320,6 @@ fi
>+ dnl ----------------------------------------------------------
>+ dnl Configure libraries
>+ dnl ----------------------------------------------------------
>+-AC_CONFIG_SUBDIRS(lib-src/zipios++)
>+ AC_CONFIG_SUBDIRS(lib-src/enet)
>+ 
>+ AC_CONFIG_FILES([Makefile m4/Makefile  intl/Makefile 
>+diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
>+index 4d2418a..d91d7ca 100644
>+--- a/lib-src/Makefile.am
>++++ b/lib-src/Makefile.am
>+@@ -1 +1 @@
>+-SUBDIRS = oxydlib lua zipios++ enet enigma-core
>++SUBDIRS = oxydlib lua enet enigma-core
>+diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
>+index c60cf9e..4301400 100644
>+--- a/lib-src/Makefile.in
>++++ b/lib-src/Makefile.in
>+@@ -214,7 +214,7 @@ target_alias = @target_alias@
>+ target_cpu = @target_cpu@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+-SUBDIRS = oxydlib lua zipios++ enet enigma-core
>++SUBDIRS = oxydlib lua enet enigma-core
>+ all: all-recursive
>+ 
>+ .SUFFIXES:
>+diff --git a/src/Makefile.am b/src/Makefile.am
>+index 5a8ab83..ad9871e 100644
>+--- a/src/Makefile.am
>++++ b/src/Makefile.am
>+@@ -13,8 +13,6 @@ EXTRA_DIST = \
>+ CXXFLAGS = @CXXFLAGS@\
>+ 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
>+ 	-DLOCALEDIR=\"$(localedir)\" \
>+-	-I$(top_srcdir)/lib-src/zipios++  \
>+-	-I$(top_builddir)/lib-src/zipios++ \
>+ 	-I$(top_srcdir)/lib-src/lua \
>+ 	-I$(top_srcdir)/lib-src/enigma-core \
>+ 	-I$(top_srcdir)/lib-src/enet/include \
>+@@ -204,7 +202,7 @@ enigma_LDADD = \
>+ 	$(top_builddir)/lib-src/lua/liblua.a \
>+ 	$(top_builddir)/lib-src/enet/libenet.a \
>+ 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
>+-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
>++	-lzipios \
>+ 	-lz \
>+ 	$(mingw_ldadd) \
>+ 	@SDL_LIBS@
>+diff --git a/src/Makefile.in b/src/Makefile.in
>+index 4013cad..7f91a3d 100644
>+--- a/src/Makefile.in
>++++ b/src/Makefile.in
>+@@ -101,7 +101,6 @@ enigma_DEPENDENCIES = $(top_builddir)/lib-src/enigma-core/libecl.a \
>+ 	$(top_builddir)/lib-src/lua/liblua.a \
>+ 	$(top_builddir)/lib-src/enet/libenet.a \
>+ 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
>+-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
>+ 	$(am__DEPENDENCIES_1)
>+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
>+ depcomp = $(SHELL) $(top_srcdir)/depcomp
>+@@ -146,8 +145,6 @@ CXXDEPMODE = @CXXDEPMODE@
>+ CXXFLAGS = @CXXFLAGS@\
>+ 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
>+ 	-DLOCALEDIR=\"$(localedir)\" \
>+-	-I$(top_srcdir)/lib-src/zipios++  \
>+-	-I$(top_builddir)/lib-src/zipios++ \
>+ 	-I$(top_srcdir)/lib-src/lua \
>+ 	-I$(top_srcdir)/lib-src/enigma-core \
>+ 	-I$(top_srcdir)/lib-src/enet/include \
>+@@ -449,7 +446,7 @@ enigma_LDADD = \
>+ 	$(top_builddir)/lib-src/lua/liblua.a \
>+ 	$(top_builddir)/lib-src/enet/libenet.a \
>+ 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
>+-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
>++	-lzipios \
>+ 	-lz \
>+ 	$(mingw_ldadd) \
>+ 	@SDL_LIBS@
>diff --git a/enigma.spec b/enigma.spec
>index 6af760e..ed2c39a 100644
>--- a/enigma.spec
>+++ b/enigma.spec
>@@ -1,6 +1,6 @@
> Name:           enigma
> Version:        1.01
>-Release:        24%{?dist}
>+Release:        25%{?dist}
> Summary:        Clone of the ATARI game Oxyd
> 
> Group:          Amusements/Games
>@@ -16,6 +16,7 @@ Patch4:         enigma-xerces.patch
> Patch5:         enigma-gcc-4.6-ftbfs.patch
> Patch6:         enigma-gcc-4.7-ftbfs.patch
> Patch7:         enigma-libpng15.patch
>+Patch8:         enigma-1.01-system-zipios++.patch
> 
> Requires:       dejavu-sans-fonts
> 
>@@ -29,6 +30,7 @@ BuildRequires:  desktop-file-utils
> BuildRequires:  zlib-devel
> BuildRequires:  tetex
> BuildRequires:  xerces-c-devel
>+BuildRequires:  zipios++-devel
> 
> %description
> Enigma is a tribute to and a re-implementation of one of the most
>@@ -48,6 +50,11 @@ innumerable puzzles blocking your direct way to the Oxyd stones...
> %patch5 -p1
> %patch6 -p1
> %patch7 -p1
>+%patch8 -p1 -b .system-zipios++
>+for f in $(find . -name "*.system-zipios++"); do
>+  touch -r $f $(basename -s .system-zipios++ $f)
>+done
>+rm -r lib-src/zipios++
> 
> %build
> %configure --enable-optimize
>@@ -98,6 +105,9 @@ fi
> %exclude %{_libdir}/libenet.a
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.01-25
>+- Build with system zipios++ instead of bundled one
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.01-24
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077702: 875920