[Midnightbsd-cvs] mports [24422] trunk/deskutils/preferences/files: update patchset

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 1 10:42:38 EDT 2018


Revision: 24422
          http://svnweb.midnightbsd.org/mports/?rev=24422
Author:   laffer1
Date:     2018-10-01 10:42:32 -0400 (Mon, 01 Oct 2018)
Log Message:
-----------
update patchset

Added Paths:
-----------
    trunk/deskutils/preferences/files/patch-GNUmakefile.preamble
    trunk/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile
    trunk/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m
    trunk/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble

Removed Paths:
-------------
    trunk/deskutils/preferences/files/patch-Keyboard.m
    trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile

Added: trunk/deskutils/preferences/files/patch-GNUmakefile.preamble
===================================================================
--- trunk/deskutils/preferences/files/patch-GNUmakefile.preamble	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-GNUmakefile.preamble	2018-10-01 14:42:32 UTC (rev 24422)
@@ -0,0 +1,31 @@
+--- GNUmakefile.preamble.orig	2002-02-12 04:35:17 UTC
++++ GNUmakefile.preamble
+@@ -2,10 +2,10 @@
+ ADDITIONAL_CPPFLAGS +=
+ 
+ # Additional flags to pass to the Objective-C compiler
+-ADDITIONAL_OBJCFLAGS += -Wall -Werror
++ADDITIONAL_OBJCFLAGS += -Wall
+ 
+ # Additional flags to pass to the C compiler
+-ADDITIONAL_CFLAGS += -Wall -Werror
++ADDITIONAL_CFLAGS += -Wall
+ 
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS +=
+@@ -30,15 +30,3 @@ ADDITIONAL_OBJC_LIBS +=
+ ADDITIONAL_TOOL_LIBS +=
+ # WebObjects
+ ADDITIONAL_WO_LIBS +=
+-
+-#
+-# Flags dealing with installing and uninstalling
+-#
+-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


Property changes on: trunk/deskutils/preferences/files/patch-GNUmakefile.preamble
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/deskutils/preferences/files/patch-Keyboard.m
===================================================================
--- trunk/deskutils/preferences/files/patch-Keyboard.m	2018-10-01 14:37:10 UTC (rev 24421)
+++ trunk/deskutils/preferences/files/patch-Keyboard.m	2018-10-01 14:42:32 UTC (rev 24422)
@@ -1,10 +0,0 @@
---- Modules/Keyboard/Keyboard.m.orig	2002-06-08 10:29:36.000000000 +0200
-+++ Modules/Keyboard/Keyboard.m	2010-05-22 11:24:43.000000000 +0200
-@@ -37,6 +37,7 @@
- #import <AppKit/NSButton.h>
- #import <AppKit/NSNibLoading.h>
- #import <AppKit/NSOpenPanel.h>
-+#import <Foundation/NSUserDefaults.h>
- 
- #import "Keyboard.h"
- #import "KeyboardView.h"

Deleted: trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile
===================================================================
--- trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile	2018-10-01 14:37:10 UTC (rev 24421)
+++ trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile	2018-10-01 14:42:32 UTC (rev 24422)
@@ -1,11 +0,0 @@
---- Modules/Keyboard/GNUmakefile.orig	2014-07-30 00:10:57.436168949 +0800
-+++ Modules/Keyboard/GNUmakefile	2014-07-30 00:11:06.363171068 +0800
-@@ -3,7 +3,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
- BUNDLE_NAME=		Keyboard
- BUNDLE_EXTENSION=	.prefs
- 
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
- 
- Keyboard_RESOURCE_FILES= \
- 	Keyboard.gorm

Added: trunk/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile
===================================================================
--- trunk/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile	2018-10-01 14:42:32 UTC (rev 24422)
@@ -0,0 +1,11 @@
+--- Modules/Keyboard/GNUmakefile.orig	2002-02-12 04:49:55 UTC
++++ Modules/Keyboard/GNUmakefile
+@@ -3,7 +3,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
+ BUNDLE_NAME=		Keyboard
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ Keyboard_RESOURCE_FILES= \
+ 	Keyboard.gorm


Property changes on: trunk/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m
===================================================================
--- trunk/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m	2018-10-01 14:42:32 UTC (rev 24422)
@@ -0,0 +1,13 @@
+--- Modules/Keyboard/Keyboard.m.orig	2017-08-13 12:40:14 UTC
++++ Modules/Keyboard/Keyboard.m
+@@ -34,9 +34,7 @@ static const char rcsid[] = 
+ # include "Config.h"
+ #endif
+ 
+-#import <AppKit/NSButton.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSOpenPanel.h>
++#import <Cocoa/Cocoa.h>
+ 
+ #import "Keyboard.h"
+ #import "KeyboardView.h"


Property changes on: trunk/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble
===================================================================
--- trunk/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble	2018-10-01 14:42:32 UTC (rev 24422)
@@ -0,0 +1,21 @@
+--- PrefsModule/GNUmakefile.preamble.orig	2002-02-12 05:02:11 UTC
++++ PrefsModule/GNUmakefile.preamble
+@@ -2,10 +2,10 @@
+ ADDITIONAL_CPPFLAGS +=
+ 
+ # Additional flags to pass to the Objective-C compiler
+-ADDITIONAL_OBJCFLAGS += -Wall -Werror
++ADDITIONAL_OBJCFLAGS += -Wall
+ 
+ # Additional flags to pass to the C compiler
+-ADDITIONAL_CFLAGS += -Wall -Werror
++ADDITIONAL_CFLAGS += -Wall
+ 
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS +=
+@@ -34,5 +34,4 @@ ADDITIONAL_WO_LIBS +=
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
+ # Additional directories to be created during installation


Property changes on: trunk/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list