| 1 |
mr_bones_ 15/07/29 01:46:07 |
| 2 |
|
| 3 |
Modified: opengfx-0.5.1-gcc48.patch |
| 4 |
Added: opengfx-0.5.2-Makefile.patch |
| 5 |
Log: |
| 6 |
version bump (bug #555968) |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: opengfx-0.5.1-gcc48.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- opengfx-0.5.1-gcc48.patch 13 Jun 2014 08:57:57 -0000 1.1 |
| 24 |
+++ opengfx-0.5.1-gcc48.patch 29 Jul 2015 01:46:07 -0000 1.2 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
---- scripts/Makefile.nml.old 2013-05-09 20:09:52.992038666 +0200 |
| 27 |
-+++ scripts/Makefile.nml 2013-05-09 20:10:36.942970903 +0200 |
| 28 |
+--- scripts/Makefile.nml.old |
| 29 |
++++ scripts/Makefile.nml |
| 30 |
@@ -14,11 +14,11 @@ |
| 31 |
|
| 32 |
%.src.dep: $(SRC_DIR)/%.pnml |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: opengfx-0.5.2-Makefile.patch |
| 42 |
=================================================================== |
| 43 |
diff -ru opengfx-0.5.2-source.orig/Makefile opengfx-0.5.2-source/Makefile |
| 44 |
--- opengfx-0.5.2-source.orig/Makefile 2015-04-12 12:57:17.000000000 -0400 |
| 45 |
+++ opengfx-0.5.2-source/Makefile 2015-07-28 21:13:46.496708233 -0400 |
| 46 |
@@ -99,8 +99,8 @@ |
| 47 |
AWK ?= awk |
| 48 |
GREP ?= grep |
| 49 |
PYTHON ?= python |
| 50 |
-UNIX2DOS ?= unix2dos |
| 51 |
-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "") |
| 52 |
+UNIX2DOS ?= $(shell which unix2dos 2>/dev/null) |
| 53 |
+UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "") |
| 54 |
|
| 55 |
# Graphics processing |
| 56 |
GIMP ?= gimp |
| 57 |
@@ -196,7 +196,7 @@ |
| 58 |
endif |
| 59 |
|
| 60 |
# Days of commit since 2000-1-1 00-00 |
| 61 |
-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days") |
| 62 |
+REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)") |
| 63 |
|
| 64 |
# Filename addition, if we're not building the default branch |
| 65 |
REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi) |
| 66 |
@@ -377,7 +377,11 @@ |
| 67 |
| sed -e "s/$(REPLACE_REVISION)/$(NEWGRF_VERSION)/" \ |
| 68 |
| sed -e "s/$(REPLACE_FILENAME)/$(OUTPUT_FILENAME)/" \ |
| 69 |
> $@ |
| 70 |
- $(_V) [ -z "$(UNIX2DOS)" ] || $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@ |
| 71 |
+ifeq ($(UNIX2DOS),) |
| 72 |
+ $(_E) Warning: unix2dos not available. $@ keeps current eol style. |
| 73 |
+else |
| 74 |
+ $(_V) $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@ |
| 75 |
+endif |
| 76 |
|
| 77 |
clean:: |
| 78 |
$(_E) "[CLEAN DOC]" |
| 79 |
@@ -714,7 +718,7 @@ |
| 80 |
$(_E) |
| 81 |
endif |
| 82 |
$(_E) "Release:" |
| 83 |
- $(_E) "bananas: Upload bundle to BaNaNaS |
| 84 |
+ $(_E) "bananas: Upload bundle to BaNaNaS" |
| 85 |
$(_E) |
| 86 |
$(_E) "Valid command line variables are:" |
| 87 |
$(_E) "Helper programmes:" |
Archives