diff options
author | Michael Straube | 2019-04-06 16:47:14 +0200 |
---|---|---|
committer | Michael Straube | 2019-04-06 16:47:14 +0200 |
commit | 92a53f95203d498734b7c2c9614d6aaab9bb85fc (patch) | |
tree | 4d7e878d72158ab64561ff7b336e4910ef0518b1 /freedoko-0.7.20-makefiles.patch | |
parent | ffb6c8af17a45f408e1a6f72e2d8610f6a489494 (diff) | |
download | aur-92a53f95203d498734b7c2c9614d6aaab9bb85fc.tar.gz |
Update to 0.7.20
Diffstat (limited to 'freedoko-0.7.20-makefiles.patch')
-rw-r--r-- | freedoko-0.7.20-makefiles.patch | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/freedoko-0.7.20-makefiles.patch b/freedoko-0.7.20-makefiles.patch new file mode 100644 index 000000000000..f87b135107dd --- /dev/null +++ b/freedoko-0.7.20-makefiles.patch @@ -0,0 +1,117 @@ +diff -ru FreeDoko_0.7.20-orig/data/Makefile FreeDoko_0.7.20/data/Makefile +--- FreeDoko_0.7.20-orig/data/Makefile 2019-04-06 15:52:49.530999521 +0200 ++++ FreeDoko_0.7.20/data/Makefile 2019-04-06 15:53:08.818252409 +0200 +@@ -32,8 +32,7 @@ + for d in cardsets iconsets backgrounds sounds; do \ + $(MAKE) -C $$d install; \ + done +- -chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY) +- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY) ++ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY) + endif + + ifeq ($(SHELLTYPE), sh) +diff -ru FreeDoko_0.7.20-orig/doc/Makefile FreeDoko_0.7.20/doc/Makefile +--- FreeDoko_0.7.20-orig/doc/Makefile 2019-04-06 15:52:49.571042684 +0200 ++++ FreeDoko_0.7.20/doc/Makefile 2019-04-06 15:53:30.725104614 +0200 +@@ -34,8 +34,7 @@ + fi + cp Bugs GPL Roadmap $(DESTDIR)$(HELP_DIRECTORY)/ + for d in de en; do $(MAKE) -C $$d install; done +- -chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY) +- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY) ++ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY) + cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc + endif + +diff -ru FreeDoko_0.7.20-orig/Makefile FreeDoko_0.7.20/Makefile +--- FreeDoko_0.7.20-orig/Makefile 2019-04-06 15:52:49.530999521 +0200 ++++ FreeDoko_0.7.20/Makefile 2019-04-06 15:54:35.429702271 +0200 +@@ -316,8 +316,7 @@ + echo "Kopiere das Programm" + mkdir -p $(DESTDIR)$(BIN_DIRECTORY) + cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY) +- -chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko +- chmod 750 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko ++ chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko + cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko + # Copying the data files + echo "Kopiere die Daten" +@@ -337,15 +336,13 @@ + a2x -f manpage doc/freedoko.adoc + mkdir -p $(DESTDIR)$(MAN_DIRECTORY) + cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/ +- -chgrp games $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 +- chmod 640 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 ++ chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 + cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6 + # copy the icon + echo "Kopiere das Icon" + mkdir -p $(DESTDIR)$(ICON_DIRECTORY) + cp src/FreeDoko.png $(DESTDIR)$(ICON_DIRECTORY)/ +- -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 + echo "Kopiere den Desktop-Starter" + mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)" +diff -ru FreeDoko_0.7.20-orig/Makefile.install.directories FreeDoko_0.7.20/Makefile.install.directories +--- FreeDoko_0.7.20-orig/Makefile.install.directories 2019-04-06 15:52:49.530999521 +0200 ++++ FreeDoko_0.7.20/Makefile.install.directories 2019-04-06 15:54:52.087625236 +0200 +@@ -4,14 +4,14 @@ + # the different directories for the files + + # installing in /usr/local +-MAIN_DIRECTORY = /usr/local +-BIN_DIRECTORY = $(MAIN_DIRECTORY)/games +-DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko +-HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko +-MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 +-ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps +-LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale +-DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications ++#MAIN_DIRECTORY = /usr/local ++#BIN_DIRECTORY = $(MAIN_DIRECTORY)/games ++#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko ++#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko ++#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 ++#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps ++#LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale ++#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications + + # debian + #MAIN_DIRECTORY = /usr +@@ -54,14 +54,14 @@ + #DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications + + # Arch Linux +-#MAIN_DIRECTORY = /usr +-#BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin +-#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko +-#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko +-#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 +-#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps +-#LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale +-#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications ++MAIN_DIRECTORY = /usr ++BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin ++DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko ++HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko ++MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 ++ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps ++LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale ++DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications + + # Void Linux + #MAIN_DIRECTORY = /usr +diff -ru FreeDoko_0.7.20-orig/src/Makefile FreeDoko_0.7.20/src/Makefile +--- FreeDoko_0.7.20-orig/src/Makefile 2019-04-06 15:52:49.583055634 +0200 ++++ FreeDoko_0.7.20/src/Makefile 2019-04-06 15:53:57.625173952 +0200 +@@ -263,7 +263,6 @@ + -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \ + -DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \ + $(PROGRAM) +- $(MAKE) strip + + # strip the program from all symbols + .PHONY: strip |