diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-05-04 19:52:24 +0200 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-05-04 19:52:24 +0200 |
commit | 9cb260d091f5a474ee70ddccc6b8ecad825a78dc (patch) | |
tree | bd916d0989e7ec64fa7a1fda00ce0d9e000afecf /pkgs/desktops/gnustep | |
parent | 01c27d6faf44ccd435069bcbe40785f9e0bfd9be (diff) | |
download | nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.gz nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.bz2 nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.lz nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.xz nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.zst nixpkgs-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.zip |
[treewide] delete unused patches
Diffstat (limited to 'pkgs/desktops/gnustep')
8 files changed, 0 insertions, 282 deletions
diff --git a/pkgs/desktops/gnustep/back/fixup-tools.patch b/pkgs/desktops/gnustep/back/fixup-tools.patch deleted file mode 100644 index a47de5478e3..00000000000 --- a/pkgs/desktops/gnustep/back/fixup-tools.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c gnustep-back-0.24.0/Tools/GNUmakefile.preamble gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble ---- gnustep-back-0.24.0/Tools/GNUmakefile.preamble 2013-07-04 22:44:28.000000000 +0600 -+++ gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 16:40:37.000000000 +0600 -@@ -52,6 +52,9 @@ - # Additional libraries when linking applications - #ADDITIONAL_GUI_LIBS += - -+# Additional libraries when linking tools -+gpbs_TOOL_LIBS += -lgnustep-gui -lgnustep-base $(SYSTEM_LIBS) -+ - # - # Flags dealing with installing and uninstalling - # - diff --git a/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch b/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch deleted file mode 100644 index 482c72a5190..00000000000 --- a/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gnustep-base-1.24.7/Makefile.postamble 2011-07-15 19:53:45.000000000 +0600 -+++ gnustep-base-1.24.7.patched/Makefile.postamble 2014-11-29 22:25:07.000000000 +0600 -@@ -38,13 +38,13 @@ - # Things to do after compiling - # after-all:: - --$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: -- $(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO) -+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: -+ $(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO) - - # Things to do before installing --before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - $(ECHO_NOTHING)$(INSTALL_DATA) base.make \ -- $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) -+ $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) - - # Things to do after installing - # after-install:: -@@ -54,7 +54,7 @@ - - # Things to do after uninstalling - after-uninstall:: -- $(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) -+ $(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) - - # Things to do before cleaning - # before-clean:: diff --git a/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch b/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch deleted file mode 100644 index c4b3d1e1d81..00000000000 --- a/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru gorm-1.2.20/GNUmakefile gorm-1.2.20.patched/GNUmakefile ---- gorm-1.2.20/GNUmakefile 2010-05-30 12:55:26.000000000 +0600 -+++ gorm-1.2.20.patched/GNUmakefile 2014-12-10 22:21:18.000000000 +0600 -@@ -24,6 +24,23 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - -+ifeq ($(GNUSTEP_MAKEFILES),) -+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -+ ifeq ($(GNUSTEP_MAKEFILES),) -+ $(warning ) -+ $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!) -+ $(warning Perhaps gnustep-make is not properly installed,) -+ $(warning so gnustep-config is not in your PATH.) -+ $(warning ) -+ $(warning Your PATH is currently $(PATH)) -+ $(warning ) -+ endif -+endif -+ -+ifeq ($(GNUSTEP_MAKEFILES),) -+ $(error You need to set GNUSTEP_MAKEFILES before compiling!) -+endif -+ - PACKAGE_NAME = gorm - export PACKAGE_NAME - include $(GNUSTEP_MAKEFILES)/common.make diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch b/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch deleted file mode 100644 index 30c6f56c032..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- gnustep-gui-0.24.0/GNUmakefile.postamble 2010-05-17 22:38:59.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2014-12-01 13:44:05.000000000 +0600 -@@ -40,20 +40,20 @@ - # The following rule is important mainly for packaging, because in that case - # you install into a fake system tree, and the directory is not there. - # --$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: -- $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: -+ $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - - # Things to do before installing --before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - $(INSTALL_DATA) gui.make \ -- $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make -+ $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make - - # Things to do after installing - # after-install:: - - # Things to do before uninstalling - before-uninstall:: -- rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make -+ rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make - - # Things to do after uninstalling - # after-uninstall:: diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch deleted file mode 100644 index 23ec2db0fbd..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble 2008-06-10 10:01:49.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 2014-12-01 13:02:11.000000000 +0600 -@@ -49,7 +49,7 @@ - ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers - - # Additional LDFLAGS to pass to the linker --#ADDITIONAL_LDFLAGS += -+ADDITIONAL_LDFLAGS += -lgnustep-gui - - # Additional library directories the linker should search - ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch deleted file mode 100644 index e57ddec75ad..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble 2006-02-22 12:43:48.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 12:52:41.000000000 +0600 -@@ -32,9 +32,11 @@ - ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR) - - # Additional libraries when linking tools -+make_services_TOOL_LIBS += -lgnustep-base - gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) -+gclose_TOOL_LIBS += -lgnustep-base - gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS) - diff --git a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch b/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch deleted file mode 100644 index 98e22f37ee7..00000000000 --- a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make ---- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600 -+++ gnustep-make-2.6.6.patched/common.make 2014-12-09 21:29:10.000000000 +0600 -@@ -135,7 +135,9 @@ - endif - # Then include makefiles with flags/config options installed by the - # libraries themselves ---include $(GNUSTEP_MAKEFILES)/Additional/*.make -+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) -+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL) -+endif - - # - # Determine target specific settings -diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in ---- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600 -@@ -173,7 +173,6 @@ - "$(makedir)/$(GNUSTEP_TARGET_CPU)" \ - "$(makedir)/$(GNUSTEP_TARGET_DIR)" \ - "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \ -- "$(makedir)/Additional" \ - "$(makedir)/Auxiliary" \ - "$(makedir)/Master" \ - "$(makedir)/Instance" \ -@@ -314,7 +313,6 @@ - -rmdir "$(makedir)/Instance" - -rmdir "$(makedir)/Master" - -rmdir "$(makedir)/Auxiliary" -- -rmdir "$(makedir)/Additional" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)" -diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in ---- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600 -+++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600 -@@ -66,6 +66,7 @@ - echo " --variable=OBJCXX" - echo " --variable=GNUMAKE" - echo " --variable=GNUSTEP_MAKEFILES" -+ echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL" - echo " --variable=GNUSTEP_USER_DEFAULTS_DIR" - echo " --variable=GNUSTEP_HOST" - echo " --variable=GNUSTEP_HOST_CPU" -@@ -153,6 +154,8 @@ - - export GNUSTEP_MAKEFILES - -+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL -+ - # - # If all they want to know if GNUSTEP_MAKEFILES or anything that - # we can compute only using GNUSTEP_MAKEFILES, we can print it out -@@ -168,6 +171,8 @@ - exit 0;; - --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES" - exit 0;; -+ --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" -+ exit 0;; - --variable=GNUMAKE) echo "@GNUMAKE@" - exit 0;; - --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null -diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in ---- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600 -@@ -130,6 +130,10 @@ - setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@" - endif - -+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then -+ setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@" -+endif -+ - if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then - unsetenv GNUSTEP_USER_DIR - unsetenv GNUSTEP_USER_ROOT -diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in ---- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2014-12-09 20:14:19.000000000 +0600 -@@ -173,6 +173,10 @@ - fi - export GNUSTEP_MAKEFILES - -+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then -+ NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@ -+fi -+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL - - if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then - # Make sure this is never set in gnustep-make v2 strict mode; it -diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in ---- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600 -@@ -47,7 +47,6 @@ - # Traditionally, this is /usr/GNUstep/System/Library/Makefiles - GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@ - -- - # This is where the user home directories are. Only used to provide - # NSUserDirectory in gnustep-base. Never used anywhere else. - GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@ -diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make ---- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600 -+++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600 -@@ -142,7 +142,7 @@ - # - # Third-party foundations not using make package - # Our own foundation will install a base.make file into --# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags -+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags - # - ifeq ($(FOUNDATION_LIB), nx) - # -framework Foundation is used both to find headers, and to link -@@ -166,7 +166,7 @@ - - # - # FIXME - Ask Helge to move this inside his libFoundation, and have --# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make -+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make - # - ifeq ($(FOUNDATION_LIB),fd) - -include $(GNUSTEP_MAKEFILES)/libFoundation.make -@@ -193,7 +193,7 @@ - GUI_LIBS = - # - # Third-party GUI libraries - our own sets its flags into --# $(GNUSTEP_MAKEFILES)/Additional/gui.make -+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make - # - ifeq ($(GUI_LIB), nx) - GUI_DEFINE = -DNeXT_GUI_LIBRARY=1 -diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make ---- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600 -+++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600 -@@ -667,7 +667,9 @@ - exit 1$(END_ECHO) - endif - --$(GNUSTEP_MAKEFILES)/Additional/*.make: ; -+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) -+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ; -+endif - - $(GNUSTEP_MAKEFILES)/Master/*.make: ; - diff --git a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch b/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch deleted file mode 100644 index 3fe19a6a58b..00000000000 --- a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble ---- ProjectCenter-0.6.2/GNUmakefile.preamble 2010-08-08 03:56:04.000000000 +0600 -+++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble 2014-12-01 20:08:31.000000000 +0600 -@@ -39,7 +39,7 @@ - ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers - - # Additional LDFLAGS to pass to the linker --ADDITIONAL_LDFLAGS += -+ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui - - # Additional library directories the linker should search - ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR) - -Diff finished. Mon Dec 1 20:08:50 2014 |