diff options
Diffstat (limited to 'freedoko-git-archlinux.patch')
| -rw-r--r-- | freedoko-git-archlinux.patch | 88 |
1 files changed, 19 insertions, 69 deletions
diff --git a/freedoko-git-archlinux.patch b/freedoko-git-archlinux.patch index 57f8d6e02335..aeefd5353130 100644 --- a/freedoko-git-archlinux.patch +++ b/freedoko-git-archlinux.patch @@ -1,22 +1,7 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile ---- FreeDoko-orig/Makefile 2017-09-03 19:38:04.723372749 +0200 -+++ FreeDoko/Makefile 2017-09-03 19:41:11.514300330 +0200 -@@ -136,8 +136,7 @@ - .PHONY: compile - compile: - # compile FreeDoko -- $(MAKE) Version -- $(MAKE) -C src/ $(PROGRAM) -+ $(MAKE) -C src release_bin - @echo "---" - @echo "* Program 'FreeDoko' created" - -@@ -316,13 +315,11 @@ - ifeq ($(OPERATING_SYSTEM), Linux) - .PHONY: install - install : check_install -- $(MAKE) -C src release_bin - # Copying the program +--- FreeDoko-orig/Makefile 2017-09-03 22:32:18.328192513 +0200 ++++ FreeDoko/Makefile 2017-09-03 22:36:21.661087423 +0200 +@@ -320,8 +320,7 @@ echo "Copying the program" mkdir -p $(DESTDIR)$(BIN_DIRECTORY) cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY) @@ -26,7 +11,7 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko # Copying the data files echo "Copying the data files" -@@ -342,15 +339,13 @@ +@@ -341,18 +340,16 @@ a2x -f manpage doc/freedoko.adoc mkdir -p $(DESTDIR)$(MAN_DIRECTORY) cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/ @@ -41,12 +26,17 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile - -chgrp games $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png - chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png + chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png + # copy the desktop file +- mkdir -p "$(DESKTOP_FILE_DIRECTORY)" +- sed "s|Exec=.*$$|Exec=$(BIN_DIRECTORY)/FreeDoko|" bin/FreeDoko.desktop > "$(DESKTOP_FILE_DIRECTORY)/FreeDoko.desktop" ++ mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)" ++ sed "s|Exec=.*$$|Exec=$(BIN_DIRECTORY)/FreeDoko|" bin/FreeDoko.desktop > "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)/FreeDoko.desktop" + # all finished echo "Installation erfolgreich" - .PHONY: check_install diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories ---- FreeDoko-orig/Makefile.install.directories 2017-09-03 19:38:04.723372749 +0200 -+++ FreeDoko/Makefile.install.directories 2017-09-03 19:38:36.096303160 +0200 +--- FreeDoko-orig/Makefile.install.directories 2017-09-03 22:32:18.328192513 +0200 ++++ FreeDoko/Makefile.install.directories 2017-09-03 22:32:52.587635577 +0200 @@ -4,14 +4,14 @@ # the different directories for the files @@ -93,21 +83,9 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories Fre # release -diff -ru --no-dereference -x .git FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop ---- FreeDoko-orig/bin/FreeDoko.desktop 2017-09-03 19:38:04.723372749 +0200 -+++ FreeDoko/bin/FreeDoko.desktop 2017-09-03 19:38:46.752832849 +0200 -@@ -6,7 +6,7 @@ - Comment=game of Doppelkopf - Comment[de]=Doppelkopf-Spiel - Comment[fr]=un jeu de Doppelkopf --Exec=/usr/games/freedoko -+Exec=/usr/bin/freedoko - Path= - Icon=FreeDoko - Categories=Application;Game;CardGame; diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile ---- FreeDoko-orig/data/Makefile 2017-09-03 19:38:05.403364021 +0200 -+++ FreeDoko/data/Makefile 2017-09-03 19:39:02.862625671 +0200 +--- FreeDoko-orig/data/Makefile 2017-09-03 22:32:19.114846280 +0200 ++++ FreeDoko/data/Makefile 2017-09-03 22:37:22.290203717 +0200 @@ -32,8 +32,7 @@ for d in cardsets iconsets backgrounds sounds; do \ $(MAKE) -C $$d install; \ @@ -119,8 +97,8 @@ diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Make ifeq ($(SHELLTYPE), sh) diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile ---- FreeDoko-orig/doc/Makefile 2017-09-03 19:38:06.300019179 +0200 -+++ FreeDoko/doc/Makefile 2017-09-03 19:39:20.952392881 +0200 +--- FreeDoko-orig/doc/Makefile 2017-09-03 22:32:21.034814819 +0200 ++++ FreeDoko/doc/Makefile 2017-09-03 22:37:03.963802226 +0200 @@ -34,8 +34,7 @@ fi cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/ @@ -132,17 +110,9 @@ diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefi endif diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile ---- FreeDoko-orig/src/Makefile 2017-09-03 19:38:06.980010451 +0200 -+++ FreeDoko/src/Makefile 2017-09-03 19:40:00.958544194 +0200 -@@ -260,6 +260,7 @@ - $(INCLUDE_ALL) \ - $(LIBS_ALL) \ - $(CXXFLAGS) \ -+ $(LDFLAGS) \ - -o $@ - @echo "$(PROGRAM) compiled successfully" - -@@ -279,7 +280,6 @@ +--- FreeDoko-orig/src/Makefile 2017-09-03 22:32:23.874768343 +0200 ++++ FreeDoko/src/Makefile 2017-09-03 22:32:52.587635577 +0200 +@@ -282,7 +282,6 @@ -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \ -DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \ $(PROGRAM) @@ -150,23 +120,3 @@ diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefi # strip the program from all symbols .PHONY: strip -diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile.local.template FreeDoko/src/Makefile.local.template ---- FreeDoko-orig/src/Makefile.local.template 2017-09-03 19:38:06.980010451 +0200 -+++ FreeDoko/src/Makefile.local.template 2017-09-03 19:41:35.870852887 +0200 -@@ -29,11 +29,11 @@ - #CPPFLAGS += -DMANUAL_DIRECTORY_VALUE='"../manual"' - - # a description for the version information --ifeq ($(RELEASE), true) --CPPFLAGS += -DVERSION_DESCRIPTION='"$(OPERATING_SYSTEM_NAME)"' --else --CPPFLAGS += -DVERSION_DESCRIPTION='"self compiled"' --endif -+#ifeq ($(RELEASE), true) -+#CPPFLAGS += -DVERSION_DESCRIPTION='"$(OPERATING_SYSTEM_NAME)"' -+#else -+#CPPFLAGS += -DVERSION_DESCRIPTION='"self compiled"' -+#endif - - # whether to create a segmentation fault (and hence a core dump) when FreeDoko - # has found an error |