diff options
Diffstat (limited to 'games-puzzle/enigma/files/enigma-1.21-build.patch')
| -rw-r--r-- | games-puzzle/enigma/files/enigma-1.21-build.patch | 133 |
1 files changed, 86 insertions, 47 deletions
diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch index 6d5e91ca76e4..421ac8b7ae75 100644 --- a/games-puzzle/enigma/files/enigma-1.21-build.patch +++ b/games-puzzle/enigma/files/enigma-1.21-build.patch @@ -1,24 +1,14 @@ -diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am ---- enigma-1.21.orig/Makefile.am 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/Makefile.am 2015-02-06 18:20:22.239518323 -0500 -@@ -3,12 +3,9 @@ - # tools -> lib-src/lua - # src -> tools, lib-src - # --SUBDIRS = m4 lib-src tools intl src data doc po etc -+SUBDIRS = m4 lib-src tools intl src data po etc - EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS +--- a/configure.ac ++++ b/configure.ac +@@ -67,6 +67,7 @@ + AC_PROG_CXX + AC_PROG_CPP + AC_PROG_RANLIB ++AM_PROG_AR + PKG_PROG_PKG_CONFIG --docdir = @datadir@/doc/enigma --doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS -- - ACLOCAL_AMFLAGS = -I m4 - - .PHONY: tolua -diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac ---- enigma-1.21.orig/configure.ac 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/configure.ac 2015-02-06 18:20:22.282516643 -0500 -@@ -342,7 +342,6 @@ + dnl do not add the AC_PROG_CXX default CXXFLAGS +@@ -342,7 +343,6 @@ CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer" AC_MSG_RESULT(yes) else @@ -26,9 +16,49 @@ diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac AC_MSG_RESULT(no) fi -diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am ---- enigma-1.21.orig/etc/Makefile.am 2014-12-19 16:26:05.000000000 -0500 -+++ enigma-1.21/etc/Makefile.am 2015-02-06 18:25:44.131945494 -0500 +@@ -421,14 +421,17 @@ + dnl ---------------------------------------------------------- + + AC_MSG_CHECKING(whether to use system enet) +-AC_ARG_WITH(system-enet, +- AS_HELP_STRING(--with-system-enet, Use system enet), system_enet=$withval, +- system_enet=no +-) ++AC_ARG_WITH([system-enet], [ ++ AS_HELP_STRING([--with-system-enet], [Use system enet])], [ ++ system_enet=$withval], [ ++ system_enet=no]) ++AC_MSG_RESULT([${system_enet}]) ++ + AM_CONDITIONAL([SYSTEM_ENET], [test "x$system_enet" = xyes]) +-AM_COND_IF([SYSTEM_ENET], +- PKG_CHECK_MODULES(LIBENET, [libenet], ,AC_MSG_ERROR([libenet not found!])), +- AC_CONFIG_SUBDIRS([lib-src/enet])) ++AM_COND_IF([SYSTEM_ENET], [ ++ PKG_CHECK_MODULES([LIBENET], [libenet])], [ ++ AC_CONFIG_SUBDIRS([lib-src/enet]) ++]) + + + +--- a/etc/enigma.desktop ++++ b/etc/enigma.desktop +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=1.21 ++Version=1.0 + Name=Enigma + Name[be]=Enigma + Name[cs]=Enigma +@@ -44,5 +44,5 @@ + StartupNotify=false + Icon=enigma + Type=Application +-Categories=Application;Game;PuzzleGame; ++Categories=Game;X-PuzzleGame; + +--- a/etc/Makefile.am ++++ b/etc/Makefile.am @@ -1,18 +1,18 @@ # if !MINGW32 # Comply with xdg icon theme specification @@ -52,26 +82,34 @@ diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am dist_appdata_DATA = enigma.appdata.xml # endif !MINGW32 -diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop ---- enigma-1.21.orig/etc/enigma.desktop 2014-12-19 16:26:05.000000000 -0500 -+++ enigma-1.21/etc/enigma.desktop 2015-02-06 18:20:22.282516643 -0500 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Version=1.21 -+Version=1.0 - Name=Enigma - Name[be]=Enigma - Name[cs]=Enigma -@@ -44,5 +44,5 @@ - StartupNotify=false - Icon=enigma - Type=Application --Categories=Application;Game;PuzzleGame; -+Categories=Game;X-PuzzleGame; +--- a/lib-src/zipios++/configure.ac ++++ b/lib-src/zipios++/configure.ac +@@ -37,6 +37,7 @@ + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_RANLIB ++AM_PROG_AR -diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in ---- enigma-1.21.orig/po/Makefile.in.in 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/po/Makefile.in.in 2015-02-06 18:20:22.283516604 -0500 + dnl Checks for libraries. + AC_CHECK_LIB(z, inflate, [cv_libz=yes], [cv_libz=no]) +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,12 +3,9 @@ + # tools -> lib-src/lua + # src -> tools, lib-src + # +-SUBDIRS = m4 lib-src tools intl src data doc po etc ++SUBDIRS = m4 lib-src tools intl src data po etc + EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS + +-docdir = @datadir@/doc/enigma +-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS +- + ACLOCAL_AMFLAGS = -I m4 + + .PHONY: tolua +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in @@ -25,12 +25,12 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ @@ -87,14 +125,15 @@ diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in #install_sh@ -d mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am ---- enigma-1.21.orig/src/Makefile.am 2014-12-19 16:24:38.000000000 -0500 -+++ enigma-1.21/src/Makefile.am 2015-02-06 18:20:22.283516604 -0500 -@@ -12,7 +12,7 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,8 +11,8 @@ + CXXFLAGS = @CXXFLAGS@\ -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ - -DDOCDIR=\"$(docdir)\" \ +- -DDOCDIR=\"$(docdir)\" \ - -DLOCALEDIR=\"$(localedir_enigma)\" \ ++ -DDOCDIR=\"$(htmldir)\" \ + -DLOCALEDIR=\"/usr/share/locale\" \ -I$(top_srcdir)/lib-src/zipios++ \ -I$(top_builddir)/lib-src/zipios++ \ |