summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnustep-apps/preferences/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnustep-apps/preferences/files')
-rw-r--r--gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch18
-rw-r--r--gnustep-apps/preferences/files/preferences-gnustep-make2.patch164
2 files changed, 182 insertions, 0 deletions
diff --git a/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch b/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
new file mode 100644
index 000000000000..0710c90906c6
--- /dev/null
+++ b/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
@@ -0,0 +1,18 @@
+diff -ur Preferences.backup/GNUmakefile.preamble Preferences/GNUmakefile.preamble
+--- Preferences.backup/GNUmakefile.preamble 2003-08-16 13:19:29.000000000 -0400
++++ Preferences/GNUmakefile.preamble 2004-06-28 19:51:30.104604048 -0400
+@@ -49,8 +49,8 @@
+ GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
+
+ # Additional directories to be created during installation
+-ADDITIONAL_INSTALL_DIRS += \
+- $(GNUSTEP_USER_ROOT)/Library/Preferences \
+- $(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
+- $(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
+- $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
++#ADDITIONAL_INSTALL_DIRS += \
++# $(GNUSTEP_USER_ROOT)/Library/Preferences
++# $(GNUSTEP_LOCAL_ROOT)/Library/Preferences
++# $(GNUSTEP_NETWORK_ROOT)/Library/Preferences
++# $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
+Only in Preferences: GNUmakefile.preamble~
diff --git a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
new file mode 100644
index 000000000000..3ac6a7c4f248
--- /dev/null
+++ b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
@@ -0,0 +1,164 @@
+diff -Naur Preferences.orig/GNUmakefile Preferences/GNUmakefile
+--- Preferences.orig/GNUmakefile 2004-06-11 00:38:31.000000000 +0200
++++ Preferences/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -55,7 +55,7 @@
+ export TOP_SRCDIR := $(CURDIR)/../..
+ endif
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ #
+ # Resource files
+diff -Naur Preferences.orig/GNUmakefile.preamble Preferences/GNUmakefile.preamble
+--- Preferences.orig/GNUmakefile.preamble 2007-11-06 15:49:02.000000000 +0100
++++ Preferences/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -37,7 +37,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ #ADDITIONAL_INSTALL_DIRS += \
+diff -Naur Preferences.orig/Modules/Colors/GNUmakefile Preferences/Modules/Colors/GNUmakefile
+--- Preferences.orig/Modules/Colors/GNUmakefile 2006-09-03 19:15:12.000000000 +0200
++++ Preferences/Modules/Colors/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME= Colors
+ BUNDLE_EXTENSION= .prefs
+
+-BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ Colors_LANGUAGES= \
+ English
+diff -Naur Preferences.orig/Modules/Colors/GNUmakefile.preamble Preferences/Modules/Colors/GNUmakefile.preamble
+--- Preferences.orig/Modules/Colors/GNUmakefile.preamble 2004-06-11 00:33:55.000000000 +0200
++++ Preferences/Modules/Colors/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile Preferences/Modules/Defaults/GNUmakefile
+--- Preferences.orig/Modules/Defaults/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Defaults/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -2,10 +2,10 @@
+
+ BUNDLE_NAME= Defaults
+ BUNDLE_EXTENSION= .prefs
+-BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ Defaults_LANGUAGES= \
+ English
+diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile.preamble Preferences/Modules/Defaults/GNUmakefile.preamble
+--- Preferences.orig/Modules/Defaults/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Defaults/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Font/GNUmakefile Preferences/Modules/Font/GNUmakefile
+--- Preferences.orig/Modules/Font/GNUmakefile 2005-10-12 02:02:36.000000000 +0200
++++ Preferences/Modules/Font/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME= Font
+ BUNDLE_EXTENSION= .prefs
+
+-BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ Font_LANGUAGES= \
+ English \
+diff -Naur Preferences.orig/Modules/Font/GNUmakefile.preamble Preferences/Modules/Font/GNUmakefile.preamble
+--- Preferences.orig/Modules/Font/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Font/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile Preferences/Modules/Keyboard/GNUmakefile
+--- Preferences.orig/Modules/Keyboard/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Keyboard/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME= Keyboard
+ BUNDLE_EXTENSION= .prefs
+
+-BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ Keyboard_LANGUAGES= \
+ English
+diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile.preamble Preferences/Modules/Keyboard/GNUmakefile.preamble
+--- Preferences.orig/Modules/Keyboard/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Keyboard/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Time/GNUmakefile Preferences/Modules/Time/GNUmakefile
+--- Preferences.orig/Modules/Time/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Time/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
+@@ -2,10 +2,10 @@
+
+ BUNDLE_NAME= Time
+ BUNDLE_EXTENSION= .prefs
+-BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+
+ Time_LANGUAGES= \
+ English
+diff -Naur Preferences.orig/Modules/Time/GNUmakefile.preamble Preferences/Modules/Time/GNUmakefile.preamble
+--- Preferences.orig/Modules/Time/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Time/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=